]> rtime.felk.cvut.cz Git - opencv.git/commitdiff
Again an update of autotools related files.
authormarkasbach <markasbach@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Mon, 27 Jul 2009 13:05:43 +0000 (13:05 +0000)
committermarkasbach <markasbach@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Mon, 27 Jul 2009 13:05:43 +0000 (13:05 +0000)
- restored and updated INSTALL that was accidentally overwritten with r1731 (Sorry!)
- restored cvaliases.i that was accidentally overwritten with r1731 (Sorry!)
- fixed automake rule to update cvaliases_autogen.i instead of cvaliases.i as necessary since r1544
- added dependency to zlib necessary with the new cxpersistence.cpp from r1982
- added a couple of new files to EXTRA_DIST rules
- added unittest framework to 'make check' target
- added environment variable TESTDATA_DIR that allows 'make distcheck' to find testdata in an external directory
- fixed swig support scripts so that now all macros in cxtypes.h work again
- fixed Makefile.am for octave wrapper
- updated swig generated files with swig 1.3.39
- updated libtool support files from 1.x to 2.x
- added method for cvCreateTrackbar2 to window.cpp
- added libdc1394_v2 support
- added support for ffmpeg headers at new places (libavformat/avformat.h compared to ffmpeg/avformat.h)
- fixed some automake targets to let 'make distcheck' complete without errors regarding
  distribution completeness test (make uninstall-check, etc.)

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

84 files changed:
opencv/3rdparty/Makefile.in
opencv/INSTALL
opencv/Makefile.am
opencv/Makefile.in
opencv/aclocal.m4
opencv/apps/Makefile.in
opencv/autotools/aclocal/libtool.m4 [new file with mode: 0644]
opencv/autotools/aclocal/libtool1.m4 [deleted file]
opencv/autotools/aclocal/ltoptions.m4 [new file with mode: 0644]
opencv/autotools/aclocal/ltsugar.m4 [new file with mode: 0644]
opencv/autotools/aclocal/ltversion.m4 [new file with mode: 0644]
opencv/autotools/aclocal/lt~obsolete.m4 [new file with mode: 0644]
opencv/autotools/ltmain.sh
opencv/configure
opencv/configure.in
opencv/cvconfig.h.in
opencv/data/Makefile.am
opencv/data/Makefile.in
opencv/doc/Makefile.in
opencv/include/Makefile.in
opencv/include/opencv/cxtypes.h
opencv/include/opencv/ml.h
opencv/interfaces/Makefile.in
opencv/interfaces/swig/Makefile.in
opencv/interfaces/swig/filtered/Makefile.in
opencv/interfaces/swig/filtered/constants.h
opencv/interfaces/swig/filtered/cv.h
opencv/interfaces/swig/general/Makefile.in
opencv/interfaces/swig/general/cvmacros.i
opencv/interfaces/swig/octave/Makefile.am
opencv/interfaces/swig/octave/Makefile.in
opencv/interfaces/swig/octave/cv_wrap.cpp
opencv/interfaces/swig/octave/highgui_wrap.cpp
opencv/interfaces/swig/octave/ml_wrap.cpp
opencv/interfaces/swig/python/Makefile.am
opencv/interfaces/swig/python/Makefile.in
opencv/interfaces/swig/python/_cv.cpp
opencv/interfaces/swig/python/_highgui.cpp
opencv/interfaces/swig/python/_ml.cpp
opencv/interfaces/swig/python/cv.py
opencv/interfaces/swig/python/cvaliases.i
opencv/interfaces/swig/python/cvaliases_autogen.i
opencv/interfaces/swig/python/highgui.py
opencv/interfaces/swig/python/ml.py
opencv/samples/Makefile.am
opencv/samples/Makefile.in
opencv/src/Makefile.am
opencv/src/Makefile.in
opencv/src/cxcore/cxpersistence.cpp
opencv/src/highgui/cvcap_ffmpeg.cpp
opencv/src/highgui/window.cpp
opencv/tests/Makefile.am
opencv/tests/Makefile.in
opencv/tests/cxts/cxts.cpp
opencv/tests/python/cvtestutils.py
opencv/tests/python/highgui/cvCaptureFromFile.py [deleted file]
opencv/tests/python/highgui/cvCaptureFromFileRGB.py [deleted file]
opencv/tests/python/highgui/cvCaptureFromFileRGBA.py [deleted file]
opencv/tests/python/highgui/cvCaptureFromFileUYVY.py [deleted file]
opencv/tests/python/highgui/cvCaptureFromFileY8.py [deleted file]
opencv/tests/python/highgui/cvCaptureFromFileYUY2.py [deleted file]
opencv/tests/python/highgui/cvCaptureFromFileYV12.py [deleted file]
opencv/tests/python/highgui/cvCaptureFromFileYV16.py [deleted file]
opencv/tests/python/highgui/cvCaptureFromFileYVU9.py [deleted file]
opencv/tests/python/highgui/cvCreateFileCapture.py
opencv/tests/python/highgui/cvCreateTrackbar.py
opencv/tests/python/highgui/cvGetCaptureProperty.py
opencv/tests/python/highgui/cvGrabFrame.py
opencv/tests/python/highgui/cvLoadImage.py
opencv/tests/python/highgui/cvQueryFrame.py
opencv/tests/python/highgui/cvRetrieveFrame.py
opencv/tests/python/highgui/cvSaveImage.py
opencv/tests/python/highgui/cvSetMouseCallback.py
opencv/tests/python/highgui/cvShowImage.py
opencv/tests/python/highgui/cvWaitKey.py
opencv/tests/python/highgui/match.py
opencv/tests/python/highgui/query_test.py
opencv/tests/python/highgui/seek_test.py
opencv/tests/python/highgui/size_test.py
opencv/tests/test_cv.sh [new file with mode: 0755]
opencv/tests/test_cxcore.sh [new file with mode: 0755]
opencv/tests/test_ml.sh [new file with mode: 0755]
opencv/utils/Makefile.in
opencv/utils/extract_constants.py

index be953894a2ec3bde2021f62248aa28a8be2451fc..95e14cfc559428810e0cb69450ca09aedd2780f3 100644 (file)
@@ -46,7 +46,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -58,7 +62,8 @@ CONFIG_HEADER = $(top_builddir)/cvconfig.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 lib_clapack_la_DEPENDENCIES = lib_clapack_floatstore.la
-am_lib_clapack_la_OBJECTS = dasum.lo daxpy.lo dbdsdc.lo dbdsqr.lo \
+am_lib_clapack_la_OBJECTS = dlasyf.lo dsyr.lo dsytf2.lo dsytrf.lo \
+       dsytri.lo dsytrs.lo dasum.lo daxpy.lo dbdsdc.lo dbdsqr.lo \
        dcopy.lo ddot.lo dgebd2.lo dgebrd.lo dgelq2.lo dgelqf.lo \
        dgels.lo dgelsd.lo dgemm.lo dgemv.lo dgeqr2.lo dgeqrf.lo \
        dger.lo dgesdd.lo dgesv.lo dgetf2.lo dgetrf.lo dgetri.lo \
@@ -172,15 +177,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -197,10 +201,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -210,6 +216,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -219,6 +226,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -260,7 +269,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -291,6 +300,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -379,6 +389,7 @@ lib_clapack_floatstore_la_LDFLAGS = -no-undefined -Wc,@OPENMP_CXXFLAGS@ @LDFLAGS
 
 # sources of the cLapack convenience library
 lib_clapack_la_SOURCES = \
+  lapack/dlasyf.c   lapack/dsyr.c     lapack/dsytf2.c   lapack/dsytrf.c   lapack/dsytri.c   lapack/dsytrs.c \
   lapack/dasum.c    lapack/daxpy.c    lapack/dbdsdc.c   lapack/dbdsqr.c   lapack/dcopy.c    lapack/ddot.c     lapack/dgebd2.c   lapack/dgebrd.c   \
   lapack/dgelq2.c   lapack/dgelqf.c   lapack/dgels.c    lapack/dgelsd.c   lapack/dgemm.c    lapack/dgemv.c    lapack/dgeqr2.c   lapack/dgeqrf.c   \
   lapack/dger.c     lapack/dgesdd.c   lapack/dgesv.c    lapack/dgetf2.c   lapack/dgetrf.c   lapack/dgetri.c   lapack/dgetrs.c   lapack/dlabad.c   \
@@ -570,6 +581,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlassq.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlasv2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlaswp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlasyf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlatrd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlauu2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlauum.Plo@am__quote@
@@ -603,11 +615,16 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dswap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyevr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsymv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyr2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyr2k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsyrk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsytd2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsytf2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsytrd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsytrf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsytri.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsytrs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtrmm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtrmv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtrsm.Plo@am__quote@
@@ -792,6 +809,48 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
+dlasyf.lo: lapack/dlasyf.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dlasyf.lo -MD -MP -MF $(DEPDIR)/dlasyf.Tpo -c -o dlasyf.lo `test -f 'lapack/dlasyf.c' || echo '$(srcdir)/'`lapack/dlasyf.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/dlasyf.Tpo $(DEPDIR)/dlasyf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lapack/dlasyf.c' object='dlasyf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dlasyf.lo `test -f 'lapack/dlasyf.c' || echo '$(srcdir)/'`lapack/dlasyf.c
+
+dsyr.lo: lapack/dsyr.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsyr.lo -MD -MP -MF $(DEPDIR)/dsyr.Tpo -c -o dsyr.lo `test -f 'lapack/dsyr.c' || echo '$(srcdir)/'`lapack/dsyr.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/dsyr.Tpo $(DEPDIR)/dsyr.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lapack/dsyr.c' object='dsyr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsyr.lo `test -f 'lapack/dsyr.c' || echo '$(srcdir)/'`lapack/dsyr.c
+
+dsytf2.lo: lapack/dsytf2.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsytf2.lo -MD -MP -MF $(DEPDIR)/dsytf2.Tpo -c -o dsytf2.lo `test -f 'lapack/dsytf2.c' || echo '$(srcdir)/'`lapack/dsytf2.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/dsytf2.Tpo $(DEPDIR)/dsytf2.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lapack/dsytf2.c' object='dsytf2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsytf2.lo `test -f 'lapack/dsytf2.c' || echo '$(srcdir)/'`lapack/dsytf2.c
+
+dsytrf.lo: lapack/dsytrf.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsytrf.lo -MD -MP -MF $(DEPDIR)/dsytrf.Tpo -c -o dsytrf.lo `test -f 'lapack/dsytrf.c' || echo '$(srcdir)/'`lapack/dsytrf.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/dsytrf.Tpo $(DEPDIR)/dsytrf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lapack/dsytrf.c' object='dsytrf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsytrf.lo `test -f 'lapack/dsytrf.c' || echo '$(srcdir)/'`lapack/dsytrf.c
+
+dsytri.lo: lapack/dsytri.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsytri.lo -MD -MP -MF $(DEPDIR)/dsytri.Tpo -c -o dsytri.lo `test -f 'lapack/dsytri.c' || echo '$(srcdir)/'`lapack/dsytri.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/dsytri.Tpo $(DEPDIR)/dsytri.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lapack/dsytri.c' object='dsytri.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsytri.lo `test -f 'lapack/dsytri.c' || echo '$(srcdir)/'`lapack/dsytri.c
+
+dsytrs.lo: lapack/dsytrs.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsytrs.lo -MD -MP -MF $(DEPDIR)/dsytrs.Tpo -c -o dsytrs.lo `test -f 'lapack/dsytrs.c' || echo '$(srcdir)/'`lapack/dsytrs.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/dsytrs.Tpo $(DEPDIR)/dsytrs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='lapack/dsytrs.c' object='dsytrs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsytrs.lo `test -f 'lapack/dsytrs.c' || echo '$(srcdir)/'`lapack/dsytrs.c
+
 dasum.lo: lapack/dasum.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dasum.lo -MD -MP -MF $(DEPDIR)/dasum.Tpo -c -o dasum.lo `test -f 'lapack/dasum.c' || echo '$(srcdir)/'`lapack/dasum.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/dasum.Tpo $(DEPDIR)/dasum.Plo
index 8b82ade08e87bbfb02fbf4c3b45b181ab6dda8cb..2640d51752a1018489a808af0ae9fcd24933d5ee 100644 (file)
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
+******************** OpenCV Installation Guide *********************
+
+  Common Prerequisities:
+  ================================
+  * C/C++ compiler (OpenCV is known to work with VS2005, VS2008,
+        including Express Editions, and Mingw on Windows,
+        GCC 4.x on Linux, MacOSX and other Unix-like systems).
+  * [Optional] Subversion client (e.g. command-line svn tool, SmartSVN, Tortoise SVN)
+  * [Optional] CMake 2.6 or later. CMake is now the only method of building OpenCV SVN snapshots
+    on Windows and the recommended method on Linux/MacOSX.
+  * [Optional] Python 2.5 or later (Python 3.x support status is unknown),
+    including the development files: Python.h, etc. in order to build Python wrappers
+  * [Optional] SWIG 1.3.30 or later to build Python & Octave wrappers
+    (in order to build Octave wrappers you will need at least SWIG 1.3.36).
+  * [Optional] IPP 5.1 or later. OpenCV does not require IPP, but can detect the presence
+    of IPP binaries and use them to achieve higher performance.
+    If you have full IPP installed, on Windows you can also build custom IPP opencv_ipp*.dll
+    that will include a small subset of IPP functions that are really used by OpenCV.
+
+  Extra Prerequisities (Linux/BSD/other Unix-like OSes):
+  ======================================================
+  * pkg-config. It is used at the configuration stage and also simplifies the further use of OpenCV itself.
+  * [Optional] autotools:
+        autoconf-2.59 or later (including autoheader)
+        automake-1.9 or later (including aclocal)
+        libtool-1.5 or later (including libtoolize)
+    You can choose to use either cmake or autotools to build OpenCV.
+  * [Optional] gtk+ 2.x and the related packages (glib, gthread etc.).
+    This is the GUI toolkit of choice for highgui on OSes other than Windows and MacOSX.
+  * [Optional] libjpeg, libtiff, libjasper, libpng and zlib. Install any of those with the associated
+    development packages to be able to read/write the corresponding image formats. On Windows these libraries
+    are shipped with OpenCV, on MacOSX QuickTime is used instead.
+  * [Optional] ffmpeg, libgstreamer, libxine, unicap, libdc1394 2.x (or libdc1394 1.x + libraw1394).
+    You should have some/all of these packages installed (together with associated development packages)
+    to add video capturing, video decoding and video encoding capabilities to highgui.
+    The output of the configure script or cmake will show you, which of the packages have been detected
+    and will be used in highgui. For example, on Ubuntu 8.10 all the necessary ffmpeg files
+    can be installed using the following command:
+        sudo apt-get install libavformat-dev
+
+    On Windows and MacOSX some video I/O capabilities are provided by the OS-native services.
+
+  * [Optional] Octave 2.9 or later, together with SWIG 1.3.36 or later, in order to build Octave wrappers.
+    Note that currently Octave wrappers can only be built with autotools, not cmake.
+
+  Extra Prerequisities (MacOSX):
+  ==============================
+  * Xcode 3.1 or later. It does not only include the required C++ compiler,
+    but also Quicktime and Carbon frameworks that make highgui on MacOSX functional.
+    Besides, CMake can generate Xcode projects, so you can build OpenCV conveniently from within IDE.
+
+  Getting the latest stable OpenCV version:
+  =========================================
+  * Go to http://sourceforge.net/projects/opencvlibrary
+  * Windows: download the executable installation package for Windows and run it
+  * Linux/MacOSX/other operating systems: download the source tarball and unpack it
+
+  Getting the cutting-edge OpenCV from SourceForge SVN repository:
+  =============================================================
+
+  Launch SVN client and checkout either
+      a) the current OpenCV snapshot from here:
+         http://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk
+      b) or the latest tested OpenCV snapshot from here:
+         http://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/tags/latest_tested_snapshot
+
+      In Linux/MacOSX it can be done using command line, e.g.:
+        cd ~/<my_working_directory>
+        svn co https://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk
+
+      If you access SourceForge anonymously, you can replace "https://" with "http://" in the URLs above.
+
+
+  Building OpenCV from source using CMake (Cross-platform):
+  =========================================================
+   1. Create a temporary directory, which we denote as <cmake_binary_dir>,
+      where you want to put the generated Makefiles,
+      VisualStudio, Xcode, or Eclipse etc. project files as well the object files and output binaries.
+      You can do it using CMake GUI.
+
+   2a. If you use CMake GUI, execute "Configure" to do the initial configuration,
+      then adjust any options, then press "Configure" again and then press "Generate".
+
+   2b. If you are using command line, enter the <cmake_binary_dir> and type
+      "cmake [<some optional parameters...>] <path to the OpenCV source directory>"
+      For example, if you downloaded the project to ~/projects/opencv, you can do the following:
+         cd ~/projects/opencv # the directory containing INSTALL, CMakeLists.txt etc.
+         mkdir release
+         cd release
+         cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D BUILD_PYTHON_SUPPORT=ON ..
+
+      that will generate makefiles for the Release configuration and will put them in
+      ~/projects/opencv/release directory.
+
+   3a. If you generated project files for VisualStudio, Xcode, Eclipse etc., run the respective IDE, open
+       the OpenCV top-level project/solution/workspace etc. and build it.
+
+   3b. If you generated makefiles, then enter the created temporary directory and run make/nmake utility.
+       Then you can optionally run "sudo make install".
+
+   4. If you did not run "make install", you should let your system know where to find the generated libraries.
+
+      On Windows you should add <cmake_binary_dir>/bin/debug and <cmake_binary_dir>/bin/release to the system path
+      (My Computer--[Right button click]-->Properties->Advanced->Environment Variables->Path)
+
+      On Linux you should add <cmake_binary_dir>/lib[/debug|/release] to /etc/ld.so.conf or
+      to LD_LIBRARY_PATH, e.g.:
+      export LD_LIBRARY_PATH=~/projects/opencv/release/lib:$LD_LIBRARY_PATH
+      sudo ldconfig
+
+      On MacOSX you should add <cmake_binary_dir>/lib[/debug|/release] to DYLD_LIBRARY_PATH.
+  
+  
+  Building OpenCV using autotools (Linux, MacOSX, other Unix-like systems):
+  =========================================================================
+
+   1. enter the top-level OpenCV source directory, containing configure.in, INSTALL etc.
+
+   1b [This step is usually not necessary, UNLESS you are building from a not consistent SVN checkout]
+   
+      Use autoreconf to generate the up-to-date configure script and Makefile.in's
+      out of configure.in and Makefile.am's. In rare cases, it might be necessary to invoke
+      it with '--force' switch if the files' time stamps are wrong.
+
+      note 1. you should have pretty recent versions of autoconf, automake, libtool installed,
+              see Prerequisities above.
+      note 2. for some reason the INSTALL document is overwritten by this command,
+              so you may want to backup it prior running the command, or restore it from SVN after.
+      
+      Inconsistent states of the SVN might also mean that the SWIG wrappers for Python and/or
+      Octave are not up-to-date. In this case, you should configure with 
+      
+        ./configure --with-swig
+      
+      or 
+      
+        ./configure --with-swig --with-octave
+      
+      and build in the main directory (not in a temporary VPATH build like step '2' suggests.
+
+   2. create a new temporary directory where you want the generated Makefiles and object files be put, 
+      enter it and run configure script. For example, if you downloaded OpenCV to ~/projects/opencv,
+      you can do the following:
+
+         cd ~/projects/opencv
+         mkdir release
+         cd release
+         ../configure
+
+      The full list of the configurations options can be retrieved with:
+          ../configure --help
+
+      Also, watch the final part of the configure script output,
+      there it shows which 3rd-party libraries it detected and will use.
+
+   4. then run:
+         make
+         sudo make install
+
+
+  Testing OpenCV (CMake, cross-platform)
+  ======================================
+
+  You may turn on "BUILD_EXAMPLES" in CMake GUI or run cmake with "-D BUILD_EXAMPLES=ON" option,
+  then it will include short demo samples to the build. Note that some of them need image files
+  from the original source directory, you may just copy them to the bin directory.
+
+  You can also run tests correctness tests <cmake_binary_dir>[/debug|/release]/bin/cxcoretest and .../cvtest.
+
+  Testing OpenCV (autotools)
+  ==========================
+  Run "make check" in order to run the correctness tests. The check target needs additional
+  test data that has been moved out of the main directory of OpenCV. It is automatically found
+  for usual builds if you check out the 'opencv_extra' directory from the SVN to the same location
+  where you already put the 'opencv' directory itself.
+  
+  For "make distcheck" to succeed, you will need to specify the location of the opencv_extra/testdata
+  folder by setting an environment variable:
+  
+    env TESTDATA_DIR='~/wherever/opencv_extra/testdata' make distcheck
+
+  Testing Python/Octave wrappers
+  ==============================
+  As long as you build Python/Octave wrappers and installed them, you can
+  just enter opencv/samples/python or opencv/samples/octave and run the samples, e.g.
+  "python delaunay.py"
+  
+  The autotools "make check" rule also runs a couple of unit tests and Python test cases
+
+  Building your own code that uses OpenCV
+  =======================================
+  * If you use CMake, you can write your own CMakeLists.txt script and use the provided FindOpenCV.cmake file there,
+    just like you would use FindJPEG.cmake etc. Please, refer to CMake documentation.
+  * You can add opencv include, lib and bin subdirectory to your IDE settings.
+  * For hand-written Makefiles you can specify the necessary paths and options manually, e.g.:
+     g++ -o my_example my_example.cpp -I<opencv_source_dir>/include[/opencv] \
+             -L<cmake_binary_dir>/lib -lcxcore -lcv -lcvaux -lhighgui -lml
+  * Finally, you can use pkg-config and the provided opencv.pc.
+     1. Make sure that opencv.pc is found by pkg-config:
+          pkg-config opencv --libs  # should print something like -lcxcore -lcv ...
+     2. You can now use it in your Makefiles or build scripts, e.g.:
+           g++ -o my_example my_example.cpp `pkg-config opencv --cflags --libs`
+
+ARM notice:
+===========
+   Although there is no official support for non-x86 based
+   processors it is reportedly possible to compile OpenCV on ARM.
+
+   * on ARM pass CXXFLAGS=-fsigned-char to configure.
index 50dac4b3d41253acda976dfe179f224fe35983ce..1fd7093737c879ad6f6e64f16d04b5d6ab867f25 100644 (file)
@@ -21,6 +21,8 @@ EXTRA_DIST = \
   opencv.pc.in \
   \
   make_frameworks.sh \
+  autotools/darwin/Info.plist \
+  autotools/darwin/OpenCV.h \
   \
   CMakeLists.txt \
   opencv.pc.cmake.in \
@@ -28,6 +30,7 @@ EXTRA_DIST = \
   cmake_uninstall.cmake.in \
   OpenCVConfig.cmake.in \
   OpenCVFindPkgConfig.cmake \
+  OpenCVPCHSupport.cmake \
   cvconfig.h.cmake
 
 pkgconfigdir = $(libdir)/pkgconfig
index 3d381a13a1b6f6f33904fe1b1649954ebdba4fff..9bd1ac1caef051bc4db2190d1c9846d244baabaa 100644 (file)
@@ -49,7 +49,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -124,15 +128,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -149,10 +152,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -162,6 +167,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -171,6 +177,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -212,7 +220,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -243,6 +251,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -283,6 +292,8 @@ EXTRA_DIST = \
   opencv.pc.in \
   \
   make_frameworks.sh \
+  autotools/darwin/Info.plist \
+  autotools/darwin/OpenCV.h \
   \
   CMakeLists.txt \
   opencv.pc.cmake.in \
@@ -290,6 +301,7 @@ EXTRA_DIST = \
   cmake_uninstall.cmake.in \
   OpenCVConfig.cmake.in \
   OpenCVFindPkgConfig.cmake \
+  OpenCVPCHSupport.cmake \
   cvconfig.h.cmake
 
 pkgconfigdir = $(libdir)/pkgconfig
index e572a3d31135143f4f29481fa7e76a4afeed241d..8518c66f0c270cd4e6796e41bcf384c2fcccf2ed 100644 (file)
@@ -19,6 +19,6624 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 52 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+                [m4_ifdef([AC_PROVIDE_$1],
+                          [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+       [AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+            [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+            [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+            [define([LT_AC_PROG_GCJ],
+               defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
+
+_LT_REQUIRED_DARWIN_CHECKS
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+       [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+       [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+            [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+        [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+[$]*
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+        test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+        echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+        test "X$echo_testing_string" = "X$echo_test_string"; then
+       # Cool, printf works
+       :
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+          test "X$echo_testing_string" = 'X\t' &&
+          echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+          test "X$echo_testing_string" = "X$echo_test_string"; then
+       CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+       export CONFIG_SHELL
+       SHELL="$CONFIG_SHELL"
+       export SHELL
+       echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+          test "X$echo_testing_string" = 'X\t' &&
+          echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+          test "X$echo_testing_string" = "X$echo_test_string"; then
+       echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+       # maybe with a smaller string...
+       prev=:
+
+       for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+         if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+         then
+           break
+         fi
+         prev="$cmd"
+       done
+
+       if test "$prev" != 'sed 50q "[$]0"'; then
+         echo_test_string=`eval $prev`
+         export echo_test_string
+         exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+       else
+         # Oops.  We lost completely, so just stick with echo.
+         echo=echo
+       fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+       [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *32-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+         LD="${LD-ld} -64"
+       fi
+       ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+  ])
+esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#              [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $rm -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$4], , :, [$4])
+else
+    ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[       ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+              = "XX$teststring") >/dev/null 2>&1 &&
+             new_result=`expr "X$teststring" : ".*" 2>&1` &&
+             lt_cv_sys_max_cmd_len=$new_result &&
+             test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL          RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL                DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL                0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW         DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW       RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW     DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW     0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+   ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+         [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+           [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+       [AC_CHECK_FUNC([dlopen],
+             [lt_cv_dlopen="dlopen"],
+         [AC_CHECK_LIB([dl], [dlopen],
+               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+           [AC_CHECK_LIB([svld], [dlopen],
+                 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+             [AC_CHECK_LIB([dld], [dld_link],
+                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+             ])
+           ])
+         ])
+       ])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+         lt_cv_dlopen_self, [dnl
+         _LT_AC_TRY_DLOPEN_SELF(
+           lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+           lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+         lt_cv_dlopen_self_static, [dnl
+         _LT_AC_TRY_DLOPEN_SELF(
+           lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+           lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
+fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+          echo ' yes '
+          echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+       :
+      else
+       can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+       if test "$lt_cv_prog_gnu_ld" = yes; then
+               version_type=linux
+       else
+               version_type=irix
+       fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[         ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+       shlibpath_overrides_runpath=no
+       ;;
+      *)
+       shlibpath_overrides_runpath=yes
+       ;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+       ;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+    fi
+  fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+       ;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      CXX)
+       if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+           ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+           (test "X$CXX" != "Xg++"))) ; then
+         AC_LIBTOOL_LANG_CXX_CONFIG
+       else
+         tagname=""
+       fi
+       ;;
+
+      F77)
+       if test -n "$F77" && test "X$F77" != "Xno"; then
+         AC_LIBTOOL_LANG_F77_CONFIG
+       else
+         tagname=""
+       fi
+       ;;
+
+      GCJ)
+       if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+         AC_LIBTOOL_LANG_GCJ_CONFIG
+       else
+         tagname=""
+       fi
+       ;;
+
+      RC)
+       AC_LIBTOOL_LANG_RC_CONFIG
+       ;;
+
+      *)
+       AC_MSG_ERROR([Unsupported tag name: $tagname])
+       ;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+  fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+       [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_shared=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+       [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_static=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_fast_install=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+       case $deplibs_check_method in
+       "file_magic "*)
+         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+           $EGREP "$file_magic_regex" > /dev/null; then
+           :
+         else
+           cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+         fi ;;
+       esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+])# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognize a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# AC_PATH_MAGIC
+
+
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--with-gnu-ld],
+       [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+       ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+       test "$with_gnu_ld" != no && break
+       ;;
+      *)
+       test "$with_gnu_ld" != yes && break
+       ;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_PROG_LD_GNU
+])# AC_PROG_LD
+
+
+# AC_PROG_LD_GNU
+# --------------
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
+
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+])# AC_PROG_LD_RELOAD_FLAG
+
+
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
+
+
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       # Tru64's nm complains that /dev/null is an invalid object file
+       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+       */dev/null* | *'Invalid file or object type'*)
+         lt_cv_path_NM="$tmp_nm -B"
+         break
+         ;;
+       *)
+         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+         */dev/null*)
+           lt_cv_path_NM="$tmp_nm -p"
+           break
+           ;;
+         *)
+           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+           continue # so that we can try to find one that supports BSD flags
+           ;;
+         esac
+         ;;
+       esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
+
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+])# AC_CHECK_LIBM
+
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
+
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    LTDLINCL=
+  fi
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
+
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
+
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
+
+
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
+
+
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
+
+
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+        [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+          [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
+
+
+# AC_LIBTOOL_RC
+# -------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
+
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF
+
+# Report which library types will actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+    ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+  AC_PROG_LD
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+       grep 'no-whole-archive' > /dev/null; then
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix[[4-9]]*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+       for ld_flag in $LDFLAGS; do
+         case $ld_flag in
+         *-brtl*)
+           aix_use_runtimelinking=yes
+           break
+           ;;
+         esac
+       done
+       ;;
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+    if test "$GXX" = yes; then
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+      # We only want to do this on AIX 4.2 and lower, the check
+      # below for broken collect2 doesn't work under 4.3+
+       collect2name=`${CC} -print-prog-name=collect2`
+       if test -f "$collect2name" && \
+          strings "$collect2name" | grep resolve_lib_name >/dev/null
+       then
+         # We have reworked collect2
+         :
+       else
+         # We have old collect2
+         _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+         # It fails to find uninstalled libraries when the uninstalled
+         # path is not listed in the libpath.  Setting hardcode_minus_L
+         # to unsupported forces relinking
+         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+       fi
+       ;;
+      esac
+      shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+       shared_flag="$shared_flag "'${wl}-G'
+      fi
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+       # chokes on -Wl,-G. The following line is correct:
+       shared_flag='-G'
+      else
+       if test "$aix_use_runtimelinking" = yes; then
+         shared_flag='${wl}-G'
+       else
+         shared_flag='${wl}-bM:SRE'
+       fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+      else
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+       # Warning - without using the other run time loading flags,
+       # -berok will link without error, but may produce a broken library.
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+       # Exported symbols can be pulled into shared objects from archives
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+       # This is similar to how AIX traditionally builds its shared libraries.
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
+  chorus*)
+    case $cc_basename in
+      *)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+       cp $export_symbols $output_objdir/$soname.def;
+      else
+       echo EXPORTS > $output_objdir/$soname.def;
+       cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+  ;;
+      darwin* | rhapsody*)
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
+      output_verbose_link_cmd='echo'
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+      fi
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+      fi
+        ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++*)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      ghcx*)
+       # Green Hills C++ Compiler
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      *)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+    esac
+    ;;
+  freebsd[[12]]*)
+    # C++ shared libraries reported to be fairly broken before switch to ELF
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  freebsd-elf*)
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    ;;
+  freebsd* | dragonfly*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+                               # but as the default
+                               # location of the library.
+
+    case $cc_basename in
+    CC*)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    aCC*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      #
+      # There doesn't appear to be a way to prevent this compiler from
+      # explicitly linking system object files so we need to strip them
+      # from the output so that they don't get included in the library
+      # dependencies.
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      ;;
+    *)
+      if test "$GXX" = yes; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*) ;;
+      *)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case $host_cpu in
+    hppa*64*|ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+    *)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+                                             # but as the default
+                                             # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC*)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      aCC*)
+       case $host_cpu in
+       hppa*64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+         ;;
+       ia64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+         ;;
+       *)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+         ;;
+       esac
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+       #
+       # There doesn't appear to be a way to prevent this compiler from
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+       output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+      *)
+       if test "$GXX" = yes; then
+         if test $with_gnu_ld = no; then
+           case $host_cpu in
+           hppa*64*)
+             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+             ;;
+           ia64*)
+             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+             ;;
+           *)
+             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+             ;;
+           esac
+         fi
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+    esac
+    ;;
+  interix[[3-9]]*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      CC*)
+       # SGI C++
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+       # Archives containing C++ object files must be created using
+       # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+       # necessary to make sure instantiated templates are included
+       # in the archive.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+       ;;
+      *)
+       if test "$GXX" = yes; then
+         if test "$with_gnu_ld" = no; then
+           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+         else
+           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+         fi
+       fi
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux* | k*bsd*-gnu)
+    case $cc_basename in
+      KCC*)
+       # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+       # KCC will only create a shared library if the output file
+       # ends with ".so" (or ".sl" for HP-UX), so rename the library
+       # to its proper name (with version) after linking.
+       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+       #
+       # There doesn't appear to be a way to prevent this compiler from
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+       output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+       # Archives containing C++ object files must be created using
+       # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+       ;;
+      icpc*)
+       # Intel C++
+       with_gnu_ld=yes
+       # version 8.0 and above of icpc choke on multiply defined symbols
+       # if we add $predep_objects and $postdep_objects, however 7.1 and
+       # earlier do not add the objects themselves.
+       case `$CC -V 2>&1` in
+       *"Version 7."*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+         ;;
+       *)  # Version 8.0 or newer
+         tmp_idyn=
+         case $host_cpu in
+           ia64*) tmp_idyn=' -i_dynamic';;
+         esac
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+         ;;
+       esac
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+       ;;
+      pgCC* | pgcpp*)
+        # Portland Group C++ compiler
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
+       # Compaq C++
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+       runpath_var=LD_RUN_PATH
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+       #
+       # There doesn't appear to be a way to prevent this compiler from
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+      *)
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C++ 5.9
+         _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+         # Not sure whether something based on
+         # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+         # would be better.
+         output_verbose_link_cmd='echo'
+
+         # Archives containing C++ object files must be created using
+         # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+         # necessary to make sure instantiated templates are included
+         # in the archive.
+         _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+         ;;
+       esac
+       ;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx*)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      *)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+    esac
+    ;;
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    fi
+    # Workaround some broken pre-1.5 toolchains
+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+  osf3*)
+    case $cc_basename in
+      KCC*)
+       # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+       # KCC will only create a shared library if the output file
+       # ends with ".so" (or ".sl" for HP-UX), so rename the library
+       # to its proper name (with version) after linking.
+       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       # Archives containing C++ object files must be created using
+       # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+       ;;
+      RCC*)
+       # Rational C++ 2.4.1
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      cxx*)
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+       #
+       # There doesn't appear to be a way to prevent this compiler from
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+      *)
+       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+         # Commands to make compiler produce verbose output that lists
+         # what "hidden" libraries, object files and flags are used when
+         # linking a shared library.
+         output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC*)
+       # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+       # KCC will only create a shared library if the output file
+       # ends with ".so" (or ".sl" for HP-UX), so rename the library
+       # to its proper name (with version) after linking.
+       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       # Archives containing C++ object files must be created using
+       # the KAI C++ compiler.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+       ;;
+      RCC*)
+       # Rational C++ 2.4.1
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      cxx*)
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+         echo "-hidden">> $lib.exp~
+         $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+         $rm $lib.exp'
+
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+       #
+       # There doesn't appear to be a way to prevent this compiler from
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+      *)
+       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+         # Commands to make compiler produce verbose output that lists
+         # what "hidden" libraries, object files and flags are used when
+         # linking a shared library.
+         output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC*)
+       # Sun C++ 4.x
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      lcc*)
+       # Lucid
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      *)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      CC*)
+       # Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+       $CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+         solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+         *)
+           # The compiler driver will combine and reorder linker options,
+           # but understands `-z linker_flag'.
+           # Supported since Solaris 2.6 (maybe 2.5.1?)
+           _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+           ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+       output_verbose_link_cmd='echo'
+
+       # Archives containing C++ object files must be created using
+       # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+       # necessary to make sure instantiated templates are included
+       # in the archive.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+       ;;
+      gcx*)
+       # Green Hills C++ Compiler
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+       # The C++ compiler must be used to create the archive.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+       ;;
+      *)
+       # GNU C++ compiler with Solaris linker
+       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+         _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+         if $CC --version | grep -v '^2\.7' > /dev/null; then
+           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+               $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+         else
+           # g++ 2.7 appears to require `-G' NOT `-shared' on this
+           # platform.
+           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+               $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+         fi
+
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+         case $host_os in
+         solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+         *)
+           _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+           ;;
+         esac
+       fi
+       ;;
+    esac
+    ;;
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       ;;
+      *)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       ;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       ;;
+      *)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       ;;
+    esac
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC*)
+       # NonStop-UX NCC 3.20
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+      *)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # The `*' in the case matches for architectures that use `case' in
+  # $output_verbose_cmd can trigger glob expansion during the loop
+  # eval without this substitution.
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+         || test $p = "-R"; then
+        prev=$p
+        continue
+       else
+        prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+        case $p in
+        -L* | -R*)
+          # Internal compiler library paths should come after those
+          # provided the user.  The postdeps already come after the
+          # user supplied libs so there is no need to process them.
+          if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+            _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+          else
+            _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+          fi
+          ;;
+        # The "-l" case would never come before the object being
+        # linked, so don't bother handling this case.
+        esac
+       else
+        if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+          _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+        else
+          _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+        fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+        pre_test_object_deps_done=yes
+        continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+        if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+          _LT_AC_TAGVAR(predep_objects, $1)="$p"
+        else
+          _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+        fi
+       else
+        if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+          _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+        else
+          _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+        fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$rm -f confest.$objext
+
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="\
+      program t
+      end
+"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+aix[[4-9]]*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
+  ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
+
+
+# AC_LIBTOOL_LANG_RC_CONFIG
+# -------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
+
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # See if we are running on zsh, and set the options which allow our commands through
+  # without removal of \ escapes.
+  if test -n "${ZSH_VERSION+set}" ; then
+    setopt NO_GLOB_SUBST
+  fi
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
+
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+    ;;
+  esac
+
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
+
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
+
+__EOF__
+
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+])# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+linux* | k*bsd*-gnu)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[     ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+       mv -f "$nlist"T "$nlist"
+      else
+       rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+       if grep ' nm_test_func$' "$nlist" >/dev/null; then
+         cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+         # Now generate the symbol file.
+         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+         cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+         cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+         # Now try linking the two files.
+         mv conftest.$ac_objext conftstm.$ac_objext
+         lt_save_LIBS="$LIBS"
+         lt_save_CFLAGS="$CFLAGS"
+         LIBS="conftstm.$ac_objext"
+         CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+         if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+           pipe_works=yes
+         fi
+         LIBS="$lt_save_LIBS"
+         CFLAGS="$lt_save_CFLAGS"
+       else
+         echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+       fi
+      else
+       echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+       # AIX 5 now supports IA64 processor
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+       ;;
+      *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+       # All AIX code is PIC.
+       if test "$host_cpu" = ia64; then
+         # AIX 5 now supports IA64 processor
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       else
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
+      chorus*)
+       case $cc_basename in
+       cxch68*)
+         # Green Hills C++ Compiler
+         # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+         ;;
+       esac
+       ;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
+      dgux*)
+       case $cc_basename in
+         ec++*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           ;;
+         ghcx*)
+           # Green Hills C++ Compiler
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      freebsd* | dragonfly*)
+       # FreeBSD uses GNU C++
+       ;;
+      hpux9* | hpux10* | hpux11*)
+       case $cc_basename in
+         CC*)
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+           if test "$host_cpu" != ia64; then
+             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+           fi
+           ;;
+         aCC*)
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+           case $host_cpu in
+           hppa*64*|ia64*)
+             # +Z the default
+             ;;
+           *)
+             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+             ;;
+           esac
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      interix*)
+       # This is c89, which is MS Visual C++ (no shared libs)
+       # Anyone wants to do a port?
+       ;;
+      irix5* | irix6* | nonstopux*)
+       case $cc_basename in
+         CC*)
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           # CC pic flag -KPIC is the default.
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      linux* | k*bsd*-gnu)
+       case $cc_basename in
+         KCC*)
+           # KAI C++ Compiler
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+           ;;
+         icpc* | ecpc*)
+           # Intel C++
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+           ;;
+         pgCC* | pgcpp*)
+           # Portland Group C++ compiler.
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+         cxx*)
+           # Compaq C++
+           # Make sure the PIC flag is empty.  It appears that all Alpha
+           # Linux and Compaq Tru64 Unix objects are PIC.
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           ;;
+         *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+             _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+             ;;
+           esac
+           ;;
+       esac
+       ;;
+      lynxos*)
+       ;;
+      m88k*)
+       ;;
+      mvs*)
+       case $cc_basename in
+         cxx*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      netbsd*)
+       ;;
+      osf3* | osf4* | osf5*)
+       case $cc_basename in
+         KCC*)
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+           ;;
+         RCC*)
+           # Rational C++ 2.4.1
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         cxx*)
+           # Digital/Compaq C++
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           # Make sure the PIC flag is empty.  It appears that all Alpha
+           # Linux and Compaq Tru64 Unix objects are PIC.
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      psos*)
+       ;;
+      solaris*)
+       case $cc_basename in
+         CC*)
+           # Sun C++ 4.2, 5.x and Centerline C++
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+           ;;
+         gcx*)
+           # Green Hills C++ Compiler
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      sunos4*)
+       case $cc_basename in
+         CC*)
+           # Sun C++ 4.x
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+         lcc*)
+           # Lucid
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      tandem*)
+       case $cc_basename in
+         NCC*)
+           # NonStop-UX NCC 3.20
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+       case $cc_basename in
+         CC*)
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+       esac
+       ;;
+      vxworks*)
+       ;;
+      *)
+       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       ;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+       # AIX 5 now supports IA64 processor
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+       # +Z the default
+       ;;
+      *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+      esac
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+       # AIX 5 now supports IA64 processor
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
+
+    mingw* | cygwin* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+       # +Z the default
+       ;;
+      *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+       ;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      icc* | ecc*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+       # which looks to be a dead project)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C 5.9
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       *Sun\ F*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+         ;;
+       esac
+       ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
+
+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw*)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
+  case $host_os in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+       # support --undefined.  This deserves some investigation.  FIXME
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname.def;
+       else
+         echo EXPORTS > $output_objdir/$soname.def;
+         cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       tmp_addflag=
+       case $cc_basename,$host_cpu in
+       pgcc*)                          # Portland Group C compiler
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag'
+         ;;
+       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag -Mnomain' ;;
+       ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
+         tmp_addflag=' -i_dynamic' ;;
+       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
+         tmp_addflag=' -i_dynamic -nofor_main' ;;
+       ifc* | ifort*)                  # Intel Fortran compiler
+         tmp_addflag=' -nofor_main' ;;
+       esac
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       *)
+         tmp_sharedflag='-shared' ;;
+       esac
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+       if test $supports_anon_versioning = yes; then
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+       fi
+      else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+       ;;
+       *)
+         if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+         else
+           _LT_AC_TAGVAR(ld_shlibs, $1)=no
+         fi
+       ;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+       # Neither direct hardcoding nor static linking is supported with a
+       # broken collect2.
+       _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+       aix_use_runtimelinking=no
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+      else
+       # If we're using GNU nm, then we don't want the "-C" option.
+       # -C means demangle to AIX nm, but means don't demangle with GNU nm
+       if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+         _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+       else
+         _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+       fi
+       aix_use_runtimelinking=no
+
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+         for ld_flag in $LDFLAGS; do
+         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+           aix_use_runtimelinking=yes
+           break
+         fi
+         done
+         ;;
+       esac
+
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+      if test "$GCC" = yes; then
+       case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+         collect2name=`${CC} -print-prog-name=collect2`
+         if test -f "$collect2name" && \
+          strings "$collect2name" | grep resolve_lib_name >/dev/null
+         then
+         # We have reworked collect2
+         :
+         else
+         # We have old collect2
+         _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+         # It fails to find uninstalled libraries when the uninstalled
+         # path is not listed in the libpath.  Setting hardcode_minus_L
+         # to unsupported forces relinking
+         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+         fi
+         ;;
+       esac
+       shared_flag='-shared'
+       if test "$aix_use_runtimelinking" = yes; then
+         shared_flag="$shared_flag "'${wl}-G'
+       fi
+      else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+       # chokes on -Wl,-G. The following line is correct:
+         shared_flag='-G'
+       else
+         if test "$aix_use_runtimelinking" = yes; then
+           shared_flag='${wl}-G'
+         else
+           shared_flag='${wl}-bM:SRE'
+         fi
+       fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+       if test "$host_cpu" = ia64; then
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+       else
+        # Determine the default libpath from the value encoded in an empty executable.
+        _LT_AC_SYS_LIBPATH_AIX
+        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+         # Warning - without using the other run time loading flags,
+         # -berok will link without error, but may produce a broken library.
+         _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+         # Exported symbols can be pulled into shared objects from archives
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+         # This is similar to how AIX traditionally builds its shared libraries.
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    bsdi[[45]]*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    if test "$GCC" = yes ; then
+       output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
+    fi
+      ;;
+
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+       # hardcode_minus_L: Not really in the search PATH,
+       # but as the default location of the library.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       case $host_cpu in
+       hppa*64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       esac
+      else
+       case $host_cpu in
+       hppa*64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       esac
+      fi
+      if test "$with_gnu_ld" = no; then
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       case $host_cpu in
+       hppa*64*|ia64*)
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+         _LT_AC_TAGVAR(hardcode_direct, $1)=no
+         _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+         ;;
+       *)
+         _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+         # hardcode_minus_L: Not really in the search PATH,
+         # but as the default location of the library.
+         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+         ;;
+       esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+         case $host_os in
+          openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+            _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+            _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+            ;;
+          *)
+            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+            _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+            ;;
+         esac
+        fi
+      else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)     # as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+       $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+       # Both c and cxx compiler support -rpath directly
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      if test "$GCC" = yes; then
+       wlarc='${wl}'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+         $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+      else
+       wlarc=''
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+       $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+       # The compiler driver will combine and reorder linker options,
+       # but understands `-z linker_flag'.  GCC discards it without `$wl',
+       # but is careful enough not to reorder.
+       # Supported since Solaris 2.6 (maybe 2.5.1?)
+       if test "$GCC" = yes; then
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+       else
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+       fi
+       ;;
+      esac
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+       # Use $CC to link under sequent, because it throws in some extra .o
+       # files that make .init and .fini sections work.
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+       sni)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+       ;;
+       siemens)
+         ## LD is ld it makes a PLAMLIB
+         ## CC just makes a GrossModule.
+         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+         _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+         _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+       motorola)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+       ;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       runpath_var=LD_RUN_PATH
+       hardcode_runpath_var=yes
+       _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+       pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])
+
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1060,7 +7678,11 @@ m4_include([autotools/aclocal/ax_check_compiler_flags.m4])
 m4_include([autotools/aclocal/ax_ext.m4])
 m4_include([autotools/aclocal/ax_gcc_x86_cpuid.m4])
 m4_include([autotools/aclocal/az_python.m4])
-m4_include([autotools/aclocal/libtool1.m4])
+m4_include([autotools/aclocal/libtool.m4])
+m4_include([autotools/aclocal/ltoptions.m4])
+m4_include([autotools/aclocal/ltsugar.m4])
+m4_include([autotools/aclocal/ltversion.m4])
+m4_include([autotools/aclocal/lt~obsolete.m4])
 m4_include([autotools/aclocal/pkg.m4])
 m4_include([autotools/aclocal/swig_complete.m4])
 m4_include([autotools/aclocal/version_at_least.m4])
index ed2395b31284a6c44a514e66730579cb9cf2ee96..12fff45e44f893a2c3a146594c31d0c9428b61e6 100644 (file)
@@ -46,7 +46,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -133,15 +137,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -158,10 +161,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -171,6 +176,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -180,6 +186,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -221,7 +229,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -252,6 +260,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/opencv/autotools/aclocal/libtool.m4 b/opencv/autotools/aclocal/libtool.m4
new file mode 100644 (file)
index 0000000..39ba996
--- /dev/null
@@ -0,0 +1,7357 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 56 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+                  [m4_fatal([Libtool version $1 or higher is required],
+                            63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\    *)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+       [m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+       [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+       [tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+          m4_quote(lt_decl_varnames),
+       m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+                       lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+                                          [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+       dnl If the libtool generation code has been placed in $CONFIG_LT,
+       dnl instead of duplicating it all over again into config.status,
+       dnl then we will have config.status run $CONFIG_LT later, so it
+       dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+  ;;
+esac
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
+
+lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+if test "$no_create" != yes; then
+  lt_cl_success=:
+  test "$silent" = yes &&
+    lt_config_lt_args="$lt_config_lt_args --quiet"
+  exec AS_MESSAGE_LOG_FD>/dev/null
+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+  exec AS_MESSAGE_LOG_FD>>config.log
+  $lt_cl_success || AS_EXIT(1)
+fi
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_XSI_SHELLFNS
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],                 [_LT_LANG(C)],
+  [C++],               [_LT_LANG(CXX)],
+  [Java],              [_LT_LANG(GCJ)],
+  [Fortran 77],                [_LT_LANG(F77)],
+  [Fortran],           [_LT_LANG(FC)],
+  [Windows Resource],  [_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+       [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+       [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+       [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+       # By default we will add the -single_module flag. You can override
+       # by either setting the environment variable LT_MULTI_MODULE
+       # non-empty at configure time, or by adding -multi_module to the
+       # link flags.
+       rm -rf libconftest.dylib*
+       echo "int foo(void){return 1;}" > conftest.c
+       echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+       $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+         -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+       if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+         lt_cv_apple_cc_single_mod=yes
+       else
+         cat conftest.err >&AS_MESSAGE_LOG_FD
+       fi
+       rm -rf libconftest.dylib*
+       rm -f conftest.*
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+       [lt_cv_ld_exported_symbols_list=yes],
+       [lt_cv_ld_exported_symbols_list=no])
+       LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+       10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+       10.[[012]]*)
+         _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+       10.*)
+         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+            [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+        [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+[$]*
+_LT_EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+        { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+          test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+          echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+          test "X$echo_testing_string" = "X$echo_test_string"; then
+         # Cool, printf works
+         :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+            test "X$echo_testing_string" = 'X\t' &&
+            echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+            test "X$echo_testing_string" = "X$echo_test_string"; then
+         CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+         export CONFIG_SHELL
+         SHELL="$CONFIG_SHELL"
+         export SHELL
+         ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+            test "X$echo_testing_string" = 'X\t' &&
+            echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+            test "X$echo_testing_string" = "X$echo_test_string"; then
+         ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        else
+         # maybe with a smaller string...
+         prev=:
+
+         for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+           if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+           then
+             break
+           fi
+           prev="$cmd"
+         done
+
+         if test "$prev" != 'sed 50q "[$]0"'; then
+           echo_test_string=`eval $prev`
+           export echo_test_string
+           exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+         else
+           # Oops.  We lost completely, so just stick with echo.
+           ECHO=echo
+         fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+    [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+       HPUX_IA64_MODE="32"
+       ;;
+      *ELF-64*)
+       HPUX_IA64_MODE="64"
+       ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+       *32-bit*)
+         LD="${LD-ld} -melf32bsmip"
+         ;;
+       *N32*)
+         LD="${LD-ld} -melf32bmipn32"
+         ;;
+       *64-bit*)
+         LD="${LD-ld} -melf64bmip"
+       ;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+       *32-bit*)
+         LD="${LD-ld} -32"
+         ;;
+       *N32*)
+         LD="${LD-ld} -n32"
+         ;;
+       *64-bit*)
+         LD="${LD-ld} -64"
+         ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_i386_fbsd"
+           ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+         ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+           LD="${LD-ld} -m elf_s390"
+           ;;
+         sparc64-*linux*)
+           LD="${LD-ld} -m elf32_sparc"
+           ;;
+       esac
+       ;;
+      *64-bit*)
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+           ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+         ppc*-*linux*|powerpc*-*linux*)
+           LD="${LD-ld} -m elf64ppc"
+           ;;
+         s390*-*linux*|s390*-*tpf*)
+           LD="${LD-ld} -m elf64_s390"
+           ;;
+         sparc*-*linux*)
+           LD="${LD-ld} -m elf64_sparc"
+           ;;
+       esac
+       ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+       if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+         LD="${LD-ld} -64"
+       fi
+       ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#              [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[        ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+                = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+             test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL          RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL                DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL                0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW         DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW       RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW     DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW     0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+         [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+           [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+       [AC_CHECK_FUNC([dlopen],
+             [lt_cv_dlopen="dlopen"],
+         [AC_CHECK_LIB([dl], [dlopen],
+               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+           [AC_CHECK_LIB([svld], [dlopen],
+                 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+             [AC_CHECK_LIB([dld], [dld_link],
+                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+             ])
+           ])
+         ])
+       ])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+         lt_cv_dlopen_self, [dnl
+         _LT_TRY_DLOPEN_SELF(
+           lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+           lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+         lt_cv_dlopen_self_static, [dnl
+         _LT_TRY_DLOPEN_SELF(
+           lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+           lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+        [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+        [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+        [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+       [Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+       [], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+          echo ' yes '
+          echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+       :
+      else
+       can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+       if test "$lt_cv_prog_gnu_ld" = yes; then
+               version_type=linux
+       else
+               version_type=irix
+       fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+       [shlibpath_overrides_runpath=yes])])
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+       shlibpath_overrides_runpath=no
+       ;;
+      *)
+       shlibpath_overrides_runpath=yes
+       ;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+       ;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+       case $deplibs_check_method in
+       "file_magic "*)
+         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+           $EGREP "$file_magic_regex" > /dev/null; then
+           :
+         else
+           cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+         fi ;;
+       esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+        [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+       [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+       ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+       test "$with_gnu_ld" != no && break
+       ;;
+      *)
+       test "$with_gnu_ld" != yes && break
+       ;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method == "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       # Tru64's nm complains that /dev/null is an invalid object file
+       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+       */dev/null* | *'Invalid file or object type'*)
+         lt_cv_path_NM="$tmp_nm -B"
+         break
+         ;;
+       *)
+         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+         */dev/null*)
+           lt_cv_path_NM="$tmp_nm -p"
+           break
+           ;;
+         *)
+           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+           continue # so that we can try to find one that supports BSD flags
+           ;;
+         esac
+         ;;
+       esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+       [Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[    ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+       mv -f "$nlist"T "$nlist"
+      else
+       rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+       if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+         cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+         # Now generate the symbol file.
+         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+         cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+         cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+         # Now try linking the two files.
+         mv conftest.$ac_objext conftstm.$ac_objext
+         lt_save_LIBS="$LIBS"
+         lt_save_CFLAGS="$CFLAGS"
+         LIBS="conftstm.$ac_objext"
+         CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+         if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+           pipe_works=yes
+         fi
+         LIBS="$lt_save_LIBS"
+         CFLAGS="$lt_save_CFLAGS"
+       else
+         echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+       fi
+      else
+       echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+       # AIX 5 now supports IA64 processor
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+       ;;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+       # All AIX code is PIC.
+       if test "$host_cpu" = ia64; then
+         # AIX 5 now supports IA64 processor
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       else
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
+      chorus*)
+       case $cc_basename in
+       cxch68*)
+         # Green Hills C++ Compiler
+         # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+         ;;
+       esac
+       ;;
+      dgux*)
+       case $cc_basename in
+         ec++*)
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           ;;
+         ghcx*)
+           # Green Hills C++ Compiler
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      freebsd* | dragonfly*)
+       # FreeBSD uses GNU C++
+       ;;
+      hpux9* | hpux10* | hpux11*)
+       case $cc_basename in
+         CC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+           if test "$host_cpu" != ia64; then
+             _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+           fi
+           ;;
+         aCC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+           case $host_cpu in
+           hppa*64*|ia64*)
+             # +Z the default
+             ;;
+           *)
+             _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+             ;;
+           esac
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      interix*)
+       # This is c89, which is MS Visual C++ (no shared libs)
+       # Anyone wants to do a port?
+       ;;
+      irix5* | irix6* | nonstopux*)
+       case $cc_basename in
+         CC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           # CC pic flag -KPIC is the default.
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      linux* | k*bsd*-gnu)
+       case $cc_basename in
+         KCC*)
+           # KAI C++ Compiler
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+           ;;
+         ecpc* )
+           # old Intel C++ for x86_64 which still supported -KPIC.
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+           ;;
+         icpc* )
+           # Intel C++, used to be incompatible with GCC.
+           # ICC 10 doesn't accept -KPIC any more.
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+           ;;
+         pgCC* | pgcpp*)
+           # Portland Group C++ compiler
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+         cxx*)
+           # Compaq C++
+           # Make sure the PIC flag is empty.  It appears that all Alpha
+           # Linux and Compaq Tru64 Unix objects are PIC.
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           ;;
+         xlc* | xlC*)
+           # IBM XL 8.0 on PPC
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+           ;;
+         *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+             _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+             _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+             ;;
+           esac
+           ;;
+       esac
+       ;;
+      lynxos*)
+       ;;
+      m88k*)
+       ;;
+      mvs*)
+       case $cc_basename in
+         cxx*)
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      netbsd*)
+       ;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+       case $cc_basename in
+         KCC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+           ;;
+         RCC*)
+           # Rational C++ 2.4.1
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         cxx*)
+           # Digital/Compaq C++
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           # Make sure the PIC flag is empty.  It appears that all Alpha
+           # Linux and Compaq Tru64 Unix objects are PIC.
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      psos*)
+       ;;
+      solaris*)
+       case $cc_basename in
+         CC*)
+           # Sun C++ 4.2, 5.x and Centerline C++
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+           ;;
+         gcx*)
+           # Green Hills C++ Compiler
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      sunos4*)
+       case $cc_basename in
+         CC*)
+           # Sun C++ 4.x
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+         lcc*)
+           # Lucid
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+       case $cc_basename in
+         CC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+       esac
+       ;;
+      tandem*)
+       case $cc_basename in
+         NCC*)
+           # NonStop-UX NCC 3.20
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      vxworks*)
+       ;;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       ;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+       # AIX 5 now supports IA64 processor
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+       # +Z the default
+       ;;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+       # AIX 5 now supports IA64 processor
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+       # +Z the default
+       ;;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+       ;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+       ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+       # which looks to be a dead project)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl*)
+       # IBM XL C 8.0/Fortran 10.1 on PPC
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+       ;;
+      *)
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C 5.9
+         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       *Sun\ F*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+         ;;
+       esac
+       ;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+       [How to pass a linker flag through the compiler])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+       [Additional compiler flags for building library objects])
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+       [Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+       # support --undefined.  This deserves some investigation.  FIXME
+       _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname.def;
+       else
+         echo EXPORTS > $output_objdir/$soname.def;
+         cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+       case $cc_basename in
+         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
+       esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+        && test "$tmp_diet" = no
+      then
+       tmp_addflag=
+       tmp_sharedflag='-shared'
+       case $cc_basename,$host_cpu in
+        pgcc*)                         # Portland Group C compiler
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag'
+         ;;
+       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag -Mnomain' ;;
+       ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
+         tmp_addflag=' -i_dynamic' ;;
+       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
+         tmp_addflag=' -i_dynamic -nofor_main' ;;
+       ifc* | ifort*)                  # Intel Fortran compiler
+         tmp_addflag=' -nofor_main' ;;
+       lf95*)                          # Lahey Fortran 8.1
+         _LT_TAGVAR(whole_archive_flag_spec, $1)=
+         tmp_sharedflag='--shared' ;;
+       xl[[cC]]*)                      # IBM XL C 8.0 on PPC (deal with xlf below)
+         tmp_sharedflag='-qmkshrobj'
+         tmp_addflag= ;;
+       esac
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+         _LT_TAGVAR(compiler_needs_object, $1)=yes
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       esac
+       _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+           cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+           echo "local: *; };" >> $output_objdir/$libname.ver~
+           $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+       case $cc_basename in
+       xlf*)
+         # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+         _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+         _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+         if test "x$supports_anon_versioning" = xyes; then
+           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+             cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+             echo "local: *; };" >> $output_objdir/$libname.ver~
+             $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+         fi
+         ;;
+       esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+       ;;
+       *)
+         # For security reasons, it is highly recommended that you always
+         # use absolute paths for naming shared libraries, and exclude the
+         # DT_RUNPATH tag from executables and libraries.  But doing so
+         # requires that you compile everything twice, which is a pain.
+         if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+         else
+           _LT_TAGVAR(ld_shlibs, $1)=no
+         fi
+       ;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+       # Neither direct hardcoding nor static linking is supported with a
+       # broken collect2.
+       _LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+       aix_use_runtimelinking=no
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+      else
+       # If we're using GNU nm, then we don't want the "-C" option.
+       # -C means demangle to AIX nm, but means don't demangle with GNU nm
+       if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+         _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+       else
+         _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+       fi
+       aix_use_runtimelinking=no
+
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+         for ld_flag in $LDFLAGS; do
+         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+           aix_use_runtimelinking=yes
+           break
+         fi
+         done
+         ;;
+       esac
+
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+       case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+         collect2name=`${CC} -print-prog-name=collect2`
+         if test -f "$collect2name" &&
+          strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+         then
+         # We have reworked collect2
+         :
+         else
+         # We have old collect2
+         _LT_TAGVAR(hardcode_direct, $1)=unsupported
+         # It fails to find uninstalled libraries when the uninstalled
+         # path is not listed in the libpath.  Setting hardcode_minus_L
+         # to unsupported forces relinking
+         _LT_TAGVAR(hardcode_minus_L, $1)=yes
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         _LT_TAGVAR(hardcode_libdir_separator, $1)=
+         fi
+         ;;
+       esac
+       shared_flag='-shared'
+       if test "$aix_use_runtimelinking" = yes; then
+         shared_flag="$shared_flag "'${wl}-G'
+       fi
+      else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+       # chokes on -Wl,-G. The following line is correct:
+         shared_flag='-G'
+       else
+         if test "$aix_use_runtimelinking" = yes; then
+           shared_flag='${wl}-G'
+         else
+           shared_flag='${wl}-bM:SRE'
+         fi
+       fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+       _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+         _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+         _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+       else
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+         # Warning - without using the other run time loading flags,
+         # -berok will link without error, but may produce a broken library.
+         _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+         _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+         # Exported symbols can be pulled into shared objects from archives
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+         _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+         # This is similar to how AIX traditionally builds its shared libraries.
+         _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+       _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+       _LT_TAGVAR(hardcode_direct, $1)=yes
+       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       # hardcode_minus_L: Not really in the search PATH,
+       # but as the default location of the library.
+       _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       case $host_cpu in
+       hppa*64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       esac
+      else
+       case $host_cpu in
+       hppa*64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       esac
+      fi
+      if test "$with_gnu_ld" = no; then
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       case $host_cpu in
+       hppa*64*|ia64*)
+         _LT_TAGVAR(hardcode_direct, $1)=no
+         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+         ;;
+       *)
+         _LT_TAGVAR(hardcode_direct, $1)=yes
+         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+         # hardcode_minus_L: Not really in the search PATH,
+         # but as the default location of the library.
+         _LT_TAGVAR(hardcode_minus_L, $1)=yes
+         ;;
+       esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       # Try to use the -exported_symbol ld option, if it does not
+       # work, assume that -exports_file does not work either and
+       # implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        AC_LINK_IFELSE(int foo(void) {},
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+        )
+        LDFLAGS="$save_LDFLAGS"
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+       _LT_TAGVAR(hardcode_direct, $1)=yes
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+         case $host_os in
+          openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+            _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+            ;;
+          *)
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+            ;;
+         esac
+       fi
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+       _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+       _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)     # as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+       _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+       _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+       $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+       # Both c and cxx compiler support -rpath directly
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+       wlarc='${wl}'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+         $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+       case `$CC -V 2>&1` in
+       *"Compilers 5.0"*)
+         wlarc=''
+         _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+         $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+         ;;
+       *)
+         wlarc='${wl}'
+         _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+         $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+         ;;
+       esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+       # The compiler driver will combine and reorder linker options,
+       # but understands `-z linker_flag'.  GCC discards it without `$wl',
+       # but is careful enough not to reorder.
+       # Supported since Solaris 2.6 (maybe 2.5.1?)
+       if test "$GCC" = yes; then
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+       else
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+       fi
+       ;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+       # Use $CC to link under sequent, because it throws in some extra .o
+       # files that make .init and .fini sections work.
+       _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+       sni)
+         _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+       ;;
+       siemens)
+         ## LD is ld it makes a PLAMLIB
+         ## CC just makes a GrossModule.
+         _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+         _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+         _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+       motorola)
+         _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+       ;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       runpath_var=LD_RUN_PATH
+       hardcode_runpath_var=yes
+       _LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+       ;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+       pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+        _LT_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+        then
+         _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+         _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+    [Fix the shell variable $srcfile for the compiler])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+         $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+           for ld_flag in $LDFLAGS; do
+             case $ld_flag in
+             *-brtl*)
+               aix_use_runtimelinking=yes
+               break
+               ;;
+             esac
+           done
+           ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+         collect2name=`${CC} -print-prog-name=collect2`
+         if test -f "$collect2name" &&
+            strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+         then
+           # We have reworked collect2
+           :
+         else
+           # We have old collect2
+           _LT_TAGVAR(hardcode_direct, $1)=unsupported
+           # It fails to find uninstalled libraries when the uninstalled
+           # path is not listed in the libpath.  Setting hardcode_minus_L
+           # to unsupported forces relinking
+           _LT_TAGVAR(hardcode_minus_L, $1)=yes
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+           _LT_TAGVAR(hardcode_libdir_separator, $1)=
+         fi
+          esac
+          shared_flag='-shared'
+         if test "$aix_use_runtimelinking" = yes; then
+           shared_flag="$shared_flag "'${wl}-G'
+         fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+         # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+         # chokes on -Wl,-G. The following line is correct:
+         shared_flag='-G'
+          else
+           if test "$aix_use_runtimelinking" = yes; then
+             shared_flag='${wl}-G'
+           else
+             shared_flag='${wl}-bM:SRE'
+           fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+       # export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+           _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+           _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+           # Determine the default libpath from the value encoded in an
+           # empty executable.
+           _LT_SYS_MODULE_PATH_AIX
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+           # Warning - without using the other run time loading flags,
+           # -berok will link without error, but may produce a broken library.
+           _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+           _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+           # Exported symbols can be pulled into shared objects from archives
+           _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+           _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+           # This is similar to how AIX traditionally builds its shared
+           # libraries.
+           _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+         # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+         # support --undefined.  This deserves some investigation.  FIXME
+         _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+         _LT_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+         # FIXME: insert proper C++ library support
+         _LT_TAGVAR(ld_shlibs, $1)=no
+         ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+        # as there is no search path for DLLs.
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+        _LT_TAGVAR(always_export_symbols, $1)=no
+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+           cp $export_symbols $output_objdir/$soname.def;
+          else
+           echo EXPORTS > $output_objdir/$soname.def;
+           cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          _LT_TAGVAR(ld_shlibs, $1)=no
+        fi
+        ;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+       ;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          ghcx*)
+           # Green Hills C++ Compiler
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+        esac
+        ;;
+
+      freebsd[[12]]*)
+        # C++ shared libraries reported to be fairly broken before
+       # switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+                                            # but as the default
+                                            # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+             _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+                                                # but as the default
+                                                # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          aCC*)
+           case $host_cpu in
+             hppa*64*)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+             ia64*)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+             *)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+           esac
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+           ;;
+          *)
+           if test "$GXX" = yes; then
+             if test $with_gnu_ld = no; then
+               case $host_cpu in
+                 hppa*64*)
+                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+                 ia64*)
+                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+                 *)
+                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+               esac
+             fi
+           else
+             # FIXME: insert proper C++ library support
+             _LT_TAGVAR(ld_shlibs, $1)=no
+           fi
+           ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+       _LT_TAGVAR(hardcode_direct, $1)=no
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+       # Instead, shared libraries are loaded at an image base (0x10000000 by
+       # default) and relocated if they conflict, which is a slow very memory
+       # consuming and fragmenting process.  To avoid this, we pick a random,
+       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+           # SGI C++
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+           # Archives containing C++ object files must be created using
+           # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+           # necessary to make sure instantiated templates are included
+           # in the archive.
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+           ;;
+          *)
+           if test "$GXX" = yes; then
+             if test "$with_gnu_ld" = no; then
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+             else
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+             fi
+           fi
+           _LT_TAGVAR(link_all_deplibs, $1)=yes
+           ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu)
+        case $cc_basename in
+          KCC*)
+           # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+           # KCC will only create a shared library if the output file
+           # ends with ".so" (or ".sl" for HP-UX), so rename the library
+           # to its proper name (with version) after linking.
+           _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+           # Archives containing C++ object files must be created using
+           # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+           ;;
+         icpc* | ecpc* )
+           # Intel C++
+           with_gnu_ld=yes
+           # version 8.0 and above of icpc choke on multiply defined symbols
+           # if we add $predep_objects and $postdep_objects, however 7.1 and
+           # earlier do not add the objects themselves.
+           case `$CC -V 2>&1` in
+             *"Version 7."*)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+               ;;
+             *)  # Version 8.0 or newer
+               tmp_idyn=
+               case $host_cpu in
+                 ia64*) tmp_idyn=' -i_dynamic';;
+               esac
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+               ;;
+           esac
+           _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+           _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+           ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+           case `$CC -V` in
+           *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+             _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+             _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+               $RANLIB $oldlib'
+             _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+             _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+             ;;
+           *) # Version 6 will use weak symbols
+             _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+             ;;
+           esac
+
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+           _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+         cxx*)
+           # Compaq C++
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+           runpath_var=LD_RUN_PATH
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+           ;;
+         xl*)
+           # IBM XL 8.0 on PPC, with GNU ld
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+           _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+           if test "x$supports_anon_versioning" = xyes; then
+             _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+               cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+               echo "local: *; };" >> $output_objdir/$libname.ver~
+               $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+           fi
+           ;;
+         *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+             _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+             _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+             _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+             # Not sure whether something based on
+             # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+             # would be better.
+             output_verbose_link_cmd='echo'
+
+             # Archives containing C++ object files must be created using
+             # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+             # necessary to make sure instantiated templates are included
+             # in the archive.
+             _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+             ;;
+           esac
+           ;;
+       esac
+       ;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+         *)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+       esac
+       ;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+         _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+         wlarc=
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+         _LT_TAGVAR(hardcode_direct, $1)=yes
+         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       fi
+       # Workaround some broken pre-1.5 toolchains
+       output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+       ;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+       ;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
+
+      openbsd*)
+       if test -f /usr/libexec/ld.so; then
+         _LT_TAGVAR(hardcode_direct, $1)=yes
+         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+         if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+           _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+         fi
+         output_verbose_link_cmd=echo
+       else
+         _LT_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+           # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+           # KCC will only create a shared library if the output file
+           # ends with ".so" (or ".sl" for HP-UX), so rename the library
+           # to its proper name (with version) after linking.
+           _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+           # Archives containing C++ object files must be created using
+           # the KAI C++ compiler.
+           case $host in
+             osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+             *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+           esac
+           ;;
+          RCC*)
+           # Rational C++ 2.4.1
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          cxx*)
+           case $host in
+             osf3*)
+               _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+               _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+               ;;
+             *)
+               _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                 echo "-hidden">> $lib.exp~
+                 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+                 $RM $lib.exp'
+               _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+               ;;
+           esac
+
+           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+           ;;
+         *)
+           if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+             _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+             case $host in
+               osf3*)
+                 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+                 ;;
+               *)
+                 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+                 ;;
+             esac
+
+             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+             _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+             # Commands to make compiler produce verbose output that lists
+             # what "hidden" libraries, object files and flags are used when
+             # linking a shared library.
+             output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+           else
+             # FIXME: insert proper C++ library support
+             _LT_TAGVAR(ld_shlibs, $1)=no
+           fi
+           ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+           # Sun C++ 4.x
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          lcc*)
+           # Lucid
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+           # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+           _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+           _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+             $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+           _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+           case $host_os in
+             solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+             *)
+               # The compiler driver will combine and reorder linker options,
+               # but understands `-z linker_flag'.
+               # Supported since Solaris 2.6 (maybe 2.5.1?)
+               _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+               ;;
+           esac
+           _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+           output_verbose_link_cmd='echo'
+
+           # Archives containing C++ object files must be created using
+           # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+           # necessary to make sure instantiated templates are included
+           # in the archive.
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+           ;;
+          gcx*)
+           # Green Hills C++ Compiler
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+           # The C++ compiler must be used to create the archive.
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+           ;;
+          *)
+           # GNU C++ compiler with Solaris linker
+           if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+             _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+             if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+               # Commands to make compiler produce verbose output that lists
+               # what "hidden" libraries, object files and flags are used when
+               # linking a shared library.
+               output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+             else
+               # g++ 2.7 appears to require `-G' NOT `-shared' on this
+               # platform.
+               _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                 $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+               # Commands to make compiler produce verbose output that lists
+               # what "hidden" libraries, object files and flags are used when
+               # linking a shared library.
+               output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+             fi
+
+             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+             case $host_os in
+               solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+               *)
+                 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+                 ;;
+             esac
+           fi
+           ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+       # Note: We can NOT use -z defs as we might desire, because we do not
+       # link with -lc, and that would cause any symbols used from libc to
+       # always be unresolved, which means just about no library would
+       # ever link correctly.  If we're not using GNU ld we use -z text
+       # though, which does catch some bad symbols but isn't as heavy-handed
+       # as -z defs.
+       _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+       _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+       _LT_TAGVAR(link_all_deplibs, $1)=yes
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
+
+       case $cc_basename in
+          CC*)
+           _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           ;;
+         *)
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           ;;
+       esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+           # NonStop-UX NCC 3.20
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+        prev=$p
+        continue
+       else
+        prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+        case $p in
+        -L* | -R*)
+          # Internal compiler library paths should come after those
+          # provided the user.  The postdeps already come after the
+          # user supplied libs so there is no need to process them.
+          if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+            _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+          else
+            _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+          fi
+          ;;
+        # The "-l" case would never come before the object being
+        # linked, so don't bother handling this case.
+        esac
+       else
+        if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+          _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+        else
+          _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+        fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+        pre_test_object_deps_done=yes
+        continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+        if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+          _LT_TAGVAR(predep_objects, $1)="$p"
+        else
+          _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+        fi
+       else
+        if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+          _LT_TAGVAR(postdep_objects, $1)="$p"
+        else
+          _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+        fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${F77-"f77"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+       if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+         test "$enable_shared" = yes && enable_static=no
+       fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${FC-"f95"}
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+       if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+         test "$enable_shared" = yes && enable_static=no
+       fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC="$lt_save_CC"
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $[*] ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]+=\$[2]"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+    ;;
+  esac
+])
diff --git a/opencv/autotools/aclocal/libtool1.m4 b/opencv/autotools/aclocal/libtool1.m4
deleted file mode 100644 (file)
index 3ae0a21..0000000
+++ /dev/null
@@ -1,6638 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
-## 2008  Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This file is free software; the Free Software Foundation gives
-## unlimited permission to copy and/or distribute it, with or without
-## modifications, as long as this notice is preserved.
-
-# serial 52 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-                [m4_ifdef([AC_PROVIDE_$1],
-                          [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-       [AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-            [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-            [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-            [define([LT_AC_PROG_GCJ],
-               defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-_LT_REQUIRED_DARWIN_CHECKS
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-       [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-       [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-   [lt_cv_ld_exported_symbols_list=yes],
-   [lt_cv_ld_exported_symbols_list=no])
-   LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[0123]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[[012]]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-            [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-        [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-        test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-        echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-        test "X$echo_testing_string" = "X$echo_test_string"; then
-       # Cool, printf works
-       :
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-          test "X$echo_testing_string" = 'X\t' &&
-          echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-          test "X$echo_testing_string" = "X$echo_test_string"; then
-       CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-       export CONFIG_SHELL
-       SHELL="$CONFIG_SHELL"
-       export SHELL
-       echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-          test "X$echo_testing_string" = 'X\t' &&
-          echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-          test "X$echo_testing_string" = "X$echo_test_string"; then
-       echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-       # maybe with a smaller string...
-       prev=:
-
-       for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-         if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-         then
-           break
-         fi
-         prev="$cmd"
-       done
-
-       if test "$prev" != 'sed 50q "[$]0"'; then
-         echo_test_string=`eval $prev`
-         export echo_test_string
-         exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-       else
-         # Oops.  We lost completely, so just stick with echo.
-         echo=echo
-       fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-       [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_i386_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_x86_64_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-         LD="${LD-ld} -64"
-       fi
-       ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#              [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[       ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-              = "XX$teststring") >/dev/null 2>&1 &&
-             new_result=`expr "X$teststring" : ".*" 2>&1` &&
-             lt_cv_sys_max_cmd_len=$new_result &&
-             test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on massive
-      # amounts of additional arguments before passing them to the linker.
-      # It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL          RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL                DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL                0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW         DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW       RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW     DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW     0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-         [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-           [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-       [AC_CHECK_FUNC([dlopen],
-             [lt_cv_dlopen="dlopen"],
-         [AC_CHECK_LIB([dl], [dlopen],
-               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-           [AC_CHECK_LIB([svld], [dlopen],
-                 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-             [AC_CHECK_LIB([dld], [dld_link],
-                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-             ])
-           ])
-         ])
-       ])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-         lt_cv_dlopen_self, [dnl
-         _LT_AC_TRY_DLOPEN_SELF(
-           lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-           lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-         lt_cv_dlopen_self_static, [dnl
-         _LT_AC_TRY_DLOPEN_SELF(
-           lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-           lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         old_striplib="$STRIP -S"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-m4_if($1,[],[
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-          echo ' yes '
-          echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-       :
-      else
-       can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-       if test "$lt_cv_prog_gnu_ld" = yes; then
-               version_type=linux
-       else
-               version_type=irix
-       fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[         ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-       shlibpath_overrides_runpath=no
-       ;;
-      *)
-       shlibpath_overrides_runpath=yes
-       ;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-       ;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-       if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-           ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-           (test "X$CXX" != "Xg++"))) ; then
-         AC_LIBTOOL_LANG_CXX_CONFIG
-       else
-         tagname=""
-       fi
-       ;;
-
-      F77)
-       if test -n "$F77" && test "X$F77" != "Xno"; then
-         AC_LIBTOOL_LANG_F77_CONFIG
-       else
-         tagname=""
-       fi
-       ;;
-
-      GCJ)
-       if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-         AC_LIBTOOL_LANG_GCJ_CONFIG
-       else
-         tagname=""
-       fi
-       ;;
-
-      RC)
-       AC_LIBTOOL_LANG_RC_CONFIG
-       ;;
-
-      *)
-       AC_MSG_ERROR([Unsupported tag name: $tagname])
-       ;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-       [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_shared=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-       [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_static=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_fast_install=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognize shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-       case $deplibs_check_method in
-       "file_magic "*)
-         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-           $EGREP "$file_magic_regex" > /dev/null; then
-           :
-         else
-           cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-         fi ;;
-       esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognize a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-       [assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-       test "$with_gnu_ld" != no && break
-       ;;
-      *)
-       test "$with_gnu_ld" != yes && break
-       ;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-       # Check to see if the nm accepts a BSD-compat flag.
-       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-       #   nm: unknown option "B" ignored
-       # Tru64's nm complains that /dev/null is an invalid object file
-       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-       */dev/null* | *'Invalid file or object type'*)
-         lt_cv_path_NM="$tmp_nm -B"
-         break
-         ;;
-       *)
-         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-         */dev/null*)
-           lt_cv_path_NM="$tmp_nm -p"
-           break
-           ;;
-         *)
-           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-           continue # so that we can try to find one that supports BSD flags
-           ;;
-         esac
-         ;;
-       esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-        [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-          [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-       grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix[[4-9]]*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-       for ld_flag in $LDFLAGS; do
-         case $ld_flag in
-         *-brtl*)
-           aix_use_runtimelinking=yes
-           break
-           ;;
-         esac
-       done
-       ;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-       collect2name=`${CC} -print-prog-name=collect2`
-       if test -f "$collect2name" && \
-          strings "$collect2name" | grep resolve_lib_name >/dev/null
-       then
-         # We have reworked collect2
-         :
-       else
-         # We have old collect2
-         _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-         # It fails to find uninstalled libraries when the uninstalled
-         # path is not listed in the libpath.  Setting hardcode_minus_L
-         # to unsupported forces relinking
-         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-       fi
-       ;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-       shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-       # chokes on -Wl,-G. The following line is correct:
-       shared_flag='-G'
-      else
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag='${wl}-G'
-       else
-         shared_flag='${wl}-bM:SRE'
-       fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-       # Warning - without using the other run time loading flags,
-       # -berok will link without error, but may produce a broken library.
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-       # Exported symbols can be pulled into shared objects from archives
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-       # This is similar to how AIX traditionally builds its shared libraries.
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-       cp $export_symbols $output_objdir/$soname.def;
-      else
-       echo EXPORTS > $output_objdir/$soname.def;
-       cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
-      output_verbose_link_cmd='echo'
-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-      fi
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      ghcx*)
-       # Green Hills C++ Compiler
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      *)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-                               # but as the default
-                               # location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-      case $host_cpu in
-      hppa*64*|ia64*) ;;
-      *)
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-                                             # but as the default
-                                             # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      aCC*)
-       case $host_cpu in
-       hppa*64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-         ;;
-       ia64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-         ;;
-       *)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-         ;;
-       esac
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-      *)
-       if test "$GXX" = yes; then
-         if test $with_gnu_ld = no; then
-           case $host_cpu in
-           hppa*64*)
-             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-             ;;
-           ia64*)
-             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-             ;;
-           *)
-             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-             ;;
-           esac
-         fi
-       else
-         # FIXME: insert proper C++ library support
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
-    esac
-    ;;
-  interix[[3-9]]*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-       # SGI C++
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-       # Archives containing C++ object files must be created using
-       # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-       # necessary to make sure instantiated templates are included
-       # in the archive.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-       ;;
-      *)
-       if test "$GXX" = yes; then
-         if test "$with_gnu_ld" = no; then
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-         else
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-         fi
-       fi
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux* | k*bsd*-gnu)
-    case $cc_basename in
-      KCC*)
-       # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-       # KCC will only create a shared library if the output file
-       # ends with ".so" (or ".sl" for HP-UX), so rename the library
-       # to its proper name (with version) after linking.
-       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-       # Archives containing C++ object files must be created using
-       # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-       ;;
-      icpc*)
-       # Intel C++
-       with_gnu_ld=yes
-       # version 8.0 and above of icpc choke on multiply defined symbols
-       # if we add $predep_objects and $postdep_objects, however 7.1 and
-       # earlier do not add the objects themselves.
-       case `$CC -V 2>&1` in
-       *"Version 7."*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-         ;;
-       *)  # Version 8.0 or newer
-         tmp_idyn=
-         case $host_cpu in
-           ia64*) tmp_idyn=' -i_dynamic';;
-         esac
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-         ;;
-       esac
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-       ;;
-      pgCC* | pgcpp*)
-        # Portland Group C++ compiler
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-       # Compaq C++
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-       runpath_var=LD_RUN_PATH
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-      *)
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)
-         # Sun C++ 5.9
-         _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
-         # Not sure whether something based on
-         # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-         # would be better.
-         output_verbose_link_cmd='echo'
-
-         # Archives containing C++ object files must be created using
-         # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-         # necessary to make sure instantiated templates are included
-         # in the archive.
-         _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-         ;;
-       esac
-       ;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      *)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    if test -f /usr/libexec/ld.so; then
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      fi
-      output_verbose_link_cmd='echo'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-       # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-       # KCC will only create a shared library if the output file
-       # ends with ".so" (or ".sl" for HP-UX), so rename the library
-       # to its proper name (with version) after linking.
-       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       # Archives containing C++ object files must be created using
-       # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-       ;;
-      RCC*)
-       # Rational C++ 2.4.1
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      cxx*)
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-      *)
-       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-         # Commands to make compiler produce verbose output that lists
-         # what "hidden" libraries, object files and flags are used when
-         # linking a shared library.
-         output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-       else
-         # FIXME: insert proper C++ library support
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-       # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-       # KCC will only create a shared library if the output file
-       # ends with ".so" (or ".sl" for HP-UX), so rename the library
-       # to its proper name (with version) after linking.
-       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       # Archives containing C++ object files must be created using
-       # the KAI C++ compiler.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-       ;;
-      RCC*)
-       # Rational C++ 2.4.1
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      cxx*)
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-         echo "-hidden">> $lib.exp~
-         $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-         $rm $lib.exp'
-
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-      *)
-       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-         # Commands to make compiler produce verbose output that lists
-         # what "hidden" libraries, object files and flags are used when
-         # linking a shared library.
-         output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-       else
-         # FIXME: insert proper C++ library support
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-       # Sun C++ 4.x
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      lcc*)
-       # Lucid
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      *)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-       # Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-       $CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       case $host_os in
-         solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-         *)
-           # The compiler driver will combine and reorder linker options,
-           # but understands `-z linker_flag'.
-           # Supported since Solaris 2.6 (maybe 2.5.1?)
-           _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-           ;;
-       esac
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-       output_verbose_link_cmd='echo'
-
-       # Archives containing C++ object files must be created using
-       # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-       # necessary to make sure instantiated templates are included
-       # in the archive.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-       ;;
-      gcx*)
-       # Green Hills C++ Compiler
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-       # The C++ compiler must be used to create the archive.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-       ;;
-      *)
-       # GNU C++ compiler with Solaris linker
-       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-         if $CC --version | grep -v '^2\.7' > /dev/null; then
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-               $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-           # Commands to make compiler produce verbose output that lists
-           # what "hidden" libraries, object files and flags are used when
-           # linking a shared library.
-           output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-         else
-           # g++ 2.7 appears to require `-G' NOT `-shared' on this
-           # platform.
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-               $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-           # Commands to make compiler produce verbose output that lists
-           # what "hidden" libraries, object files and flags are used when
-           # linking a shared library.
-           output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-         fi
-
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-         case $host_os in
-         solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-         *)
-           _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-           ;;
-         esac
-       fi
-       ;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       ;;
-      *)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       ;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       ;;
-      *)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       ;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-       # NonStop-UX NCC 3.20
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-      *)
-       # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       ;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-         || test $p = "-R"; then
-        prev=$p
-        continue
-       else
-        prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-        case $p in
-        -L* | -R*)
-          # Internal compiler library paths should come after those
-          # provided the user.  The postdeps already come after the
-          # user supplied libs so there is no need to process them.
-          if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-            _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-          else
-            _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-          fi
-          ;;
-        # The "-l" case would never come before the object being
-        # linked, so don't bother handling this case.
-        esac
-       else
-        if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-          _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-        else
-          _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-        fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-        pre_test_object_deps_done=yes
-        continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-        if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-          _LT_AC_TAGVAR(predep_objects, $1)="$p"
-        else
-          _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-        fi
-       else
-        if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-          _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-        else
-          _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-        fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-    #
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
-      program t
-      end
-"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([LT_AC_PROG_SED])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux* | k*bsd*-gnu)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[     ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-       mv -f "$nlist"T "$nlist"
-      else
-       rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-       if grep ' nm_test_func$' "$nlist" >/dev/null; then
-         cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-         # Now generate the symbol file.
-         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-         cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-         cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-         # Now try linking the two files.
-         mv conftest.$ac_objext conftstm.$ac_objext
-         lt_save_LIBS="$LIBS"
-         lt_save_CFLAGS="$CFLAGS"
-         LIBS="conftstm.$ac_objext"
-         CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-         if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-           pipe_works=yes
-         fi
-         LIBS="$lt_save_LIBS"
-         CFLAGS="$lt_save_CFLAGS"
-       else
-         echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-       fi
-      else
-       echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       ;;
-      *)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       ;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-       # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
-         # AIX 5 now supports IA64 processor
-         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       else
-         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-      chorus*)
-       case $cc_basename in
-       cxch68*)
-         # Green Hills C++ Compiler
-         # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-         ;;
-       esac
-       ;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-       case $cc_basename in
-         ec++*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           ;;
-         ghcx*)
-           # Green Hills C++ Compiler
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      freebsd* | dragonfly*)
-       # FreeBSD uses GNU C++
-       ;;
-      hpux9* | hpux10* | hpux11*)
-       case $cc_basename in
-         CC*)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-           if test "$host_cpu" != ia64; then
-             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-           fi
-           ;;
-         aCC*)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-           case $host_cpu in
-           hppa*64*|ia64*)
-             # +Z the default
-             ;;
-           *)
-             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-             ;;
-           esac
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      interix*)
-       # This is c89, which is MS Visual C++ (no shared libs)
-       # Anyone wants to do a port?
-       ;;
-      irix5* | irix6* | nonstopux*)
-       case $cc_basename in
-         CC*)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           # CC pic flag -KPIC is the default.
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      linux* | k*bsd*-gnu)
-       case $cc_basename in
-         KCC*)
-           # KAI C++ Compiler
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-           ;;
-         icpc* | ecpc*)
-           # Intel C++
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-           ;;
-         pgCC* | pgcpp*)
-           # Portland Group C++ compiler.
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-         cxx*)
-           # Compaq C++
-           # Make sure the PIC flag is empty.  It appears that all Alpha
-           # Linux and Compaq Tru64 Unix objects are PIC.
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           ;;
-         *)
-           case `$CC -V 2>&1 | sed 5q` in
-           *Sun\ C*)
-             # Sun C++ 5.9
-             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-             _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-             ;;
-           esac
-           ;;
-       esac
-       ;;
-      lynxos*)
-       ;;
-      m88k*)
-       ;;
-      mvs*)
-       case $cc_basename in
-         cxx*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      netbsd*)
-       ;;
-      osf3* | osf4* | osf5*)
-       case $cc_basename in
-         KCC*)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-           ;;
-         RCC*)
-           # Rational C++ 2.4.1
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         cxx*)
-           # Digital/Compaq C++
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           # Make sure the PIC flag is empty.  It appears that all Alpha
-           # Linux and Compaq Tru64 Unix objects are PIC.
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      psos*)
-       ;;
-      solaris*)
-       case $cc_basename in
-         CC*)
-           # Sun C++ 4.2, 5.x and Centerline C++
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-           ;;
-         gcx*)
-           # Green Hills C++ Compiler
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      sunos4*)
-       case $cc_basename in
-         CC*)
-           # Sun C++ 4.x
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-         lcc*)
-           # Lucid
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      tandem*)
-       case $cc_basename in
-         NCC*)
-           # NonStop-UX NCC 3.20
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-       case $cc_basename in
-         CC*)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-       esac
-       ;;
-      vxworks*)
-       ;;
-      *)
-       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-       ;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       ;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-       ;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-       # which looks to be a dead project)
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)
-         # Sun C 5.9
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       *Sun\ F*)
-         # Sun Fortran 8.3 passes all unrecognized flags to the linker
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-         ;;
-       esac
-       ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-       # support --undefined.  This deserves some investigation.  FIXME
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname.def;
-       else
-         echo EXPORTS > $output_objdir/$soname.def;
-         cat $export_symbols >> $output_objdir/$soname.def;
-       fi~
-       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       tmp_addflag=
-       case $cc_basename,$host_cpu in
-       pgcc*)                          # Portland Group C compiler
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag'
-         ;;
-       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag -Mnomain' ;;
-       ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
-         tmp_addflag=' -i_dynamic' ;;
-       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-         tmp_addflag=' -i_dynamic -nofor_main' ;;
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
-       esac
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)                       # Sun C 5.9
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_sharedflag='-G' ;;
-       *Sun\ F*)                       # Sun Fortran 8.3
-         tmp_sharedflag='-G' ;;
-       *)
-         tmp_sharedflag='-shared' ;;
-       esac
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-       if test $supports_anon_versioning = yes; then
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-       fi
-      else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-      else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-       ;;
-       *)
-         if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-         else
-           _LT_AC_TAGVAR(ld_shlibs, $1)=no
-         fi
-       ;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-       # Neither direct hardcoding nor static linking is supported with a
-       # broken collect2.
-       _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-       aix_use_runtimelinking=no
-       exp_sym_flag='-Bexport'
-       no_entry_flag=""
-      else
-       # If we're using GNU nm, then we don't want the "-C" option.
-       # -C means demangle to AIX nm, but means don't demangle with GNU nm
-       if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-         _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-       else
-         _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-       fi
-       aix_use_runtimelinking=no
-
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
-       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-         for ld_flag in $LDFLAGS; do
-         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-           aix_use_runtimelinking=yes
-           break
-         fi
-         done
-         ;;
-       esac
-
-       exp_sym_flag='-bexport'
-       no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-       case $host_os in aix4.[[012]]|aix4.[[012]].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
-         collect2name=`${CC} -print-prog-name=collect2`
-         if test -f "$collect2name" && \
-          strings "$collect2name" | grep resolve_lib_name >/dev/null
-         then
-         # We have reworked collect2
-         :
-         else
-         # We have old collect2
-         _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-         # It fails to find uninstalled libraries when the uninstalled
-         # path is not listed in the libpath.  Setting hardcode_minus_L
-         # to unsupported forces relinking
-         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-         fi
-         ;;
-       esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
-      else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-       # chokes on -Wl,-G. The following line is correct:
-         shared_flag='-G'
-       else
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag='${wl}-G'
-         else
-           shared_flag='${wl}-bM:SRE'
-         fi
-       fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-       # Warning - without using the other runtime loading flags (-brtl),
-       # -berok will link without error, but may produce a broken library.
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-       if test "$host_cpu" = ia64; then
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
-        # Determine the default libpath from the value encoded in an empty executable.
-        _LT_AC_SYS_LIBPATH_AIX
-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-         # Warning - without using the other run time loading flags,
-         # -berok will link without error, but may produce a broken library.
-         _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-         # Exported symbols can be pulled into shared objects from archives
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-         # This is similar to how AIX traditionally builds its shared libraries.
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-       output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-       # hardcode_minus_L: Not really in the search PATH,
-       # but as the default location of the library.
-       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       case $host_cpu in
-       hppa*64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      else
-       case $host_cpu in
-       hppa*64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      fi
-      if test "$with_gnu_ld" = no; then
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       case $host_cpu in
-       hppa*64*|ia64*)
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-         _LT_AC_TAGVAR(hardcode_direct, $1)=no
-         _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-         ;;
-       *)
-         _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-         ;;
-       esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
-         case $host_os in
-          openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-            _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-            _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-            ;;
-          *)
-            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-            _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-            ;;
-         esac
-        fi
-      else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)     # as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-       $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-       # Both c and cxx compiler support -rpath directly
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-       wlarc='${wl}'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-         $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-       wlarc=''
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-       $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-       # The compiler driver will combine and reorder linker options,
-       # but understands `-z linker_flag'.  GCC discards it without `$wl',
-       # but is careful enough not to reorder.
-       # Supported since Solaris 2.6 (maybe 2.5.1?)
-       if test "$GCC" = yes; then
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-       else
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-       fi
-       ;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-       # Use $CC to link under sequent, because it throws in some extra .o
-       # files that make .init and .fini sections work.
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-       sni)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-       ;;
-       siemens)
-         ## LD is ld it makes a PLAMLIB
-         ## CC just makes a GrossModule.
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-         _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-         _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-       motorola)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-       ;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       runpath_var=LD_RUN_PATH
-       hardcode_runpath_var=yes
-       _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-       pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-
-# Cheap backport of AS_EXECUTABLE_P and required macros
-# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-# _AS_TEST_PREPARE
-# ----------------
-m4_ifndef([_AS_TEST_PREPARE],
-[m4_defun([_AS_TEST_PREPARE],
-[if test -x / >/dev/null 2>&1; then
-  as_executable_p='test -x'
-else
-  as_executable_p='test -f'
-fi
-])])# _AS_TEST_PREPARE
-
-# AS_EXECUTABLE_P
-# ---------------
-# Check whether a file is executable.
-m4_ifndef([AS_EXECUTABLE_P],
-[m4_defun([AS_EXECUTABLE_P],
-[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-$as_executable_p $1[]dnl
-])])# AS_EXECUTABLE_P
-
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])
diff --git a/opencv/autotools/aclocal/ltoptions.m4 b/opencv/autotools/aclocal/ltoptions.m4
new file mode 100644 (file)
index 0000000..34151a3
--- /dev/null
@@ -0,0 +1,368 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+           [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+                     [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+                  [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [0], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+       [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_shared=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+       [Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+       [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_static=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+       [Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_fast_install=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+        [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic],
+       [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+                [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+                [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+                [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+                [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+                [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/opencv/autotools/aclocal/ltsugar.m4 b/opencv/autotools/aclocal/ltsugar.m4
new file mode 100644 (file)
index 0000000..9000a05
--- /dev/null
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+          m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+            [m4_foreach([_Lt_suffix],
+               ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+       [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+         [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+                [lt_append([$1], [$2], [$3])$4],
+                [$5])],
+         [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+       m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+       [$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+                     [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/opencv/autotools/aclocal/ltversion.m4 b/opencv/autotools/aclocal/ltversion.m4
new file mode 100644 (file)
index 0000000..b8e154f
--- /dev/null
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers                      -*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# Generated from ltversion.in.
+
+# serial 3012 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.2.6])
+m4_define([LT_PACKAGE_REVISION], [1.3012])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.2.6'
+macro_revision='1.3012'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/opencv/autotools/aclocal/lt~obsolete.m4 b/opencv/autotools/aclocal/lt~obsolete.m4
new file mode 100644 (file)
index 0000000..637bb20
--- /dev/null
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 4 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],  [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],             [AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],        [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],         [AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],    [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],           [AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],             [AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],    [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],           [AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],       [AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],               [AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],        [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],    [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],    [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],         [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],            [AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],  [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],             [AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],            [AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],    [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],   [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],          [AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],            [AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],           [AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],  [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],    [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],          [AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],          [AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],                [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],     [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],          [AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],   [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],           [AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],           [AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],           [AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC],             [AC_DEFUN([AC_LIBTOOL_RC])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],  [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],      [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],    [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],    [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],    [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],     [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],         [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],       [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
index 06823e057a578f95dabd0f233875dcf0553173c7..b36c4ad366cbb8c137b19a3789eecf29af5aeb98 100644 (file)
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.6
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
 #
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+#     --config             show all configuration variables
+#     --debug              enable verbose shell tracing
+# -n, --dry-run            display commands without modifying any files
+#     --features           display basic configuration information and exit
+#     --mode=MODE          use operation mode MODE
+#     --preserve-dup-deps  don't remove duplicate dependency libraries
+#     --quiet, --silent    don't print informational messages
+#     --tag=TAG            use configuration variables from tag TAG
+# -v, --verbose            print informational messages (default)
+#     --version            print version information
+# -h, --help               print short or long help message
+#
+# MODE must be one of the following:
+#
+#       clean              remove files from the build directory
+#       compile            compile a source file into a libtool object
+#       execute            automatically set library path, then run a program
+#       finish             complete the installation of libtool libraries
+#       install            install libraries or executables
+#       link               create a library or an executable
+#       uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#       host-triplet:  $host
+#       shell:         $SHELL
+#       compiler:              $LTCC
+#       compiler flags:                $LTCFLAGS
+#       linker:                $LD (gnu? $with_gnu_ld)
+#       $progname:             (GNU libtool) 2.2.6
+#       automake:              $automake_version
+#       autoconf:              $autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=2.2.6
+TIMESTAMP=""
+package_revision=1.3012
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+         export $lt_var
+         lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+         lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+       fi"
+done
+
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/opt/local/bin/gsed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
 
-basename="s,^.*/,,g"
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77     # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS="  $lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+# Generated shell functions inserted here.
 
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
@@ -34,112 +178,174 @@ basename="s,^.*/,,g"
 progpath="$0"
 
 # The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+  -*) progname=./$progname ;;
+esac
 
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=:
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
 
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname${mode+: }$mode: $*"
+}
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
-  setopt NO_GLOB_SUBST
-fi
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
 
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
 
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
+    # bash bug again:
+    :
+}
 
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
 
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS="  $lt_nl"
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
 
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
 
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+       # list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+       IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
 
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
 
 # func_mktempdir [string]
 # Make a temporary directory that won't clash with other running
@@ -149,7 +355,7 @@ func_mktempdir ()
 {
     my_template="${TMPDIR-/tmp}/${1-$progname}"
 
-    if test "$run" = ":"; then
+    if test "$opt_dry_run" = ":"; then
       # Return a directory name, but don't create it in dry-run mode
       my_tmpdir="${my_template}-$$"
     else
@@ -158,546 +364,818 @@ func_mktempdir ()
       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
 
       if test ! -d "$my_tmpdir"; then
-       # Failing that, at least try and use $RANDOM to avoid a race
-       my_tmpdir="${my_template}-${RANDOM-0}$$"
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
 
-       save_mktempdir_umask=`umask`
-       umask 0077
-       $mkdir "$my_tmpdir"
-       umask $save_mktempdir_umask
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
       fi
 
       # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-       exit $EXIT_FAILURE
-      }
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $echo "X$my_tmpdir" | $Xsed
+    $ECHO "X$my_tmpdir" | $Xsed
 }
 
 
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
 {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-       $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
+    case $1 in
+      *[\\\`\"\$]*)
+       func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
     esac
-    ;;
-  esac
-  $echo $win32_libid_type
 }
 
 
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
 {
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-       case $arg in
-         *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-         arg="\"$arg\""
-         ;;
-       esac
-       CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
+    case $1 in
+      *[\\\`\"]*)
+       my_arg=`$ECHO "X$1" | $Xsed \
+           -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
-       for z in $available_tags; do
-         if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-           # Evaluate the configuration.
-           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-           CC_quoted=
-           for arg in $CC; do
-           # Double-quote args containing other shell metacharacters.
-           case $arg in
-             *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
-             arg="\"$arg\""
-             ;;
-           esac
-           CC_quoted="$CC_quoted $arg"
-         done
-           case "$@ " in
-             " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-             # The compiler in the base compile command matches
-             # the one in the tagged configuration.
-             # Assume this is the tagged configuration we want.
-             tagname=$z
-             break
-             ;;
-           esac
-         fi
-       done
-       # If $tagname still isn't set, then no tagged configuration
-       # was found and let the user know that the "--tag" command
-       # line option must be used.
-       if test -z "$tagname"; then
-         $echo "$modename: unable to infer tagged configuration"
-         $echo "$modename: specify a tag with \`--tag'" 1>&2
-         exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-       fi
-       ;;
-      esac
-    fi
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
 }
 
 
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
 {
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
 
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+       eval "(exit $my_status); $my_fail_exp"
+      fi
     fi
 }
 
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
 {
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
 
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-       [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-       *) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-       exit $exit_status
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+           $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+       eval "(exit $my_status); $my_fail_exp"
       fi
-      case $host in
-      *-darwin*)
-       $show "Extracting $my_xabs"
-       # Do not bother doing anything if just a dry run
-       if test -z "$run"; then
-         darwin_orig_dir=`pwd`
-         cd $my_xdir || exit $?
-         darwin_archive=$my_xabs
-         darwin_curdir=`pwd`
-         darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-         darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-         if test -n "$darwin_arches"; then 
-           darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-           darwin_arch=
-           $show "$darwin_base_archive has multiple architectures $darwin_arches"
-           for darwin_arch in  $darwin_arches ; do
-             mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-             lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-             cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-             func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-             cd "$darwin_curdir"
-             $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-           done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-           darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-           darwin_file=
-           darwin_files=
-           for darwin_file in $darwin_filelist; do
-             darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-             lipo -create -output "$darwin_file" $darwin_files
-           done # $darwin_filelist
-           ${rm}r unfat-$$
-           cd "$darwin_orig_dir"
-         else
-           cd "$darwin_orig_dir"
-           func_extract_an_archive "$my_xdir" "$my_xabs"
-         fi # $darwin_arches
-       fi # $run
-       ;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
+    fi
 }
-# End of Shell function definitions
-#####################################
 
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
 
-disable_libs=no
 
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+       s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $SED -n '/^# Usage:/,/# -h/ {
+        s/^# //
+       s/^# *$//
+       s/\$progname/'$progname'/
+       p
+    }' < "$progpath"
+    $ECHO
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+        s/^# //
+       s/^# *$//
+       s*\$progname*'$progname'*
+       s*\$host*'"$host"'*
+       s*\$SHELL*'"$SHELL"'*
+       s*\$LTCC*'"$LTCC"'*
+       s*\$LTCFLAGS*'"$LTCFLAGS"'*
+       s*\$LD*'"$LD"'*
+       s/\$with_gnu_ld/'"$with_gnu_ld"'/
+       s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+       s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+       p
+     }' < "$progpath"
+    exit $?
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    func_error "missing argument for $1"
+    exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
   shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell, and then maybe $ECHO will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
 
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
 
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-       $echo "$progname: invalid tag name: $tagname" 1>&2
-       exit $EXIT_FAILURE
-       ;;
-      esac
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
 
-      case $tagname in
-      CC)
-       # Don't test for the "default" C tag, as we know, it's there, but
-       # not specially marked.
-       ;;
-      *)
-       if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-         taglist="$taglist $tagname"
-         # Evaluate the configuration.
-         eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-       else
-         $echo "$progname: ignoring unknown tag $tagname" 1>&2
-       fi
-       ;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
-    prev=
-    prevopt=
-    continue
-  fi
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
 
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
 
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
 
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
     # Now print the configurations for the tags.
     for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
     done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
 
-  --dry-run | -n)
-    run=:
-    ;;
+    exit $?
+}
 
-  --features)
-    $echo "host: $host"
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    $ECHO "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
+      $ECHO "enable shared libraries"
     else
-      $echo "disable shared libraries"
+      $ECHO "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
+      $ECHO "enable static libraries"
     else
-      $echo "disable static libraries"
+      $ECHO "disable static libraries"
     fi
+
     exit $?
-    ;;
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
 
-  --finish) mode="finish" ;;
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
 
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
 
-  --preserve-dup-deps) duplicate_deps="yes" ;;
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+       taglist="$taglist $tagname"
+
+       # Evaluate the configuration.  Be careful to quote the path
+       # and the sed script, to avoid splitting on whitespace, but
+       # also don't use non-portable quotes within backquotes within
+       # quotes we have to do it in 2 steps:
+       extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+       eval "$extractedcf"
+      else
+       func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
 
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
+# Parse options once, thoroughly.  This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
 
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
+  # Shorthand for --mode=foo, only valid as the first argument
+  case $1 in
+  clean|clea|cle|cl)
+    shift; set dummy --mode clean ${1+"$@"}; shift
     ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
+  compile|compil|compi|comp|com|co|c)
+    shift; set dummy --mode compile ${1+"$@"}; shift
     ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
+  execute|execut|execu|exec|exe|ex|e)
+    shift; set dummy --mode execute ${1+"$@"}; shift
     ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
+  finish|finis|fini|fin|fi|f)
+    shift; set dummy --mode finish ${1+"$@"}; shift
     ;;
-
-  *)
-    nonopt="$arg"
-    break
+  install|instal|insta|inst|ins|in|i)
+    shift; set dummy --mode install ${1+"$@"}; shift
+    ;;
+  link|lin|li|l)
+    shift; set dummy --mode link ${1+"$@"}; shift
+    ;;
+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+    shift; set dummy --mode uninstall ${1+"$@"}; shift
     ;;
   esac
-done
 
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
+  # Parse non-mode specific arguments:
+  while test "$#" -gt 0; do
+    opt="$1"
+    shift
 
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
+    case $opt in
+      --config)                func_config                                     ;;
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
+      --debug)         preserve_args="$preserve_args $opt"
+                       func_echo "enabling shell trace mode"
+                       opt_debug='set -x'
+                       $opt_debug
+                       ;;
 
-if test -z "$show_help"; then
+      -dlopen)         test "$#" -eq 0 && func_missing_arg "$opt" && break
+                       execute_dlfiles="$execute_dlfiles $1"
+                       shift
+                       ;;
 
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-       case $arg in
-       -c)
-          mode=compile
-          break
-          ;;
-       esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
+      --dry-run | -n)  opt_dry_run=:                                   ;;
+      --features)       func_features                                  ;;
+      --finish)                mode="finish"                                   ;;
+
+      --mode)          test "$#" -eq 0 && func_missing_arg "$opt" && break
+                       case $1 in
+                         # Valid mode arguments:
+                         clean)        ;;
+                         compile)      ;;
+                         execute)      ;;
+                         finish)       ;;
+                         install)      ;;
+                         link)         ;;
+                         relink)       ;;
+                         uninstall)    ;;
+
+                         # Catch anything else as an error
+                         *) func_error "invalid argument for $opt"
+                            exit_cmd=exit
+                            break
+                            ;;
+                       esac
+
+                       mode="$1"
+                       shift
+                       ;;
+
+      --preserve-dup-deps)
+                       opt_duplicate_deps=:                            ;;
+
+      --quiet|--silent)        preserve_args="$preserve_args $opt"
+                       opt_silent=:
+                       ;;
+
+      --verbose| -v)   preserve_args="$preserve_args $opt"
+                       opt_silent=false
+                       ;;
+
+      --tag)           test "$#" -eq 0 && func_missing_arg "$opt" && break
+                       preserve_args="$preserve_args $opt $1"
+                       func_enable_tag "$1"    # tagname is set here
+                       shift
+                       ;;
+
+      # Separate optargs to long options:
+      -dlopen=*|--mode=*|--tag=*)
+                       func_opt_split "$opt"
+                       set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+                       shift
+                       ;;
+
+      -\?|-h)          func_usage                                      ;;
+      --help)          opt_help=:                                      ;;
+      --version)       func_version                                    ;;
+
+      -*)              func_fatal_help "unrecognized option \`$opt'"   ;;
+
+      *)               nonopt="$opt"
+                       break
+                       ;;
+    esac
+  done
+
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      ;;
+  esac
 
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-       if test -n "$nonopt"; then
-         $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-       else
-         $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-       fi
+  # Having warned about all mis-specified options, bail out if
+  # anything was wrong.
+  $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
       fi
-      ;;
-    esac
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+$opt_help || {
+  # Sanity checks first:
+  func_check_version_match
+
+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+    func_fatal_configuration "not configured to build any kind of library"
   fi
 
+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+  # Darwin sucks
+  eval std_shrext=\"$shrext_cmds\"
+
+
   # Only execute mode is allowed to have -dlopen flags.
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
+    func_error "unrecognized option \`-dlopen'"
+    $ECHO "$help" 1>&2
     exit $EXIT_FAILURE
   fi
 
   # Change the help message to a mode-specific one.
   generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
+  help="Try \`$progname --help --mode=$mode' for more information."
+}
 
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
 
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-       # do not "continue".  Instead, add this to base_compile
-       lastarg="$arg"
-       arg_mode=normal
-       ;;
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
 
-      target )
-       libobj="$arg"
-       arg_mode=normal
-       continue
-       ;;
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+       for lalib_p_l in 1 2 3 4
+       do
+           read lalib_p_line
+           case "$lalib_p_line" in
+               \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+           esac
+       done
+       exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
 
-      normal )
-       # Accept any command-line options.
-       case $arg in
-       -o)
-         if test -n "$libobj" ; then
-           $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-           exit $EXIT_FAILURE
-         fi
-         arg_mode=target
-         continue
-         ;;
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
 
-       -static | -prefer-pic | -prefer-non-pic)
-         later="$later $arg"
-         continue
-         ;;
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
 
-       -no-suppress)
-         suppress_opt=no
-         continue
-         ;;
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_ltwrapper_scriptname_result=""
+    if func_ltwrapper_executable_p "$1"; then
+       func_dirname_and_basename "$1" "" "."
+       func_stripname '' '.exe' "$func_basename_result"
+       func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    fi
+}
 
-       -Xcompiler)
-         arg_mode=arg  #  the next one goes into the "base_compile" arg list
-         continue      #  The current "srcfile" will either be retained or
-         ;;            #  replaced later.  I would guess that would be a bug.
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
 
-       -Wc,*)
-         args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-         lastarg=
-         save_ifs="$IFS"; IFS=','
-         for arg in $args; do
-           IFS="$save_ifs"
 
-           # Double-quote args containing other shell metacharacters.
-           # Many Bourne shells cannot handle close brackets correctly
-           # in scan sets, so we specify it separately.
-           case $arg in
-             *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \     ]*|*]*|"")
-             arg="\"$arg\""
-             ;;
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)        . "$1" ;;
+    *)         . "./$1" ;;
+    esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+        func_quote_for_eval "$arg"
+       CC_quoted="$CC_quoted $func_quote_for_eval_result"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+       for z in $available_tags; do
+         if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+           # Evaluate the configuration.
+           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+           CC_quoted=
+           for arg in $CC; do
+             # Double-quote args containing other shell metacharacters.
+             func_quote_for_eval "$arg"
+             CC_quoted="$CC_quoted $func_quote_for_eval_result"
+           done
+           case "$@ " in
+             " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+             # The compiler in the base compile command matches
+             # the one in the tagged configuration.
+             # Assume this is the tagged configuration we want.
+             tagname=$z
+             break
+             ;;
            esac
-           lastarg="$lastarg $arg"
+         fi
+       done
+       # If $tagname still isn't set, then no tagged configuration
+       # was found and let the user know that the "--tag" command
+       # line option must be used.
+       if test -z "$tagname"; then
+         func_echo "unable to infer tagged configuration"
+         func_fatal_error "specify a tag with \`--tag'"
+#      else
+#        func_verbose "using $tagname tagged configuration"
+       fi
+       ;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+       # do not "continue".  Instead, add this to base_compile
+       lastarg="$arg"
+       arg_mode=normal
+       ;;
+
+      target )
+       libobj="$arg"
+       arg_mode=normal
+       continue
+       ;;
+
+      normal )
+       # Accept any command-line options.
+       case $arg in
+       -o)
+         test -n "$libobj" && \
+           func_fatal_error "you cannot specify \`-o' more than once"
+         arg_mode=target
+         continue
+         ;;
+
+       -pie | -fpie | -fPIE)
+          pie_flag="$pie_flag $arg"
+         continue
+         ;;
+
+       -shared | -static | -prefer-pic | -prefer-non-pic)
+         later="$later $arg"
+         continue
+         ;;
+
+       -no-suppress)
+         suppress_opt=no
+         continue
+         ;;
+
+       -Xcompiler)
+         arg_mode=arg  #  the next one goes into the "base_compile" arg list
+         continue      #  The current "srcfile" will either be retained or
+         ;;            #  replaced later.  I would guess that would be a bug.
+
+       -Wc,*)
+         func_stripname '-Wc,' '' "$arg"
+         args=$func_stripname_result
+         lastarg=
+         save_ifs="$IFS"; IFS=','
+         for arg in $args; do
+           IFS="$save_ifs"
+           func_quote_for_eval "$arg"
+           lastarg="$lastarg $func_quote_for_eval_result"
          done
          IFS="$save_ifs"
-         lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+         func_stripname ' ' '' "$lastarg"
+         lastarg=$func_stripname_result
 
          # Add the arguments to base_compile.
          base_compile="$base_compile $lastarg"
          continue
          ;;
 
-       * )
+       *)
          # Accept the current argument as the source file.
          # The previous "srcfile" becomes the current argument.
          #
@@ -709,64 +1187,42 @@ if test -z "$show_help"; then
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       lastarg="\"$lastarg\""
-       ;;
-      esac
-
-      base_compile="$base_compile $lastarg"
+      func_quote_for_eval "$lastarg"
+      base_compile="$base_compile $func_quote_for_eval_result"
     done # for arg
 
     case $arg_mode in
     arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
+      func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_error "you must specify a target with \`-o'"
       ;;
     *)
       # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      test -z "$libobj" && {
+       func_basename "$srcfile"
+       libobj="$func_basename_result"
+      }
       ;;
     esac
 
     # Recognize several different file suffixes.
     # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
     case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
     esac
 
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
     case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
       ;;
     esac
 
@@ -774,7 +1230,15 @@ if test -z "$show_help"; then
 
     for arg in $later; do
       case $arg in
+      -shared)
+       test "$build_libtool_libs" != yes && \
+         func_fatal_configuration "can not build a shared library"
+       build_old_libs=no
+       continue
+       ;;
+
       -static)
+       build_libtool_libs=no
        build_old_libs=yes
        continue
        ;;
@@ -791,28 +1255,17 @@ if test -z "$show_help"; then
       esac
     done
 
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-       && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"'  &()|`$[]' \
-       && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'   &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
     lobj=${xdir}$objdir/$objname
 
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
     if test "$build_old_libs" = yes; then
@@ -821,12 +1274,9 @@ if test -z "$show_help"; then
       removelist="$lobj $libobj ${libobj}T"
     fi
 
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
       pic_mode=default
       ;;
     esac
@@ -838,10 +1288,8 @@ if test -z "$show_help"; then
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
       output_obj=
       need_locks=no
@@ -851,13 +1299,13 @@ if test -z "$show_help"; then
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-       $show "Waiting for $lockfile to be removed"
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+       func_echo "Waiting for $lockfile to be removed"
        sleep 2
       done
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
-       $echo "\
+       $ECHO "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
@@ -868,34 +1316,22 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-       $run $rm $removelist
+       $opt_dry_run || $RM $removelist
        exit $EXIT_FAILURE
       fi
-      $echo "$srcfile" > "$lockfile"
+      removelist="$removelist $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
     fi
 
+    $opt_dry_run || $RM $removelist
+    removelist="$removelist $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
     if test "$build_libtool_libs" = yes; then
@@ -909,32 +1345,19 @@ EOF
        command="$base_compile $qsrcfile"
       fi
 
-      if test ! -d "${xdir}$objdir"; then
-       $show "$mkdir ${xdir}$objdir"
-       $run $mkdir ${xdir}$objdir
-       exit_status=$?
-       if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-         exit $exit_status
-       fi
-      fi
+      func_mkdir_p "$xdir$objdir"
 
       if test -z "$output_obj"; then
        # Place PIC objects in $objdir
        command="$command -o $lobj"
       fi
 
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-       test -n "$output_obj" && $run $rm $removelist
-       exit $EXIT_FAILURE
-      fi
+      func_show_eval_locale "$command" \
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
       if test "$need_locks" = warn &&
         test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-       $echo "\
+       $ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -948,45 +1371,27 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-       $run $rm $removelist
+       $opt_dry_run || $RM $removelist
        exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-       $show "$mv $output_obj $lobj"
-       if $run $mv $output_obj $lobj; then :
-       else
-         error=$?
-         $run $rm $removelist
-         exit $error
-       fi
+       func_show_eval '$MV "$output_obj" "$lobj"' \
+         'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
 
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
       # Allow error messages only from the first compilation.
       if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
+       suppress_output=' >/dev/null 2>&1'
       fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
     fi
 
     # Only build a position-dependent object if we build old libraries.
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
        # Don't build PIC code
-       command="$base_compile $qsrcfile"
+       command="$base_compile $qsrcfile$pie_flag"
       else
        command="$base_compile $qsrcfile $pic_flag"
       fi
@@ -996,17 +1401,12 @@ EOF
 
       # Suppress compiler output if we already did a PIC compilation.
       command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-       $run $rm $removelist
-       exit $EXIT_FAILURE
-      fi
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
       if test "$need_locks" = warn &&
         test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-       $echo "\
+       $ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -1020,5423 +1420,6777 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-       $run $rm $removelist
+       $opt_dry_run || $RM $removelist
        exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-       $show "$mv $output_obj $obj"
-       if $run $mv $output_obj $obj; then :
-       else
-         error=$?
-         $run $rm $removelist
-         exit $error
-       fi
+       func_show_eval '$MV "$output_obj" "$obj"' \
+         'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
     fi
 
-    $run $mv "${libobj}T" "${libobj}"
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+       removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
 
     exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
+}
 
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
+$opt_help || {
+test "$mode" = compile && func_mode_compile ${1+"$@"}
+}
 
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
 
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
 
-    func_infer_tag $base_compile
+Remove files from the build directory.
 
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-       if test "X$arg" = "X-all-static"; then
-         if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-           $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-         fi
-         if test -n "$link_static_flag"; then
-           dlopen_self=$dlopen_self_static
-         fi
-         prefer_static_libs=yes
-       else
-         if test -z "$pic_flag" && test -n "$link_static_flag"; then
-           dlopen_self=$dlopen_self_static
-         fi
-         prefer_static_libs=built
-       fi
-       build_libtool_libs=no
-       build_old_libs=yes
-       break
-       ;;
-      esac
-    done
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
 
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
 
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-       ;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
 
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-       case $prev in
-       output)
-         compile_command="$compile_command @OUTPUT@"
-         finalize_command="$finalize_command @OUTPUT@"
-         ;;
-       esac
+Compile a source file into a libtool library object.
 
-       case $prev in
-       dlfiles|dlprefiles)
-         if test "$preload" = no; then
-           # Add the symbol object into the linking commands.
-           compile_command="$compile_command @SYMFILE@"
-           finalize_command="$finalize_command @SYMFILE@"
-           preload=yes
-         fi
-         case $arg in
-         *.la | *.lo) ;;  # We handle these cases below.
-         force)
-           if test "$dlself" = no; then
-             dlself=needless
-             export_dynamic=yes
-           fi
-           prev=
-           continue
-           ;;
-         self)
-           if test "$prev" = dlprefiles; then
-             dlself=yes
-           elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-             dlself=yes
-           else
-             dlself=needless
-             export_dynamic=yes
-           fi
-           prev=
-           continue
-           ;;
-         *)
-           if test "$prev" = dlfiles; then
-             dlfiles="$dlfiles $arg"
-           else
-             dlprefiles="$dlprefiles $arg"
-           fi
-           prev=
-           continue
-           ;;
-         esac
-         ;;
-       expsyms)
-         export_symbols="$arg"
-         if test ! -f "$arg"; then
-           $echo "$modename: symbol file \`$arg' does not exist"
-           exit $EXIT_FAILURE
-         fi
-         prev=
-         continue
-         ;;
-       expsyms_regex)
-         export_symbols_regex="$arg"
-         prev=
-         continue
-         ;;
-       inst_prefix)
-         inst_prefix_dir="$arg"
-         prev=
-         continue
-         ;;
-       precious_regex)
-         precious_files_regex="$arg"
-         prev=
-         continue
-         ;;
-       release)
-         release="-$arg"
-         prev=
-         continue
-         ;;
-       objectlist)
-         if test -f "$arg"; then
-           save_arg=$arg
-           moreargs=
-           for fil in `cat $save_arg`
-           do
-#            moreargs="$moreargs $fil"
-             arg=$fil
-             # A libtool-controlled object.
+This mode accepts the following additional options:
 
-             # Check to see that this really is a libtool object.
-             if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-               pic_object=
-               non_pic_object=
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
 
-               # Read the .lo file
-               # If there is no directory component, then add one.
-               case $arg in
-               */* | *\\*) . $arg ;;
-               *) . ./$arg ;;
-               esac
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
 
-               if test -z "$pic_object" || \
-                  test -z "$non_pic_object" ||
-                  test "$pic_object" = none && \
-                  test "$non_pic_object" = none; then
-                 $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-                 exit $EXIT_FAILURE
-               fi
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
 
-               # Extract subdirectory from the argument.
-               xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-               if test "X$xdir" = "X$arg"; then
-                 xdir=
-               else
-                 xdir="$xdir/"
-               fi
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
 
-               if test "$pic_object" != none; then
-                 # Prepend the subdirectory the object is found in.
-                 pic_object="$xdir$pic_object"
+Automatically set library path, then run a program.
 
-                 if test "$prev" = dlfiles; then
-                   if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-                     dlfiles="$dlfiles $pic_object"
-                     prev=
-                     continue
-                   else
-                     # If libtool objects are unsupported, then we need to preload.
-                     prev=dlprefiles
-                   fi
-                 fi
+This mode accepts the following additional options:
 
-                 # CHECK ME:  I think I busted this.  -Ossama
-                 if test "$prev" = dlprefiles; then
-                   # Preload the old-style object.
-                   dlprefiles="$dlprefiles $pic_object"
-                   prev=
-                 fi
+  -dlopen FILE      add the directory containing FILE to the library path
 
-                 # A PIC object.
-                 libobjs="$libobjs $pic_object"
-                 arg="$pic_object"
-               fi
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
 
-               # Non-PIC object.
-               if test "$non_pic_object" != none; then
-                 # Prepend the subdirectory the object is found in.
-                 non_pic_object="$xdir$non_pic_object"
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
 
-                 # A standard non-PIC object
-                 non_pic_objects="$non_pic_objects $non_pic_object"
-                 if test -z "$pic_object" || test "$pic_object" = none ; then
-                   arg="$non_pic_object"
-                 fi
-               else
-                 # If the PIC object exists, use it instead.
-                 # $xdir was prepended to $pic_object above.
-                 non_pic_object="$pic_object"
-                 non_pic_objects="$non_pic_objects $non_pic_object"
-               fi
-             else
-               # Only an error if not doing a dry-run.
-               if test -z "$run"; then
-                 $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-                 exit $EXIT_FAILURE
-               else
-                 # Dry-run case.
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
 
-                 # Extract subdirectory from the argument.
-                 xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-                 if test "X$xdir" = "X$arg"; then
-                   xdir=
-                 else
-                   xdir="$xdir/"
-                 fi
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
 
-                 pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-                 non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-                 libobjs="$libobjs $pic_object"
-                 non_pic_objects="$non_pic_objects $non_pic_object"
-               fi
-             fi
-           done
-         else
-           $echo "$modename: link input file \`$save_arg' does not exist"
-           exit $EXIT_FAILURE
-         fi
-         arg=$save_arg
-         prev=
-         continue
-         ;;
-       rpath | xrpath)
-         # We need an absolute path.
-         case $arg in
-         [\\/]* | [A-Za-z]:[\\/]*) ;;
-         *)
-           $echo "$modename: only absolute run-paths are allowed" 1>&2
-           exit $EXIT_FAILURE
-           ;;
-         esac
-         if test "$prev" = rpath; then
-           case "$rpath " in
-           *" $arg "*) ;;
-           *) rpath="$rpath $arg" ;;
-           esac
-         else
-           case "$xrpath " in
-           *" $arg "*) ;;
-           *) xrpath="$xrpath $arg" ;;
-           esac
-         fi
-         prev=
-         continue
-         ;;
-       xcompiler)
-         compiler_flags="$compiler_flags $qarg"
-         prev=
-         compile_command="$compile_command $qarg"
-         finalize_command="$finalize_command $qarg"
-         continue
-         ;;
-       xlinker)
-         linker_flags="$linker_flags $qarg"
-         compiler_flags="$compiler_flags $wl$qarg"
-         prev=
-         compile_command="$compile_command $wl$qarg"
-         finalize_command="$finalize_command $wl$qarg"
-         continue
-         ;;
-       xcclinker)
-         linker_flags="$linker_flags $qarg"
-         compiler_flags="$compiler_flags $qarg"
-         prev=
-         compile_command="$compile_command $qarg"
-         finalize_command="$finalize_command $qarg"
-         continue
-         ;;
-       shrext)
-         shrext_cmds="$arg"
-         prev=
-         continue
-         ;;
-       darwin_framework|darwin_framework_skip)
-         test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-         compile_command="$compile_command $arg"
-         finalize_command="$finalize_command $arg"
-         prev=
-         continue
-         ;;
-       *)
-         eval "$prev=\"\$arg\""
-         prev=
-         continue
-         ;;
-       esac
-      fi # test -n "$prev"
+Complete the installation of libtool libraries.
 
-      prevarg="$arg"
+Each LIBDIR is a directory that contains libtool libraries.
 
-      case $arg in
-      -all-static)
-       if test -n "$link_static_flag"; then
-         compile_command="$compile_command $link_static_flag"
-         finalize_command="$finalize_command $link_static_flag"
-       fi
-       continue
-       ;;
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
 
-      -allow-undefined)
-       # FIXME: remove this flag sometime in the future.
-       $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-       continue
-       ;;
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
 
-      -avoid-version)
-       avoid_version=yes
-       continue
-       ;;
+Install executables or libraries.
 
-      -dlopen)
-       prev=dlfiles
-       continue
-       ;;
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
 
-      -dlpreopen)
-       prev=dlprefiles
-       continue
-       ;;
+The following components of INSTALL-COMMAND are treated specially:
 
-      -export-dynamic)
-       export_dynamic=yes
-       continue
-       ;;
+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
-      -export-symbols | -export-symbols-regex)
-       if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-         $echo "$modename: more than one -exported-symbols argument is not allowed"
-         exit $EXIT_FAILURE
-       fi
-       if test "X$arg" = "X-export-symbols"; then
-         prev=expsyms
-       else
-         prev=expsyms_regex
-       fi
-       continue
-       ;;
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
 
-      -framework|-arch|-isysroot)
-       case " $CC " in
-         *" ${arg} ${1} "* | *" ${arg} ${1} "*) 
-               prev=darwin_framework_skip ;;
-         *) compiler_flags="$compiler_flags $arg"
-            prev=darwin_framework ;;
-       esac
-       compile_command="$compile_command $arg"
-       finalize_command="$finalize_command $arg"
-       continue
-       ;;
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
 
-      -inst-prefix-dir)
-       prev=inst_prefix
-       continue
-       ;;
+Link object files or libraries together to form another library, or to
+create an executable program.
 
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-       case $with_gcc/$host in
-       no/*-*-irix* | /*-*-irix*)
-         compile_command="$compile_command $arg"
-         finalize_command="$finalize_command $arg"
-         ;;
-       esac
-       continue
-       ;;
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
 
-      -L*)
-       dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-       # We need an absolute path.
-       case $dir in
-       [\\/]* | [A-Za-z]:[\\/]*) ;;
-       *)
-         absdir=`cd "$dir" && pwd`
-         if test -z "$absdir"; then
-           $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-           absdir="$dir"
-           notinst_path="$notinst_path $dir"
-         fi
-         dir="$absdir"
-         ;;
-       esac
-       case "$deplibs " in
-       *" -L$dir "*) ;;
-       *)
-         deplibs="$deplibs -L$dir"
-         lib_search_path="$lib_search_path $dir"
-         ;;
-       esac
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-         testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-         case :$dllsearchpath: in
-         *":$dir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$dir";;
-         esac
-         case :$dllsearchpath: in
-         *":$testbindir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$testbindir";;
-         esac
-         ;;
-       esac
-       continue
-       ;;
+The following components of LINK-COMMAND are treated specially:
 
-      -l*)
-       if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-         case $host in
-         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-           # These systems don't actually have a C or math library (as such)
-           continue
-           ;;
-         *-*-os2*)
-           # These systems don't actually have a C library (as such)
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-           # Do not include libc due to us having libc/libc_r.
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-rhapsody* | *-*-darwin1.[012])
-           # Rhapsody C and math libraries are in the System framework
-           deplibs="$deplibs -framework System"
-           continue
-           ;;
-         *-*-sco3.2v5* | *-*-sco5v6*)
-           # Causes problems with __ctype
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-           # Compiler inserts libc in the correct place for threads to work
-           test "X$arg" = "X-lc" && continue
-           ;;
-         esac
-       elif test "X$arg" = "X-lc_r"; then
-        case $host in
-        *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-          # Do not include libc_r directly, use -pthread flag.
-          continue
-          ;;
-        esac
-       fi
-       deplibs="$deplibs $arg"
-       continue
-       ;;
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
 
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-       compile_command="$compile_command $arg"
-       compiler_flags="$compiler_flags $arg"
-       finalize_command="$finalize_command $arg"
-       prev=xcompiler
-       continue
-       ;;
+All other options (arguments beginning with \`-') are ignored.
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-       compiler_flags="$compiler_flags $arg"
-       compile_command="$compile_command $arg"
-       finalize_command="$finalize_command $arg"
-       continue
-       ;;
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
 
-      -module)
-       module=yes
-       continue
-       ;;
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
 
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -pg pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
 
-       # Unknown arguments in both finalize_command and compile_command need
-       # to be aesthetically quoted because they are evaled later.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
-         arg="\"$arg\""
-         ;;
-       esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
         ;;
 
-      -shrext)
-       prev=shrext
-       continue
-       ;;
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
 
-      -no-fast-install)
-       fast_install=no
-       continue
-       ;;
+Remove libraries from an installation directory.
 
-      -no-install)
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-         # The PATH hackery in wrapper scripts is required on Windows
-         # in order for the loader to find any dlls it needs.
-         $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-         $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-         fast_install=no
-         ;;
-       *) no_install=yes ;;
-       esac
-       continue
-       ;;
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
 
-      -no-undefined)
-       allow_undefined=no
-       continue
-       ;;
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
 
-      -objectlist)
-       prev=objectlist
-       continue
-       ;;
+      *)
+        func_fatal_help "invalid operation mode \`$mode'"
+        ;;
+    esac
 
-      -o) prev=output ;;
+    $ECHO
+    $ECHO "Try \`$progname --help' for more information about other modes."
 
-      -precious-files-regex)
-       prev=precious_regex
-       continue
-       ;;
+    exit $?
+}
 
-      -release)
-       prev=release
-       continue
-       ;;
+  # Now that we've collected a possible --mode arg, show help if necessary
+  $opt_help && func_mode_help
 
-      -rpath)
-       prev=rpath
-       continue
-       ;;
 
-      -R)
-       prev=xrpath
-       continue
-       ;;
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
 
-      -R*)
-       dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-       # We need an absolute path.
-       case $dir in
-       [\\/]* | [A-Za-z]:[\\/]*) ;;
-       *)
-         $echo "$modename: only absolute run-paths are allowed" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
-       case "$xrpath " in
-       *" $dir "*) ;;
-       *) xrpath="$xrpath $dir" ;;
-       esac
-       continue
-       ;;
-
-      -static)
-       # The effects of -static are defined in a previous loop.
-       # We used to do the same as -all-static on platforms that
-       # didn't have a PIC flag, but the assumption that the effects
-       # would be equivalent was wrong.  It would break on at least
-       # Digital Unix and AIX.
-       continue
-       ;;
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      test -f "$file" \
+       || func_fatal_help "\`$file' is not a file"
 
-      -thread-safe)
-       thread_safe=yes
-       continue
-       ;;
+      dir=
+      case $file in
+      *.la)
+       # Check to see that this really is a libtool archive.
+       func_lalib_unsafe_p "$file" \
+         || func_fatal_help "\`$lib' is not a valid libtool archive"
 
-      -version-info)
-       prev=vinfo
-       continue
-       ;;
-      -version-number)
-       prev=vinfo
-       vinfo_number=yes
-       continue
-       ;;
+       # Read the libtool library.
+       dlname=
+       library_names=
+       func_source "$file"
 
-      -Wc,*)
-       args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-       arg=
-       save_ifs="$IFS"; IFS=','
-       for flag in $args; do
-         IFS="$save_ifs"
-         case $flag in
-           *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*|"")
-           flag="\"$flag\""
-           ;;
-         esac
-         arg="$arg $wl$flag"
-         compiler_flags="$compiler_flags $flag"
-       done
-       IFS="$save_ifs"
-       arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-       ;;
+       # Skip this library if it cannot be dlopened.
+       if test -z "$dlname"; then
+         # Warn if it was a shared library.
+         test -n "$library_names" && \
+           func_warning "\`$file' was not linked with \`-export-dynamic'"
+         continue
+       fi
 
-      -Wl,*)
-       args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-       arg=
-       save_ifs="$IFS"; IFS=','
-       for flag in $args; do
-         IFS="$save_ifs"
-         case $flag in
-           *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \       ]*|*]*|"")
-           flag="\"$flag\""
-           ;;
-         esac
-         arg="$arg $wl$flag"
-         compiler_flags="$compiler_flags $wl$flag"
-         linker_flags="$linker_flags $flag"
-       done
-       IFS="$save_ifs"
-       arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-       ;;
+       func_dirname "$file" "" "."
+       dir="$func_dirname_result"
 
-      -Xcompiler)
-       prev=xcompiler
-       continue
+       if test -f "$dir/$objdir/$dlname"; then
+         dir="$dir/$objdir"
+       else
+         if test ! -f "$dir/$dlname"; then
+           func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+         fi
+       fi
        ;;
 
-      -Xlinker)
-       prev=xlinker
-       continue
+      *.lo)
+       # Just add the directory containing the .lo file.
+       func_dirname "$file" "" "."
+       dir="$func_dirname_result"
        ;;
 
-      -XCClinker)
-       prev=xcclinker
+      *)
+       func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
        continue
        ;;
+      esac
 
-      # Some other compiler flag.
-      -* | +*)
-       # Unknown arguments in both finalize_command and compile_command need
-       # to be aesthetically quoted because they are evaled later.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
-         arg="\"$arg\""
-         ;;
-       esac
-       ;;
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
 
-      *.$objext)
-       # A standard object.
-       objs="$objs $arg"
-       ;;
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+       eval "$shlibpath_var=\"\$dir\""
+      else
+       eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
 
-      *.lo)
-       # A libtool-controlled object.
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
 
-       # Check to see that this really is a libtool object.
-       if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-         pic_object=
-         non_pic_object=
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+       # Do a test to see if this is really a libtool program.
+       if func_ltwrapper_script_p "$file"; then
+         func_source "$file"
+         # Transform arg to wrapped name.
+         file="$progdir/$program"
+       elif func_ltwrapper_executable_p "$file"; then
+         func_ltwrapper_scriptname "$file"
+         func_source "$func_ltwrapper_scriptname_result"
+         # Transform arg to wrapped name.
+         file="$progdir/$program"
+       fi
+       ;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_quote_for_eval "$file"
+      args="$args $func_quote_for_eval_result"
+    done
 
-         # Read the .lo file
-         # If there is no directory component, then add one.
-         case $arg in
-         */* | *\\*) . $arg ;;
-         *) . ./$arg ;;
-         esac
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+       # Export the shlibpath_var.
+       eval "export $shlibpath_var"
+      fi
 
-         if test -z "$pic_object" || \
-            test -z "$non_pic_object" ||
-            test "$pic_object" = none && \
-            test "$non_pic_object" = none; then
-           $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-           exit $EXIT_FAILURE
-         fi
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
 
-         # Extract subdirectory from the argument.
-         xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-         if test "X$xdir" = "X$arg"; then
-           xdir=
-         else
-           xdir="$xdir/"
-         fi
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+       eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+       $ECHO "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
 
-         if test "$pic_object" != none; then
-           # Prepend the subdirectory the object is found in.
-           pic_object="$xdir$pic_object"
+test "$mode" = execute && func_mode_execute ${1+"$@"}
 
-           if test "$prev" = dlfiles; then
-             if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-               dlfiles="$dlfiles $pic_object"
-               prev=
-               continue
-             else
-               # If libtool objects are unsupported, then we need to preload.
-               prev=dlprefiles
-             fi
-           fi
 
-           # CHECK ME:  I think I busted this.  -Ossama
-           if test "$prev" = dlprefiles; then
-             # Preload the old-style object.
-             dlprefiles="$dlprefiles $pic_object"
-             prev=
-           fi
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libdirs="$nonopt"
+    admincmds=
 
-           # A PIC object.
-           libobjs="$libobjs $pic_object"
-           arg="$pic_object"
-         fi
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+       libdirs="$libdirs $dir"
+      done
 
-         # Non-PIC object.
-         if test "$non_pic_object" != none; then
-           # Prepend the subdirectory the object is found in.
-           non_pic_object="$xdir$non_pic_object"
+      for libdir in $libdirs; do
+       if test -n "$finish_cmds"; then
+         # Do each command in the finish commands.
+         func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+       fi
+       if test -n "$finish_eval"; then
+         # Do the single finish_eval.
+         eval cmds=\"$finish_eval\"
+         $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+       $cmds"
+       fi
+      done
+    fi
 
-           # A standard non-PIC object
-           non_pic_objects="$non_pic_objects $non_pic_object"
-           if test -z "$pic_object" || test "$pic_object" = none ; then
-             arg="$non_pic_object"
-           fi
-         else
-           # If the PIC object exists, use it instead.
-           # $xdir was prepended to $pic_object above.
-           non_pic_object="$pic_object"
-           non_pic_objects="$non_pic_objects $non_pic_object"
-         fi
-       else
-         # Only an error if not doing a dry-run.
-         if test -z "$run"; then
-           $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-           exit $EXIT_FAILURE
-         else
-           # Dry-run case.
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
 
-           # Extract subdirectory from the argument.
-           xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-           if test "X$xdir" = "X$arg"; then
-             xdir=
-           else
-             xdir="$xdir/"
-           fi
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    $ECHO "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $ECHO "   $libdir"
+    done
+    $ECHO
+    $ECHO "If you ever happen to want to link against installed libraries"
+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $ECHO "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $ECHO "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $ECHO "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
 
-           pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-           non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-           libobjs="$libobjs $pic_object"
-           non_pic_objects="$non_pic_objects $non_pic_object"
-         fi
-       fi
-       ;;
+      $ECHO "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $ECHO "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $ECHO
 
-      *.$libext)
-       # An archive.
-       deplibs="$deplibs $arg"
-       old_deplibs="$old_deplibs $arg"
-       continue
+    $ECHO "See any operating system documentation about shared libraries for"
+    case $host in
+      solaris2.[6789]|solaris2.1[0-9])
+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+       $ECHO "pages."
        ;;
+      *)
+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+        ;;
+    esac
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    exit $EXIT_SUCCESS
+}
 
-      *.la)
-       # A libtool-controlled library.
+test "$mode" = finish && func_mode_finish ${1+"$@"}
 
-       if test "$prev" = dlfiles; then
-         # This library was specified with -dlopen.
-         dlfiles="$dlfiles $arg"
-         prev=
-       elif test "$prev" = dlprefiles; then
-         # The library was specified with -dlpreopen.
-         dlprefiles="$dlprefiles $arg"
-         prev=
-       else
-         deplibs="$deplibs $arg"
-       fi
-       continue
-       ;;
 
-      # Some other compiler argument.
-      *)
-       # Unknown arguments in both finalize_command and compile_command need
-       # to be aesthetically quoted because they are evaled later.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-       case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
-         arg="\"$arg\""
-         ;;
-       esac
-       ;;
-      esac # arg
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
 
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-       compile_command="$compile_command $arg"
-       finalize_command="$finalize_command $arg"
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    install_prog="$install_prog$func_quote_for_eval_result"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+       files="$files $dest"
+       dest=$arg
+       continue
       fi
-    done # argument parsing loop
 
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+       case " $install_prog " in
+       *[\\\ /]cp\ *) ;;
+       *) prev=$arg ;;
+       esac
+       ;;
+      -g | -m | -o)
+       prev=$arg
+       ;;
+      -s)
+       stripme=" -s"
+       continue
+       ;;
+      -*)
+       ;;
+      *)
+       # If the previous option needed an argument, then skip it.
+       if test -n "$prev"; then
+         prev=
+       else
+         dest=$arg
+         continue
+       fi
+       ;;
+      esac
 
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      install_prog="$install_prog $func_quote_for_eval_result"
+    done
 
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
 
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
 
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-       exit $exit_status
+    if test -z "$files"; then
+      if test -z "$dest"; then
+       func_fatal_help "no file or destination specified"
+      else
+       func_fatal_help "you must specify a destination"
       fi
     fi
 
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
 
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+       func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
     *)
-      duplicate_compiler_generated_deps=$duplicate_deps
+      for file in $files; do
+       case $file in
+       *.lo) ;;
+       *)
+         func_fatal_help "\`$destdir' must be an absolute directory name"
+         ;;
+       esac
+      done
       ;;
     esac
-    specialdeplibs=
 
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-       case "$libs " in
-       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-       esac
-      fi
-      libs="$libs $deplib"
-    done
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
 
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
 
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-       for pre_post_dep in $predeps $postdeps; do
-         case "$pre_post_deps " in
-         *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+      # Do each installation.
+      case $file in
+      *.$libext)
+       # Do the static libraries later.
+       staticlibs="$staticlibs $file"
+       ;;
+
+      *.la)
+       # Check to see that this really is a libtool archive.
+       func_lalib_unsafe_p "$file" \
+         || func_fatal_help "\`$file' is not a valid libtool archive"
+
+       library_names=
+       old_library=
+       relink_command=
+       func_source "$file"
+
+       # Add the libdir to current_libdirs if it is the destination.
+       if test "X$destdir" = "X$libdir"; then
+         case "$current_libdirs " in
+         *" $libdir "*) ;;
+         *) current_libdirs="$current_libdirs $libdir" ;;
          esac
-         pre_post_deps="$pre_post_deps $pre_post_dep"
-       done
-      fi
-      pre_post_deps=
-    fi
+       else
+         # Note the libdir as a future libdir.
+         case "$future_libdirs " in
+         *" $libdir "*) ;;
+         *) future_libdirs="$future_libdirs $libdir" ;;
+         esac
+       fi
 
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    case $linkmode in
-    lib)
-       passes="conv link"
-       for file in $dlfiles $dlprefiles; do
-         case $file in
-         *.la) ;;
-         *)
-           $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-           exit $EXIT_FAILURE
+       func_dirname "$file" "/" ""
+       dir="$func_dirname_result"
+       dir="$dir$objdir"
+
+       if test -n "$relink_command"; then
+         # Determine the prefix the user has applied to our future dir.
+         inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+
+         # Don't allow the user to place us outside of our expected
+         # location b/c this prevents finding dependent libraries that
+         # are installed to the same prefix.
+         # At present, this check doesn't affect windows .dll's that
+         # are installed into $libdir/../bin (currently, that works fine)
+         # but it's something to keep an eye on.
+         test "$inst_prefix_dir" = "$destdir" && \
+           func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+         if test -n "$inst_prefix_dir"; then
+           # Stick the inst_prefix_dir data into the link command.
+           relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+         else
+           relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+         fi
+
+         func_warning "relinking \`$file'"
+         func_show_eval "$relink_command" \
+           'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+       fi
+
+       # See the names of the shared library.
+       set dummy $library_names; shift
+       if test -n "$1"; then
+         realname="$1"
+         shift
+
+         srcname="$realname"
+         test -n "$relink_command" && srcname="$realname"T
+
+         # Install the shared library and build the symlinks.
+         func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+             'exit $?'
+         tstripme="$stripme"
+         case $host_os in
+         cygwin* | mingw* | pw32* | cegcc*)
+           case $realname in
+           *.dll.a)
+             tstripme=""
+             ;;
+           esac
            ;;
          esac
-       done
-       ;;
-    prog)
-       compile_deplibs=
-       finalize_deplibs=
-       alldeplibs=no
-       newdlfiles=
-       newdlprefiles=
-       passes="conv scan dlopen dlpreopen link"
-       ;;
-    *)  passes="conv"
-       ;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-        test "$linkmode,$pass" = "prog,scan"; then
-       libs="$deplibs"
-       deplibs=
-      fi
-      if test "$linkmode" = prog; then
-       case $pass in
-       dlopen) libs="$dlfiles" ;;
-       dlpreopen) libs="$dlprefiles" ;;
-       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-       esac
-      fi
-      if test "$pass" = dlopen; then
-       # Collect dlpreopened libraries
-       save_deplibs="$deplibs"
-       deplibs=
-      fi
-      for deplib in $libs; do
-       lib=
-       found=no
-       case $deplib in
-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-         if test "$linkmode,$pass" = "prog,link"; then
-           compile_deplibs="$deplib $compile_deplibs"
-           finalize_deplibs="$deplib $finalize_deplibs"
-         else
-           compiler_flags="$compiler_flags $deplib"
+         if test -n "$tstripme" && test -n "$striplib"; then
+           func_show_eval "$striplib $destdir/$realname" 'exit $?'
          fi
-         continue
-         ;;
-       -l*)
-         if test "$linkmode" != lib && test "$linkmode" != prog; then
-           $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-           continue
-         fi
-         name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-         for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-           for search_ext in .la $std_shrext .so .a; do
-             # Search the libtool library
-             lib="$searchdir/lib${name}${search_ext}"
-             if test -f "$lib"; then
-               if test "$search_ext" = ".la"; then
-                 found=yes
-               else
-                 found=no
-               fi
-               break 2
-             fi
+
+         if test "$#" -gt 0; then
+           # Delete the old symlinks, and create new ones.
+           # Try `ln -sf' first, because the `ln' binary might depend on
+           # the symlink we replace!  Solaris /bin/ln does not understand -f,
+           # so we also need to try rm && ln -s.
+           for linkname
+           do
+             test "$linkname" != "$realname" \
+               && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
            done
-         done
-         if test "$found" != yes; then
-           # deplib doesn't seem to be a libtool library
-           if test "$linkmode,$pass" = "prog,link"; then
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           else
-             deplibs="$deplib $deplibs"
-             test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-           fi
-           continue
-         else # deplib is a libtool library
-           # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-           # We need to do some special things here, and not later.
-           if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-             case " $predeps $postdeps " in
-             *" $deplib "*)
-               if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-                 library_names=
-                 old_library=
-                 case $lib in
-                 */* | *\\*) . $lib ;;
-                 *) . ./$lib ;;
-                 esac
-                 for l in $old_library $library_names; do
-                   ll="$l"
-                 done
-                 if test "X$ll" = "X$old_library" ; then # only static version available
-                   found=no
-                   ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-                   test "X$ladir" = "X$lib" && ladir="."
-                   lib=$ladir/$old_library
-                   if test "$linkmode,$pass" = "prog,link"; then
-                     compile_deplibs="$deplib $compile_deplibs"
-                     finalize_deplibs="$deplib $finalize_deplibs"
-                   else
-                     deplibs="$deplib $deplibs"
-                     test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-                   fi
-                   continue
-                 fi
-               fi
-               ;;
-             *) ;;
-             esac
-           fi
-         fi
-         ;; # -l
-       -L*)
-         case $linkmode in
-         lib)
-           deplibs="$deplib $deplibs"
-           test "$pass" = conv && continue
-           newdependency_libs="$deplib $newdependency_libs"
-           newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-           ;;
-         prog)
-           if test "$pass" = conv; then
-             deplibs="$deplib $deplibs"
-             continue
-           fi
-           if test "$pass" = scan; then
-             deplibs="$deplib $deplibs"
-           else
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           fi
-           newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-           ;;
-         *)
-           $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-           ;;
-         esac # linkmode
-         continue
-         ;; # -L
-       -R*)
-         if test "$pass" = link; then
-           dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-           # Make sure the xrpath contains only unique directories.
-           case "$xrpath " in
-           *" $dir "*) ;;
-           *) xrpath="$xrpath $dir" ;;
-           esac
-         fi
-         deplibs="$deplib $deplibs"
-         continue
-         ;;
-       *.la) lib="$deplib" ;;
-       *.$libext)
-         if test "$pass" = conv; then
-           deplibs="$deplib $deplibs"
-           continue
-         fi
-         case $linkmode in
-         lib)
-           valid_a_lib=no
-           case $deplibs_check_method in
-             match_pattern*)
-               set dummy $deplibs_check_method
-               match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-               if eval $echo \"$deplib\" 2>/dev/null \
-                   | $SED 10q \
-                   | $EGREP "$match_pattern_regex" > /dev/null; then
-                 valid_a_lib=yes
-               fi
-               ;;
-             pass_all)
-               valid_a_lib=yes
-               ;;
-            esac
-           if test "$valid_a_lib" != yes; then
-             $echo
-             $echo "*** Warning: Trying to link with static lib archive $deplib."
-             $echo "*** I have the capability to make that library automatically link in when"
-             $echo "*** you link to this library.  But I can only do this if you have a"
-             $echo "*** shared version of the library, which you do not appear to have"
-             $echo "*** because the file extensions .$libext of this argument makes me believe"
-             $echo "*** that it is just a static archive that I should not used here."
-           else
-             $echo
-             $echo "*** Warning: Linking the shared library $output against the"
-             $echo "*** static library $deplib is not portable!"
-             deplibs="$deplib $deplibs"
-           fi
-           continue
-           ;;
-         prog)
-           if test "$pass" != link; then
-             deplibs="$deplib $deplibs"
-           else
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           fi
-           continue
-           ;;
-         esac # linkmode
-         ;; # *.$libext
-       *.lo | *.$objext)
-         if test "$pass" = conv; then
-           deplibs="$deplib $deplibs"
-         elif test "$linkmode" = prog; then
-           if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-             # If there is no dlopen support or we're linking statically,
-             # we need to preload.
-             newdlprefiles="$newdlprefiles $deplib"
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           else
-             newdlfiles="$newdlfiles $deplib"
-           fi
          fi
-         continue
-         ;;
-       %DEPLIBS%)
-         alldeplibs=yes
-         continue
-         ;;
-       esac # case $deplib
-       if test "$found" = yes || test -f "$lib"; then :
-       else
-         $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-         exit $EXIT_FAILURE
-       fi
 
-       # Check to see that this really is a libtool archive.
-       if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-       else
-         $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-         exit $EXIT_FAILURE
+         # Do each command in the postinstall commands.
+         lib="$destdir/$realname"
+         func_execute_cmds "$postinstall_cmds" 'exit $?'
        fi
 
-       ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-       test "X$ladir" = "X$lib" && ladir="."
+       # Install the pseudo-library for information purposes.
+       func_basename "$file"
+       name="$func_basename_result"
+       instname="$dir/$name"i
+       func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
-       dlname=
-       dlopen=
-       dlpreopen=
-       libdir=
-       library_names=
-       old_library=
-       # If the library was installed with an old release of libtool,
-       # it will not redefine variables installed, or shouldnotlink
-       installed=yes
-       shouldnotlink=no
-       avoidtemprpath=
+       # Maybe install the static library, too.
+       test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+       ;;
 
+      *.lo)
+       # Install (i.e. copy) a libtool object.
 
-       # Read the .la file
-       case $lib in
-       */* | *\\*) . $lib ;;
-       *) . ./$lib ;;
+       # Figure out destination file name, if it wasn't already specified.
+       if test -n "$destname"; then
+         destfile="$destdir/$destname"
+       else
+         func_basename "$file"
+         destfile="$func_basename_result"
+         destfile="$destdir/$destfile"
+       fi
+
+       # Deduce the name of the destination old-style object file.
+       case $destfile in
+       *.lo)
+         func_lo2o "$destfile"
+         staticdest=$func_lo2o_result
+         ;;
+       *.$objext)
+         staticdest="$destfile"
+         destfile=
+         ;;
+       *)
+         func_fatal_help "cannot copy a libtool object to \`$destfile'"
+         ;;
        esac
 
-       if test "$linkmode,$pass" = "lib,link" ||
-          test "$linkmode,$pass" = "prog,scan" ||
-          { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-         test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-         test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+       # Install the libtool object if requested.
+       test -n "$destfile" && \
+         func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+       # Install the old object if enabled.
+       if test "$build_old_libs" = yes; then
+         # Deduce the name of the old-style object file.
+         func_lo2o "$file"
+         staticobj=$func_lo2o_result
+         func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
        fi
+       exit $EXIT_SUCCESS
+       ;;
 
-       if test "$pass" = conv; then
-         # Only check for convenience libraries
-         deplibs="$lib $deplibs"
-         if test -z "$libdir"; then
-           if test -z "$old_library"; then
-             $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-             exit $EXIT_FAILURE
+      *)
+       # Figure out destination file name, if it wasn't already specified.
+       if test -n "$destname"; then
+         destfile="$destdir/$destname"
+       else
+         func_basename "$file"
+         destfile="$func_basename_result"
+         destfile="$destdir/$destfile"
+       fi
+
+       # If the file is missing, and there is a .exe on the end, strip it
+       # because it is most likely a libtool script we actually want to
+       # install
+       stripped_ext=""
+       case $file in
+         *.exe)
+           if test ! -f "$file"; then
+             func_stripname '' '.exe' "$file"
+             file=$func_stripname_result
+             stripped_ext=".exe"
            fi
-           # It is a libtool convenience library, so add in its objects.
-           convenience="$convenience $ladir/$objdir/$old_library"
-           old_convenience="$old_convenience $ladir/$objdir/$old_library"
-           tmp_libs=
-           for deplib in $dependency_libs; do
-             deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-               case "$tmp_libs " in
-               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-               esac
-              fi
-             tmp_libs="$tmp_libs $deplib"
-           done
-         elif test "$linkmode" != prog && test "$linkmode" != lib; then
-           $echo "$modename: \`$lib' is not a convenience library" 1>&2
-           exit $EXIT_FAILURE
-         fi
-         continue
-       fi # $pass = conv
+           ;;
+       esac
 
+       # Do a test to see if this is really a libtool program.
+       case $host in
+       *cygwin* | *mingw*)
+           if func_ltwrapper_executable_p "$file"; then
+             func_ltwrapper_scriptname "$file"
+             wrapper=$func_ltwrapper_scriptname_result
+           else
+             func_stripname '' '.exe' "$file"
+             wrapper=$func_stripname_result
+           fi
+           ;;
+       *)
+           wrapper=$file
+           ;;
+       esac
+       if func_ltwrapper_script_p "$wrapper"; then
+         notinst_deplibs=
+         relink_command=
 
-       # Get the name of the library we link against.
-       linklib=
-       for l in $old_library $library_names; do
-         linklib="$l"
-       done
-       if test -z "$linklib"; then
-         $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-         exit $EXIT_FAILURE
-       fi
+         func_source "$wrapper"
 
-       # This library was specified with -dlopen.
-       if test "$pass" = dlopen; then
-         if test -z "$libdir"; then
-           $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-           exit $EXIT_FAILURE
-         fi
-         if test -z "$dlname" ||
-            test "$dlopen_support" != yes ||
-            test "$build_libtool_libs" = no; then
-           # If there is no dlname, no dlopen support or we're linking
-           # statically, we need to preload.  We also need to preload any
-           # dependent libraries so libltdl's deplib preloader doesn't
-           # bomb out in the load deplibs phase.
-           dlprefiles="$dlprefiles $lib $dependency_libs"
+         # Check the variables that should have been set.
+         test -z "$generated_by_libtool_version" && \
+           func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+         finalize=yes
+         for lib in $notinst_deplibs; do
+           # Check to see that each library is installed.
+           libdir=
+           if test -f "$lib"; then
+             func_source "$lib"
+           fi
+           libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+           if test -n "$libdir" && test ! -f "$libfile"; then
+             func_warning "\`$lib' has not been installed in \`$libdir'"
+             finalize=no
+           fi
+         done
+
+         relink_command=
+         func_source "$wrapper"
+
+         outputname=
+         if test "$fast_install" = no && test -n "$relink_command"; then
+           $opt_dry_run || {
+             if test "$finalize" = yes; then
+               tmpdir=`func_mktempdir`
+               func_basename "$file$stripped_ext"
+               file="$func_basename_result"
+               outputname="$tmpdir/$file"
+               # Replace the output file specification.
+               relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+               $opt_silent || {
+                 func_quote_for_expand "$relink_command"
+                 eval "func_echo $func_quote_for_expand_result"
+               }
+               if eval "$relink_command"; then :
+                 else
+                 func_error "error: relink \`$file' with the above command before installing it"
+                 $opt_dry_run || ${RM}r "$tmpdir"
+                 continue
+               fi
+               file="$outputname"
+             else
+               func_warning "cannot relink \`$file'"
+             fi
+           }
          else
-           newdlfiles="$newdlfiles $lib"
+           # Install the binary that we compiled earlier.
+           file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
          fi
-         continue
-       fi # $pass = dlopen
+       fi
 
-       # We need an absolute path.
-       case $ladir in
-       [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-       *)
-         abs_ladir=`cd "$ladir" && pwd`
-         if test -z "$abs_ladir"; then
-           $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-           $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-           abs_ladir="$ladir"
-         fi
+       # remove .exe since cygwin /usr/bin/install will append another
+       # one anyway
+       case $install_prog,$host in
+       */usr/bin/install*,*cygwin*)
+         case $file:$destfile in
+         *.exe:*.exe)
+           # this is ok
+           ;;
+         *.exe:*)
+           destfile=$destfile.exe
+           ;;
+         *:*.exe)
+           func_stripname '' '.exe' "$destfile"
+           destfile=$func_stripname_result
+           ;;
+         esac
          ;;
        esac
-       laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+       func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+       $opt_dry_run || if test -n "$outputname"; then
+         ${RM}r "$tmpdir"
+       fi
+       ;;
+      esac
+    done
 
-       # Find the relevant object directory and library name.
-       if test "X$installed" = Xyes; then
-         if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-           $echo "$modename: warning: library \`$lib' was moved." 1>&2
-           dir="$ladir"
-           absdir="$abs_ladir"
-           libdir="$abs_ladir"
-         else
-           dir="$libdir"
-           absdir="$libdir"
-         fi
-         test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-       else
-         if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-           dir="$ladir"
-           absdir="$abs_ladir"
-           # Remove this search path later
-           notinst_path="$notinst_path $abs_ladir"
-         else
-           dir="$ladir/$objdir"
-           absdir="$abs_ladir/$objdir"
-           # Remove this search path later
-           notinst_path="$notinst_path $abs_ladir"
-         fi
-       fi # $installed = yes
-       name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
 
-       # This library was specified with -dlpreopen.
-       if test "$pass" = dlpreopen; then
-         if test -z "$libdir"; then
-           $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-           exit $EXIT_FAILURE
-         fi
-         # Prefer using a static library (so that no silly _DYNAMIC symbols
-         # are required to link).
-         if test -n "$old_library"; then
-           newdlprefiles="$newdlprefiles $dir/$old_library"
-         # Otherwise, use the dlname, so that lt_dlopen finds it.
-         elif test -n "$dlname"; then
-           newdlprefiles="$newdlprefiles $dir/$dlname"
-         else
-           newdlprefiles="$newdlprefiles $dir/$linklib"
-         fi
-       fi # $pass = dlpreopen
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
 
-       if test -z "$libdir"; then
-         # Link the convenience library
-         if test "$linkmode" = lib; then
-           deplibs="$dir/$old_library $deplibs"
-         elif test "$linkmode,$pass" = "prog,link"; then
-           compile_deplibs="$dir/$old_library $compile_deplibs"
-           finalize_deplibs="$dir/$old_library $finalize_deplibs"
-         else
-           deplibs="$lib $deplibs" # used for prog,scan pass
-         fi
-         continue
-       fi
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
+      if test -n "$stripme" && test -n "$old_striplib"; then
+       func_show_eval "$old_striplib $oldlib" 'exit $?'
+      fi
 
-       if test "$linkmode" = prog && test "$pass" != link; then
-         newlib_search_path="$newlib_search_path $ladir"
-         deplibs="$lib $deplibs"
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
 
-         linkalldeplibs=no
-         if test "$link_all_deplibs" != no || test -z "$library_names" ||
-            test "$build_libtool_libs" = no; then
-           linkalldeplibs=yes
-         fi
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
 
-         tmp_libs=
-         for deplib in $dependency_libs; do
-           case $deplib in
-           -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-           esac
-           # Need to link against all dependency_libs?
-           if test "$linkalldeplibs" = yes; then
-             deplibs="$deplib $deplibs"
-           else
-             # Need to hardcode shared library paths
-             # or/and link against static libraries
-             newdependency_libs="$deplib $newdependency_libs"
-           fi
-           if test "X$duplicate_deps" = "Xyes" ; then
-             case "$tmp_libs " in
-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-             esac
-           fi
-           tmp_libs="$tmp_libs $deplib"
-         done # for deplib
-         continue
-       fi # $linkmode = prog...
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
 
-       if test "$linkmode,$pass" = "prog,link"; then
-         if test -n "$library_names" &&
-            { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-           # We need to hardcode the library path
-           if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-             # Make sure the rpath contains only unique directories.
-             case "$temp_rpath " in
-             *" $dir "*) ;;
-             *" $absdir "*) ;;
-             *) temp_rpath="$temp_rpath $absdir" ;;
-             esac
-           fi
+test "$mode" = install && func_mode_install ${1+"$@"}
 
-           # Hardcode the library path.
-           # Skip directories that are in the system default run-time
-           # search path.
-           case " $sys_lib_dlsearch_path " in
-           *" $absdir "*) ;;
-           *)
-             case "$compile_rpath " in
-             *" $absdir "*) ;;
-             *) compile_rpath="$compile_rpath $absdir"
-             esac
-             ;;
-           esac
-           case " $sys_lib_dlsearch_path " in
-           *" $libdir "*) ;;
-           *)
-             case "$finalize_rpath " in
-             *" $libdir "*) ;;
-             *) finalize_rpath="$finalize_rpath $libdir"
-             esac
-             ;;
-           esac
-         fi # $linkmode,$pass = prog,link...
 
-         if test "$alldeplibs" = yes &&
-            { test "$deplibs_check_method" = pass_all ||
-              { test "$build_libtool_libs" = yes &&
-                test -n "$library_names"; }; }; then
-           # We only need to search for static libraries
-           continue
-         fi
-       fi
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+       my_dlsyms="${my_outputname}S.c"
+      else
+       func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
 
-       link_static=no # Whether the deplib will be linked statically
-       use_static_libs=$prefer_static_libs
-       if test "$use_static_libs" = built && test "$installed" = yes ; then
-         use_static_libs=no
-       fi
-       if test -n "$library_names" &&
-          { test "$use_static_libs" = no || test -z "$old_library"; }; then
-         if test "$installed" = no; then
-           notinst_deplibs="$notinst_deplibs $lib"
-           need_relink=yes
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+       # Discover the nlist of each of the dlfiles.
+       nlist="$output_objdir/${my_outputname}.nm"
+
+       func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+       # Parse the name list into a source file.
+       func_verbose "creating $output_objdir/$my_dlsyms"
+
+       $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+       if test "$dlself" = yes; then
+         func_verbose "generating symbol list for \`$output'"
+
+         $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+         # Add our own program objects to the symbol list.
+         progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+         for progfile in $progfiles; do
+           func_verbose "extracting global C symbols from \`$progfile'"
+           $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+         done
+
+         if test -n "$exclude_expsyms"; then
+           $opt_dry_run || {
+             eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+             eval '$MV "$nlist"T "$nlist"'
+           }
          fi
-         # This is a shared library
 
-         # Warn about portability, can't link against -module's on
-         # some systems (darwin)
-         if test "$shouldnotlink" = yes && test "$pass" = link ; then
-           $echo
-           if test "$linkmode" = prog; then
-             $echo "*** Warning: Linking the executable $output against the loadable module"
-           else
-             $echo "*** Warning: Linking the shared library $output against the loadable module"
-           fi
-           $echo "*** $linklib is not portable!"
+         if test -n "$export_symbols_regex"; then
+           $opt_dry_run || {
+             eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+             eval '$MV "$nlist"T "$nlist"'
+           }
          fi
-         if test "$linkmode" = lib &&
-            test "$hardcode_into_libs" = yes; then
-           # Hardcode the library path.
-           # Skip directories that are in the system default run-time
-           # search path.
-           case " $sys_lib_dlsearch_path " in
-           *" $absdir "*) ;;
-           *)
-             case "$compile_rpath " in
-             *" $absdir "*) ;;
-             *) compile_rpath="$compile_rpath $absdir"
+
+         # Prepare the list of exported symbols
+         if test -z "$export_symbols"; then
+           export_symbols="$output_objdir/$outputname.exp"
+           $opt_dry_run || {
+             $RM $export_symbols
+             eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+             case $host in
+             *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+               ;;
              esac
-             ;;
-           esac
-           case " $sys_lib_dlsearch_path " in
-           *" $libdir "*) ;;
-           *)
-             case "$finalize_rpath " in
-             *" $libdir "*) ;;
-             *) finalize_rpath="$finalize_rpath $libdir"
+           }
+         else
+           $opt_dry_run || {
+             eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+             eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+             eval '$MV "$nlist"T "$nlist"'
+             case $host in
+               *cygwin | *mingw* | *cegcc* )
+                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                 ;;
              esac
-             ;;
-           esac
+           }
          fi
+       fi
 
-         if test -n "$old_archive_from_expsyms_cmds"; then
-           # figure out the soname
-           set dummy $library_names
-           realname="$2"
-           shift; shift
-           libname=`eval \\$echo \"$libname_spec\"`
-           # use dlname if we got it. it's perfectly good, no?
-           if test -n "$dlname"; then
-             soname="$dlname"
-           elif test -n "$soname_spec"; then
-             # bleh windows
-             case $host in
-             *cygwin* | mingw*)
-               major=`expr $current - $age`
-               versuffix="-$major"
-               ;;
-             esac
-             eval soname=\"$soname_spec\"
-           else
-             soname="$realname"
-           fi
-
-           # Make a new name for the extract_expsyms_cmds to use
-           soroot="$soname"
-           soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-           newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-           # If the library has no export list, then create one now
-           if test -f "$output_objdir/$soname-def"; then :
-           else
-             $show "extracting exported symbol list from \`$soname'"
-             save_ifs="$IFS"; IFS='~'
-             cmds=$extract_expsyms_cmds
-             for cmd in $cmds; do
-               IFS="$save_ifs"
-               eval cmd=\"$cmd\"
-               $show "$cmd"
-               $run eval "$cmd" || exit $?
-             done
-             IFS="$save_ifs"
-           fi
-
-           # Create $newlib
-           if test -f "$output_objdir/$newlib"; then :; else
-             $show "generating import library for \`$soname'"
-             save_ifs="$IFS"; IFS='~'
-             cmds=$old_archive_from_expsyms_cmds
-             for cmd in $cmds; do
-               IFS="$save_ifs"
-               eval cmd=\"$cmd\"
-               $show "$cmd"
-               $run eval "$cmd" || exit $?
-             done
-             IFS="$save_ifs"
-           fi
-           # make sure the library variables are pointing to the new library
-           dir=$output_objdir
-           linklib=$newlib
-         fi # test -n "$old_archive_from_expsyms_cmds"
-
-         if test "$linkmode" = prog || test "$mode" != relink; then
-           add_shlibpath=
-           add_dir=
-           add=
-           lib_linked=yes
-           case $hardcode_action in
-           immediate | unsupported)
-             if test "$hardcode_direct" = no; then
-               add="$dir/$linklib"
-               case $host in
-                 *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-                 *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-                 *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-                   *-*-unixware7*) add_dir="-L$dir" ;;
-                 *-*-darwin* )
-                   # if the lib is a module then we can not link against
-                   # it, someone is ignoring the new warnings I added
-                   if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-                     $echo "** Warning, lib $linklib is a module, not a shared library"
-                     if test -z "$old_library" ; then
-                       $echo
-                       $echo "** And there doesn't seem to be a static archive available"
-                       $echo "** The link will probably fail, sorry"
-                     else
-                       add="$dir/$old_library"
-                     fi
-                   fi
-               esac
-             elif test "$hardcode_minus_L" = no; then
-               case $host in
-               *-*-sunos*) add_shlibpath="$dir" ;;
-               esac
-               add_dir="-L$dir"
-               add="-l$name"
-             elif test "$hardcode_shlibpath_var" = no; then
-               add_shlibpath="$dir"
-               add="-l$name"
-             else
-               lib_linked=no
-             fi
-             ;;
-           relink)
-             if test "$hardcode_direct" = yes; then
-               add="$dir/$linklib"
-             elif test "$hardcode_minus_L" = yes; then
-               add_dir="-L$dir"
-               # Try looking first in the location we're being installed to.
-               if test -n "$inst_prefix_dir"; then
-                 case $libdir in
-                   [\\/]*)
-                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
-                     ;;
-                 esac
-               fi
-               add="-l$name"
-             elif test "$hardcode_shlibpath_var" = yes; then
-               add_shlibpath="$dir"
-               add="-l$name"
-             else
-               lib_linked=no
-             fi
-             ;;
-           *) lib_linked=no ;;
-           esac
+       for dlprefile in $dlprefiles; do
+         func_verbose "extracting global C symbols from \`$dlprefile'"
+         func_basename "$dlprefile"
+         name="$func_basename_result"
+         $opt_dry_run || {
+           eval '$ECHO ": $name " >> "$nlist"'
+           eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+         }
+       done
 
-           if test "$lib_linked" != yes; then
-             $echo "$modename: configuration error: unsupported hardcode properties"
-             exit $EXIT_FAILURE
-           fi
+       $opt_dry_run || {
+         # Make sure we have at least an empty file.
+         test -f "$nlist" || : > "$nlist"
 
-           if test -n "$add_shlibpath"; then
-             case :$compile_shlibpath: in
-             *":$add_shlibpath:"*) ;;
-             *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-             esac
-           fi
-           if test "$linkmode" = prog; then
-             test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-             test -n "$add" && compile_deplibs="$add $compile_deplibs"
-           else
-             test -n "$add_dir" && deplibs="$add_dir $deplibs"
-             test -n "$add" && deplibs="$add $deplibs"
-             if test "$hardcode_direct" != yes && \
-                test "$hardcode_minus_L" != yes && \
-                test "$hardcode_shlibpath_var" = yes; then
-               case :$finalize_shlibpath: in
-               *":$libdir:"*) ;;
-               *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-               esac
-             fi
-           fi
+         if test -n "$exclude_expsyms"; then
+           $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+           $MV "$nlist"T "$nlist"
          fi
 
-         if test "$linkmode" = prog || test "$mode" = relink; then
-           add_shlibpath=
-           add_dir=
-           add=
-           # Finalize command for both is simple: just hardcode it.
-           if test "$hardcode_direct" = yes; then
-             add="$libdir/$linklib"
-           elif test "$hardcode_minus_L" = yes; then
-             add_dir="-L$libdir"
-             add="-l$name"
-           elif test "$hardcode_shlibpath_var" = yes; then
-             case :$finalize_shlibpath: in
-             *":$libdir:"*) ;;
-             *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-             esac
-             add="-l$name"
-           elif test "$hardcode_automatic" = yes; then
-             if test -n "$inst_prefix_dir" &&
-                test -f "$inst_prefix_dir$libdir/$linklib" ; then
-               add="$inst_prefix_dir$libdir/$linklib"
+         # Try sorting and uniquifying the output.
+         if $GREP -v "^: " < "$nlist" |
+             if sort -k 3 </dev/null >/dev/null 2>&1; then
+               sort -k 3
              else
-               add="$libdir/$linklib"
-             fi
-           else
-             # We cannot seem to hardcode it, guess we'll fake it.
-             add_dir="-L$libdir"
-             # Try looking first in the location we're being installed to.
-             if test -n "$inst_prefix_dir"; then
-               case $libdir in
-                 [\\/]*)
-                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
-                   ;;
-               esac
-             fi
-             add="-l$name"
-           fi
-
-           if test "$linkmode" = prog; then
-             test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-             test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-           else
-             test -n "$add_dir" && deplibs="$add_dir $deplibs"
-             test -n "$add" && deplibs="$add $deplibs"
-           fi
-         fi
-       elif test "$linkmode" = prog; then
-         # Here we assume that one of hardcode_direct or hardcode_minus_L
-         # is not unsupported.  This is valid on all known static and
-         # shared platforms.
-         if test "$hardcode_direct" != unsupported; then
-           test -n "$old_library" && linklib="$old_library"
-           compile_deplibs="$dir/$linklib $compile_deplibs"
-           finalize_deplibs="$dir/$linklib $finalize_deplibs"
+               sort +2
+             fi |
+             uniq > "$nlist"S; then
+           :
          else
-           compile_deplibs="-l$name -L$dir $compile_deplibs"
-           finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+           $GREP -v "^: " < "$nlist" > "$nlist"S
          fi
-       elif test "$build_libtool_libs" = yes; then
-         # Not a shared library
-         if test "$deplibs_check_method" != pass_all; then
-           # We're trying link a shared library against a static one
-           # but the system doesn't support it.
 
-           # Just print a warning and add the library to dependency_libs so
-           # that the program can be linked against the static library.
-           $echo
-           $echo "*** Warning: This system can not link to static lib archive $lib."
-           $echo "*** I have the capability to make that library automatically link in when"
-           $echo "*** you link to this library.  But I can only do this if you have a"
-           $echo "*** shared version of the library, which you do not appear to have."
-           if test "$module" = yes; then
-             $echo "*** But as you try to build a module library, libtool will still create "
-             $echo "*** a static module, that should work as long as the dlopening application"
-             $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-             if test -z "$global_symbol_pipe"; then
-               $echo
-               $echo "*** However, this would only work if libtool was able to extract symbol"
-               $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-               $echo "*** not find such a program.  So, this module is probably useless."
-               $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-             fi
-             if test "$build_old_libs" = no; then
-               build_libtool_libs=module
-               build_old_libs=yes
-             else
-               build_libtool_libs=no
-             fi
-           fi
+         if test -f "$nlist"S; then
+           eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
          else
-           deplibs="$dir/$old_library $deplibs"
-           link_static=yes
+           $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
          fi
-       fi # link shared/static library?
 
-       if test "$linkmode" = lib; then
-         if test -n "$dependency_libs" &&
-            { test "$hardcode_into_libs" != yes ||
-              test "$build_old_libs" = yes ||
-              test "$link_static" = yes; }; then
-           # Extract -R from dependency_libs
-           temp_deplibs=
-           for libdir in $dependency_libs; do
-             case $libdir in
-             -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-                  case " $xrpath " in
-                  *" $temp_xrpath "*) ;;
-                  *) xrpath="$xrpath $temp_xrpath";;
-                  esac;;
-             *) temp_deplibs="$temp_deplibs $libdir";;
-             esac
-           done
-           dependency_libs="$temp_deplibs"
-         fi
+         $ECHO >> "$output_objdir/$my_dlsyms" "\
 
-         newlib_search_path="$newlib_search_path $absdir"
-         # Link against this library
-         test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-         # ... and its dependency_libs
-         tmp_libs=
-         for deplib in $dependency_libs; do
-           newdependency_libs="$deplib $newdependency_libs"
-           if test "X$duplicate_deps" = "Xyes" ; then
-             case "$tmp_libs " in
-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-             esac
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+"
+         case $host in
+         *cygwin* | *mingw* | *cegcc* )
+           $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs.  */"
+           lt_dlsym_const= ;;
+         *osf5*)
+           echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+           lt_dlsym_const= ;;
+         *)
+           lt_dlsym_const=const ;;
+         esac
+
+         $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+$lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+         case $need_lib_prefix in
+         no)
+           eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+           ;;
+         *)
+           eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+           ;;
+         esac
+         $ECHO >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+       } # !$opt_dry_run
+
+       pic_flag_for_symtable=
+       case "$compile_command " in
+       *" -static "*) ;;
+       *)
+         case $host in
+         # compiling the symbol table file with pic_flag works around
+         # a FreeBSD bug that causes programs to crash when -lm is
+         # linked before any other PIC object.  But we must not use
+         # pic_flag when linking with -static.  The problem exists in
+         # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+         *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+           pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+         *-*-hpux*)
+           pic_flag_for_symtable=" $pic_flag"  ;;
+         *)
+           if test "X$my_pic_p" != Xno; then
+             pic_flag_for_symtable=" $pic_flag"
            fi
-           tmp_libs="$tmp_libs $deplib"
-         done
+           ;;
+         esac
+         ;;
+       esac
+       symtab_cflags=
+       for arg in $LTCFLAGS; do
+         case $arg in
+         -pie | -fpie | -fPIE) ;;
+         *) symtab_cflags="$symtab_cflags $arg" ;;
+         esac
+       done
 
-         if test "$link_all_deplibs" != no; then
-           # Add the search paths of all dependency libraries
-           for deplib in $dependency_libs; do
-             case $deplib in
-             -L*) path="$deplib" ;;
-             *.la)
-               dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-               test "X$dir" = "X$deplib" && dir="."
-               # We need an absolute path.
-               case $dir in
-               [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-               *)
-                 absdir=`cd "$dir" && pwd`
-                 if test -z "$absdir"; then
-                   $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-                   absdir="$dir"
-                 fi
-                 ;;
-               esac
-               if grep "^installed=no" $deplib > /dev/null; then
-                 path="$absdir/$objdir"
-               else
-                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-                 if test -z "$libdir"; then
-                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-                   exit $EXIT_FAILURE
-                 fi
-                 if test "$absdir" != "$libdir"; then
-                   $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-                 fi
-                 path="$absdir"
-               fi
-               depdepl=
-               case $host in
-               *-*-darwin*)
-                 # we do not want to link against static libs,
-                 # but need to link against shared
-                 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-                 if test -n "$deplibrary_names" ; then
-                   for tmp in $deplibrary_names ; do
-                     depdepl=$tmp
-                   done
-                   if test -f "$path/$depdepl" ; then
-                     depdepl="$path/$depdepl"
-                   fi
-                   # do not add paths which are already there
-                   case " $newlib_search_path " in
-                   *" $path "*) ;;
-                   *) newlib_search_path="$newlib_search_path $path";;
-                   esac
-                 fi
-                 path=""
-                 ;;
-               *)
-                 path="-L$path"
-                 ;;
-               esac
-               ;;
-             -l*)
-               case $host in
-               *-*-darwin*)
-                 # Again, we only want to link against shared libraries
-                 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-                 for tmp in $newlib_search_path ; do
-                   if test -f "$tmp/lib$tmp_libs.dylib" ; then
-                     eval depdepl="$tmp/lib$tmp_libs.dylib"
-                     break
-                   fi
-                 done
-                 path=""
-                 ;;
-               *) continue ;;
-               esac
-               ;;
-             *) continue ;;
-             esac
-             case " $deplibs " in
-             *" $path "*) ;;
-             *) deplibs="$path $deplibs" ;;
-             esac
-             case " $deplibs " in
-             *" $depdepl "*) ;;
-             *) deplibs="$depdepl $deplibs" ;;
-             esac
-           done
-         fi # link_all_deplibs != no
-       fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-       # Link the dlpreopened libraries before other libraries
-       for deplib in $save_deplibs; do
-         deplibs="$deplib $deplibs"
-       done
-      fi
-      if test "$pass" != dlopen; then
-       if test "$pass" != conv; then
-         # Make sure lib_search_path contains only unique directories.
-         lib_search_path=
-         for dir in $newlib_search_path; do
-           case "$lib_search_path " in
-           *" $dir "*) ;;
-           *) lib_search_path="$lib_search_path $dir" ;;
-           esac
-         done
-         newlib_search_path=
-       fi
+       # Now compile the dynamic symbol file.
+       func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 
-       if test "$linkmode,$pass" != "prog,link"; then
-         vars="deplibs"
-       else
-         vars="compile_deplibs finalize_deplibs"
-       fi
-       for var in $vars dependency_libs; do
-         # Add libraries to $var in reverse order
-         eval tmp_libs=\"\$$var\"
-         new_libs=
-         for deplib in $tmp_libs; do
-           # FIXME: Pedantically, this is the right thing to do, so
-           #        that some nasty dependency loop isn't accidentally
-           #        broken:
-           #new_libs="$deplib $new_libs"
-           # Pragmatically, this seems to cause very few problems in
-           # practice:
-           case $deplib in
-           -L*) new_libs="$deplib $new_libs" ;;
-           -R*) ;;
-           *)
-             # And here is the reason: when a library appears more
-             # than once as an explicit dependence of a library, or
-             # is implicitly linked in more than once by the
-             # compiler, it is considered special, and multiple
-             # occurrences thereof are not removed.  Compare this
-             # with having the same library being listed as a
-             # dependency of multiple other libraries: in this case,
-             # we know (pedantically, we assume) the library does not
-             # need to be listed more than once, so we keep only the
-             # last copy.  This is not always right, but it is rare
-             # enough that we require users that really mean to play
-             # such unportable linking tricks to link the library
-             # using -Wl,-lname, so that libtool does not consider it
-             # for duplicate removal.
-             case " $specialdeplibs " in
-             *" $deplib "*) new_libs="$deplib $new_libs" ;;
-             *)
-               case " $new_libs " in
-               *" $deplib "*) ;;
-               *) new_libs="$deplib $new_libs" ;;
-               esac
-               ;;
-             esac
-             ;;
-           esac
-         done
-         tmp_libs=
-         for deplib in $new_libs; do
-           case $deplib in
-           -L*)
-             case " $tmp_libs " in
-             *" $deplib "*) ;;
-             *) tmp_libs="$tmp_libs $deplib" ;;
-             esac
-             ;;
-           *) tmp_libs="$tmp_libs $deplib" ;;
-           esac
-         done
-         eval $var=\"$tmp_libs\"
-       done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-       case " $predeps $postdeps $compiler_lib_search_path " in
-       *" $i "*)
-         i=""
+       # Clean up the generated files.
+       func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+       # Transform the symbol file into the correct name.
+       symfileobj="$output_objdir/${my_outputname}S.$objext"
+       case $host in
+       *cygwin* | *mingw* | *cegcc* )
+         if test -f "$output_objdir/$my_outputname.def"; then
+           compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+           finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+         else
+           compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+           finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+         fi
+         ;;
+       *)
+         compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+         finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
          ;;
        esac
-       if test -n "$i" ; then
-         tmp_libs="$tmp_libs $i"
-       fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
+       ;;
+      *)
+       func_fatal_error "unknown suffix for \`$my_dlsyms'"
+       ;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
     fi
+}
 
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-       $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 |
+       $SED -n -e '
+           1,100{
+               / I /{
+                   s,.*,import,
+                   p
+                   q
+               }
+           }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
 
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
 
-      if test -n "$rpath"; then
-       $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
 
-      if test -n "$xrpath"; then
-       $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
 
-      if test -n "$vinfo"; then
-       $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
 
-      if test -n "$release"; then
-       $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
 
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-       $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+       [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+       *) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         func_arith $extracted_serial + 1
+         extracted_serial=$func_arith_result
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
+      func_mkdir_p "$my_xdir"
 
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-       name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-       eval shared_ext=\"$shrext_cmds\"
-       eval libname=\"$libname_spec\"
-       ;;
-      *)
-       if test "$module" = no; then
-         $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-       fi
-       if test "$need_lib_prefix" != no; then
-         # Add the "lib" prefix for modules if required
-         name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-         eval shared_ext=\"$shrext_cmds\"
-         eval libname=\"$libname_spec\"
-       else
-         libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-       fi
-       ;;
+      case $host in
+      *-darwin*)
+       func_verbose "Extracting $my_xabs"
+       # Do not bother doing anything if just a dry run
+       $opt_dry_run || {
+         darwin_orig_dir=`pwd`
+         cd $my_xdir || exit $?
+         darwin_archive=$my_xabs
+         darwin_curdir=`pwd`
+         darwin_base_archive=`basename "$darwin_archive"`
+         darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+         if test -n "$darwin_arches"; then
+           darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+           darwin_arch=
+           func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+           for darwin_arch in  $darwin_arches ; do
+             func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+             $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+             cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+             func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+             cd "$darwin_curdir"
+             $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+           done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+           darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+           darwin_file=
+           darwin_files=
+           for darwin_file in $darwin_filelist; do
+             darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+             $LIPO -create -output "$darwin_file" $darwin_files
+           done # $darwin_filelist
+           $RM -rf unfat-$$
+           cd "$darwin_orig_dir"
+         else
+           cd $darwin_orig_dir
+           func_extract_an_archive "$my_xdir" "$my_xabs"
+         fi # $darwin_arches
+       } # !$opt_dry_run
+       ;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+       ;;
       esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
 
-      if test -n "$objs"; then
-       if test "$deplibs_check_method" != pass_all; then
-         $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-         exit $EXIT_FAILURE
-       else
-         $echo
-         $echo "*** Warning: Linking the shared library $output against the non-libtool"
-         $echo "*** objects $objs is not portable!"
-         libobjs="$libobjs $objs"
-       fi
-      fi
+    func_extract_archives_result="$my_oldobjs"
+}
 
-      if test "$dlself" != no; then
-       $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
 
-      set dummy $rpath
-      if test "$#" -gt 2; then
-       $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
 
-      oldlibs=
-      if test -z "$rpath"; then
-       if test "$build_libtool_libs" = yes; then
-         # Building a libtool convenience library.
-         # Some compilers have problems with a `.al' extension so
-         # convenience libraries should have the same extension an
-         # archive normally would.
-         oldlibs="$output_objdir/$libname.$libext $oldlibs"
-         build_libtool_libs=convenience
-         build_old_libs=yes
+# func_emit_wrapper_part1 [arg=no]
+#
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
+{
+       func_emit_wrapper_part1_arg1=no
+       if test -n "$1" ; then
+         func_emit_wrapper_part1_arg1=$1
        fi
 
-       if test -n "$vinfo"; then
-         $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-       fi
+       $ECHO "\
+#! $SHELL
 
-       if test -n "$release"; then
-         $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-       fi
-      else
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
 
-       # Parse the version information argument.
-       save_ifs="$IFS"; IFS=':'
-       set dummy $vinfo 0 0 0
-       IFS="$save_ifs"
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
 
-       if test -n "$8"; then
-         $echo "$modename: too many parameters to \`-version-info'" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-       fi
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
-       # convert absolute version numbers to libtool ages
-       # this retains compatibility with .la files and attempts
-       # to make the code below a bit more comprehensible
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-       case $vinfo_number in
-       yes)
-         number_major="$2"
-         number_minor="$3"
-         number_revision="$4"
-         #
-         # There are really only two kinds -- those that
-         # use the current revision as the major version
-         # and those that subtract age and use age as
-         # a minor version.  But, then there is irix
-         # which has an extra 1 added just for fun
-         #
-         case $version_type in
-         darwin|linux|osf|windows)
-           current=`expr $number_major + $number_minor`
-           age="$number_minor"
-           revision="$number_revision"
-           ;;
-         freebsd-aout|freebsd-elf|sunos)
-           current="$number_major"
-           revision="$number_minor"
-           age="0"
-           ;;
-         irix|nonstopux)
-           current=`expr $number_major + $number_minor - 1`
-           age="$number_minor"
-           revision="$number_minor"
-           ;;
-         esac
-         ;;
-       no)
-         current="$2"
-         revision="$3"
-         age="$4"
-         ;;
-       esac
+relink_command=\"$relink_command\"
 
-       # Check that each of the things are valid numbers.
-       case $current in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    ECHO=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$ECHO will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+       $ECHO "\
 
-       case $revision in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
-       case $age in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
 
-       if test "$age" -gt "$current"; then
-         $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit $EXIT_FAILURE
-       fi
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
 
-       # Calculate the version variables.
-       major=
-       versuffix=
-       verstring=
-       case $version_type in
-       none) ;;
+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+"
+}
+# end: func_emit_wrapper_part1
 
-       darwin)
-         # Like Linux, but with the current version available in
-         # verstring for coding it into the library header
-         major=.`expr $current - $age`
-         versuffix="$major.$age.$revision"
-         # Darwin ld doesn't like 0 for these options...
-         minor_current=`expr $current + 1`
-         verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-         ;;
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+       func_emit_wrapper_part2_arg1=no
+       if test -n "$1" ; then
+         func_emit_wrapper_part2_arg1=$1
+       fi
 
-       freebsd-aout)
-         major=".$current"
-         versuffix=".$current.$revision";
-         ;;
+       $ECHO "\
 
-       freebsd-elf)
-         major=".$current"
-         versuffix=".$current";
-         ;;
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
 
-       irix | nonstopux)
-         major=`expr $current - $age + 1`
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
 
-         case $version_type in
-           nonstopux) verstring_prefix=nonstopux ;;
-           *)         verstring_prefix=sgi ;;
-         esac
-         verstring="$verstring_prefix$major.$revision"
+       if test "$fast_install" = yes; then
+         $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
 
-         # Add in all the interfaces that we are compatible with.
-         loop=$revision
-         while test "$loop" -ne 0; do
-           iface=`expr $revision - $loop`
-           loop=`expr $loop - 1`
-           verstring="$verstring_prefix$major.$iface:$verstring"
-         done
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
-         # Before this point, $major must not contain `.'.
-         major=.$major
-         versuffix="$major.$revision"
-         ;;
+    file=\"\$\$-\$program\"
 
-       linux)
-         major=.`expr $current - $age`
-         versuffix="$major.$age.$revision"
-         ;;
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
 
-       osf)
-         major=.`expr $current - $age`
-         versuffix=".$current.$age.$revision"
-         verstring="$current.$age.$revision"
+         $ECHO "\
 
-         # Add in all the interfaces that we are compatible with.
-         loop=$age
-         while test "$loop" -ne 0; do
-           iface=`expr $current - $loop`
-           loop=`expr $loop - 1`
-           verstring="$verstring:${iface}.0"
-         done
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+       $ECHO \"\$relink_command_output\" >&2
+       $RM \"\$progdir/\$file\"
+       exit 1
+      fi
+    fi
 
-         # Make executables depend on our current version.
-         verstring="$verstring:${current}.0"
-         ;;
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+       else
+         $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+       fi
 
-       sunos)
-         major=".$current"
-         versuffix=".$current.$revision"
-         ;;
+       $ECHO "\
 
-       windows)
-         # Use '-' rather than '.', since we only want one
-         # extension on DOS 8.3 filesystems.
-         major=`expr $current - $age`
-         versuffix="-$major"
-         ;;
+  if test -f \"\$progdir/\$program\"; then"
 
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
+       # Export our shlibpath_var if we have one.
+       if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+         $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
 
-       # Clear the version info if we defaulted, and they specified a release.
-       if test -z "$vinfo" && test -n "$release"; then
-         major=
-         case $version_type in
-         darwin)
-           # we can't check for "0.0" in archive_cmds due to quoting
-           # problems, so we reset it completely
-           verstring=
-           ;;
-         *)
-           verstring="0.0"
-           ;;
-         esac
-         if test "$need_version" = no; then
-           versuffix=
-         else
-           versuffix=".0.0"
-         fi
-       fi
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
 
-       # Remove version info from name if versioning should be avoided
-       if test "$avoid_version" = yes && test "$need_version" = no; then
-         major=
-         versuffix=
-         verstring=""
+    export $shlibpath_var
+"
        fi
 
-       # Check to see if the archive will have undefined symbols.
-       if test "$allow_undefined" = yes; then
-         if test "$allow_undefined_flag" = unsupported; then
-           $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-           build_libtool_libs=no
-           build_old_libs=yes
-         fi
-       else
-         # Don't allow undefined symbols.
-         allow_undefined_flag="$no_undefined_flag"
+       # fixup the dll searchpath if we need to.
+       if test -n "$dllsearchpath"; then
+         $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
        fi
-      fi
 
-      if test "$mode" != relink; then
-       # Remove our outputs, but don't remove object files since they
-       # may have been created when compiling PIC objects.
-       removelist=
-       tempremovelist=`$echo "$output_objdir/*"`
-       for p in $tempremovelist; do
-         case $p in
-           *.$objext)
-              ;;
-           $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-              if test "X$precious_files_regex" != "X"; then
-                if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-                then
-                  continue
-                fi
-              fi
-              removelist="$removelist $p"
-              ;;
-           *) ;;
-         esac
-       done
-       if test -n "$removelist"; then
-         $show "${rm}r $removelist"
-         $run ${rm}r $removelist
+       $ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+       case $host in
+       # Backslashes separate directories on plain windows
+       *-*-mingw | *-*-os2* | *-cegcc*)
+         $ECHO "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+         ;;
+
+       *)
+         $ECHO "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+         ;;
+       esac
+       $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+       func_emit_wrapper_arg1=no
+       if test -n "$1" ; then
+         func_emit_wrapper_arg1=$1
        fi
-      fi
 
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-       oldlibs="$oldlibs $output_objdir/$libname.$libext"
+       # split this up so that func_emit_cwrapperexe_src
+       # can call each part independently.
+       func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+       func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
 
-       # Transform .lo files to .o files.
-       oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
 
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-       lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-       deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-       dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_path
 
-      if test -n "$xrpath"; then
-       # If the user specified any rpath flags, then add them.
-       temp_xrpath=
-       for libdir in $xrpath; do
-         temp_xrpath="$temp_xrpath -R$libdir"
-         case "$finalize_rpath " in
-         *" $libdir "*) ;;
-         *) finalize_rpath="$finalize_rpath $libdir" ;;
-         esac
-       done
-       if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-         dependency_libs="$temp_xrpath $dependency_libs"
-       fi
-      fi
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+                  fi
+                fi
+              fi
+              IFS=:
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result" ; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
 
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-       case " $dlprefiles $dlfiles " in
-       *" $lib "*) ;;
-       *) dlfiles="$dlfiles $lib" ;;
-       esac
-      done
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+       cat <<EOF
 
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-       case "$dlprefiles " in
-       *" $lib "*) ;;
-       *) dlprefiles="$dlprefiles $lib" ;;
-       esac
-      done
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 
-      if test "$build_libtool_libs" = yes; then
-       if test -n "$rpath"; then
-         case $host in
-         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-           # these systems don't actually have a c library (as such)!
-           ;;
-         *-*-rhapsody* | *-*-darwin1.[012])
-           # Rhapsody C library is in the System framework
-           deplibs="$deplibs -framework System"
-           ;;
-         *-*-netbsd*)
-           # Don't link with libc until the a.out ld.so is fixed.
-           ;;
-         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-           # Do not include libc due to us having libc/libc_r.
-           ;;
-         *-*-sco3.2v5* | *-*-sco5v6*)
-           # Causes problems with __ctype
-           ;;
-         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-           # Compiler inserts libc in the correct place for threads to work
-           ;;
-         *)
-           # Add libc to deplibs on all other systems if necessary.
-           if test "$build_libtool_need_lc" = "yes"; then
-             deplibs="$deplibs -lc"
-           fi
-           ;;
-         esac
-       fi
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
 
-       # Transform deplibs into only deplibs that can be linked in shared.
-       name_save=$name
-       libname_save=$libname
-       release_save=$release
-       versuffix_save=$versuffix
-       major_save=$major
-       # I'm not sure if I'm treating the release correctly.  I think
-       # release should show up in the -l (ie -lgmp5) so we don't want to
-       # add it in twice.  Is that correct?
-       release=""
-       versuffix=""
-       major=""
-       newdeplibs=
-       droppeddeps=no
-       case $deplibs_check_method in
-       pass_all)
-         # Don't check for shared/static.  Everything works.
-         # This might be a little naive.  We might want to check
-         # whether the library exists or not.  But this is on
-         # osf3 & osf4 and I'm not really sure... Just
-         # implementing what was already the behavior.
-         newdeplibs=$deplibs
-         ;;
-       test_compile)
-         # This code stresses the "libraries are programs" paradigm to its
-         # limits. Maybe even breaks it.  We compile a program, linking it
-         # against the deplibs as a proxy for the library.  Then we can check
-         # whether they linked in statically or dynamically with ldd.
-         $rm conftest.c
-         cat > conftest.c <<EOF
-         int main() { return 0; }
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "$SHELL $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+           cat <<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+# define setmode _setmode
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+       (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+    va_list args;
+    va_start (args, fmt);
+    (void) vfprintf (stderr, fmt, args);
+    va_end (args);
+}
+#else
+# define LTWRAPPER_DEBUGPRINTF(args)
+#endif
+
+const char *program_name = NULL;
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+
+static const char *script_text_part1 =
+EOF
+
+           func_emit_wrapper_part1 yes |
+               $SED -e 's/\([\\"]\)/\\\1/g' \
+                    -e 's/^/  "/' -e 's/$/\\n"/'
+           echo ";"
+           cat <<EOF
+
+static const char *script_text_part2 =
+EOF
+           func_emit_wrapper_part2 yes |
+               $SED -e 's/\([\\"]\)/\\\1/g' \
+                    -e 's/^/  "/' -e 's/$/\\n"/'
+           echo ";"
+
+           cat <<EOF
+const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+           if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_pathlist "$temp_rpath"
+             cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
 EOF
-         $rm conftest
-         $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-         if test "$?" -eq 0 ; then
-           ldd_output=`ldd conftest`
-           for i in $deplibs; do
-             name=`expr $i : '-l\(.*\)'`
-             # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-               if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                 case " $predeps $postdeps " in
-                 *" $i "*)
-                   newdeplibs="$newdeplibs $i"
-                   i=""
-                   ;;
-                 esac
-               fi
-               if test -n "$i" ; then
-                 libname=`eval \\$echo \"$libname_spec\"`
-                 deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                 set dummy $deplib_matches
-                 deplib_match=$2
-                 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                   newdeplibs="$newdeplibs $i"
-                 else
-                   droppeddeps=yes
-                   $echo
-                   $echo "*** Warning: dynamic linker does not accept needed library $i."
-                   $echo "*** I have the capability to make that library automatically link in when"
-                   $echo "*** you link to this library.  But I can only do this if you have a"
-                   $echo "*** shared version of the library, which I believe you do not have"
-                   $echo "*** because a test_compile did reveal that the linker did not use it for"
-                   $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-                 fi
-               fi
-             else
-               newdeplibs="$newdeplibs $i"
-             fi
-           done
-         else
-           # Error occurred in the first compile.  Let's try to salvage
-           # the situation: Compile a separate program for each library.
-           for i in $deplibs; do
-             name=`expr $i : '-l\(.*\)'`
-             # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-               $rm conftest
-               $LTCC $LTCFLAGS -o conftest conftest.c $i
-               # Did it work?
-               if test "$?" -eq 0 ; then
-                 ldd_output=`ldd conftest`
-                 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                   case " $predeps $postdeps " in
-                   *" $i "*)
-                     newdeplibs="$newdeplibs $i"
-                     i=""
-                     ;;
-                   esac
-                 fi
-                 if test -n "$i" ; then
-                   libname=`eval \\$echo \"$libname_spec\"`
-                   deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                   set dummy $deplib_matches
-                   deplib_match=$2
-                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                     newdeplibs="$newdeplibs $i"
-                   else
-                     droppeddeps=yes
-                     $echo
-                     $echo "*** Warning: dynamic linker does not accept needed library $i."
-                     $echo "*** I have the capability to make that library automatically link in when"
-                     $echo "*** you link to this library.  But I can only do this if you have a"
-                     $echo "*** shared version of the library, which you do not appear to have"
-                     $echo "*** because a test_compile did reveal that the linker did not use this one"
-                     $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-                   fi
-                 fi
-               else
-                 droppeddeps=yes
-                 $echo
-                 $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-                 $echo "***  make it link in!  You will probably need to install it or some"
-                 $echo "*** library that it depends on before this library will be fully"
-                 $echo "*** functional.  Installing it before continuing would be even better."
-               fi
-             else
-               newdeplibs="$newdeplibs $i"
-             fi
-           done
-         fi
-         ;;
-       file_magic*)
-         set dummy $deplibs_check_method
-         file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-         for a_deplib in $deplibs; do
-           name=`expr $a_deplib : '-l\(.*\)'`
-           # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-               case " $predeps $postdeps " in
-               *" $a_deplib "*)
-                 newdeplibs="$newdeplibs $a_deplib"
-                 a_deplib=""
-                 ;;
-               esac
-             fi
-             if test -n "$a_deplib" ; then
-               libname=`eval \\$echo \"$libname_spec\"`
-               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-                 for potent_lib in $potential_libs; do
-                     # Follow soft links.
-                     if ls -lLd "$potent_lib" 2>/dev/null \
-                        | grep " -> " >/dev/null; then
-                       continue
-                     fi
-                     # The statement above tries to avoid entering an
-                     # endless loop below, in case of cyclic links.
-                     # We might still enter an endless loop, since a link
-                     # loop can be closed while we follow links,
-                     # but so what?
-                     potlib="$potent_lib"
-                     while test -h "$potlib" 2>/dev/null; do
-                       potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-                       case $potliblink in
-                       [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-                       *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-                       esac
-                     done
-                     if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-                        | ${SED} 10q \
-                        | $EGREP "$file_magic_regex" > /dev/null; then
-                       newdeplibs="$newdeplibs $a_deplib"
-                       a_deplib=""
-                       break 2
-                     fi
-                 done
-               done
-             fi
-             if test -n "$a_deplib" ; then
-               droppeddeps=yes
-               $echo
-               $echo "*** Warning: linker path does not have real file for library $a_deplib."
-               $echo "*** I have the capability to make that library automatically link in when"
-               $echo "*** you link to this library.  But I can only do this if you have a"
-               $echo "*** shared version of the library, which you do not appear to have"
-               $echo "*** because I did check the linker path looking for a file starting"
-               if test -z "$potlib" ; then
-                 $echo "*** with $libname but no candidates were found. (...for file magic test)"
-               else
-                 $echo "*** with $libname and none of the candidates passed a file format test"
-                 $echo "*** using a file magic. Last file checked: $potlib"
-               fi
-             fi
            else
-             # Add a -L argument.
-             newdeplibs="$newdeplibs $a_deplib"
+             cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
            fi
-         done # Gone through all deplibs.
-         ;;
-       match_pattern*)
-         set dummy $deplibs_check_method
-         match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-         for a_deplib in $deplibs; do
-           name=`expr $a_deplib : '-l\(.*\)'`
-           # If $name is empty we are operating on a -L argument.
-           if test -n "$name" && test "$name" != "0"; then
-             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-               case " $predeps $postdeps " in
-               *" $a_deplib "*)
-                 newdeplibs="$newdeplibs $a_deplib"
-                 a_deplib=""
-                 ;;
-               esac
-             fi
-             if test -n "$a_deplib" ; then
-               libname=`eval \\$echo \"$libname_spec\"`
-               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-                 for potent_lib in $potential_libs; do
-                   potlib="$potent_lib" # see symlink-check above in file_magic test
-                   if eval $echo \"$potent_lib\" 2>/dev/null \
-                       | ${SED} 10q \
-                       | $EGREP "$match_pattern_regex" > /dev/null; then
-                     newdeplibs="$newdeplibs $a_deplib"
-                     a_deplib=""
-                     break 2
-                   fi
-                 done
-               done
-             fi
-             if test -n "$a_deplib" ; then
-               droppeddeps=yes
-               $echo
-               $echo "*** Warning: linker path does not have real file for library $a_deplib."
-               $echo "*** I have the capability to make that library automatically link in when"
-               $echo "*** you link to this library.  But I can only do this if you have a"
-               $echo "*** shared version of the library, which you do not appear to have"
-               $echo "*** because I did check the linker path looking for a file starting"
-               if test -z "$potlib" ; then
-                 $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-               else
-                 $echo "*** with $libname and none of the candidates passed a file format test"
-                 $echo "*** using a regex pattern. Last file checked: $potlib"
-               fi
-             fi
+
+           if test -n "$dllsearchpath"; then
+              func_to_host_pathlist "$dllsearchpath:"
+             cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
            else
-             # Add a -L argument.
-             newdeplibs="$newdeplibs $a_deplib"
+             cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
            fi
-         done # Gone through all deplibs.
-         ;;
-       none | unknown | *)
-         newdeplibs=""
-         tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-           -e 's/ -[LR][^ ]*//g'`
-         if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-           for i in $predeps $postdeps ; do
-             # can't use Xsed below, because $i might contain '/'
-             tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-           done
-         fi
-         if $echo "X $tmp_deplibs" | $Xsed -e 's/[     ]//g' \
-           | grep . >/dev/null; then
-           $echo
-           if test "X$deplibs_check_method" = "Xnone"; then
-             $echo "*** Warning: inter-library dependencies are not supported in this platform."
+
+           if test "$fast_install" = yes; then
+             cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
            else
-             $echo "*** Warning: inter-library dependencies are not known to be supported."
+             cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
            fi
-           $echo "*** All declared inter-library dependencies are being dropped."
-           droppeddeps=yes
-         fi
-         ;;
-       esac
-       versuffix=$versuffix_save
-       major=$major_save
-       release=$release_save
-       libname=$libname_save
-       name=$name_save
 
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
-         # On Rhapsody replace the C library is the System framework
-         newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-         ;;
-       esac
 
-       if test "$droppeddeps" = yes; then
-         if test "$module" = yes; then
-           $echo
-           $echo "*** Warning: libtool could not satisfy all declared inter-library"
-           $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-           $echo "*** a static module, that should work as long as the dlopening"
-           $echo "*** application is linked with the -dlopen flag."
-           if test -z "$global_symbol_pipe"; then
-             $echo
-             $echo "*** However, this would only work if libtool was able to extract symbol"
-             $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-             $echo "*** not find such a program.  So, this module is probably useless."
-             $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-           fi
-           if test "$build_old_libs" = no; then
-             oldlibs="$output_objdir/$libname.$libext"
-             build_libtool_libs=module
-             build_old_libs=yes
-           else
-             build_libtool_libs=no
-           fi
-         else
-           $echo "*** The inter-library dependencies that have been dropped here will be"
-           $echo "*** automatically added whenever a program is linked with this library"
-           $echo "*** or is declared to -dlopen it."
+           cat <<"EOF"
 
-           if test "$allow_undefined" = no; then
-             $echo
-             $echo "*** Since this library must not contain undefined symbols,"
-             $echo "*** because either the platform does not support them or"
-             $echo "*** it was explicitly requested with -no-undefined,"
-             $echo "*** libtool will only create a static version of it."
-             if test "$build_old_libs" = no; then
-               oldlibs="$output_objdir/$libname.$libext"
-               build_libtool_libs=module
-               build_old_libs=yes
-             else
-               build_libtool_libs=no
-             fi
-           fi
-         fi
-       fi
-       # Done checking deplibs!
-       deplibs=$newdeplibs
-      fi
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
 
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
 
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-       case " $new_libs " in
-       *" -L$path/$objdir "*) ;;
-       *)
-         case " $deplibs " in
-         *" -L$path/$objdir "*)
-           new_libs="$new_libs -L$path/$objdir" ;;
-         esac
-         ;;
-       esac
-      done
-      for deplib in $deplibs; do
-       case $deplib in
-       -L*)
-         case " $new_libs " in
-         *" $deplib "*) ;;
-         *) new_libs="$new_libs $deplib" ;;
-         esac
-         ;;
-       *) new_libs="$new_libs $deplib" ;;
-       esac
-      done
-      deplibs="$new_libs"
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
 
+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
 
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
 
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-       if test "$hardcode_into_libs" = yes; then
-         # Hardcode the library paths
-         hardcode_libdirs=
-         dep_rpath=
-         rpath="$finalize_rpath"
-         test "$mode" != relink && rpath="$compile_rpath$rpath"
-         for libdir in $rpath; do
-           if test -n "$hardcode_libdir_flag_spec"; then
-             if test -n "$hardcode_libdir_separator"; then
-               if test -z "$hardcode_libdirs"; then
-                 hardcode_libdirs="$libdir"
-               else
-                 # Just accumulate the unique libdirs.
-                 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-                 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-                   ;;
-                 *)
-                   hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-                   ;;
-                 esac
-               fi
-             else
-               eval flag=\"$hardcode_libdir_flag_spec\"
-               dep_rpath="$dep_rpath $flag"
-             fi
-           elif test -n "$runpath_var"; then
-             case "$perm_rpath " in
-             *" $libdir "*) ;;
-             *) perm_rpath="$perm_rpath $libdir" ;;
-             esac
-           fi
-         done
-         # Substitute the hardcoded libdirs into the rpath.
-         if test -n "$hardcode_libdir_separator" &&
-            test -n "$hardcode_libdirs"; then
-           libdir="$hardcode_libdirs"
-           if test -n "$hardcode_libdir_flag_spec_ld"; then
-             eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-           else
-             eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-           fi
-         fi
-         if test -n "$runpath_var" && test -n "$perm_rpath"; then
-           # We should set the runpath_var.
-           rpath=
-           for dir in $perm_rpath; do
-             rpath="$rpath$dir:"
-           done
-           eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-         fi
-         test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-       fi
+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
 
-       shlibpath="$finalize_shlibpath"
-       test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-       if test -n "$shlibpath"; then
-         eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-       fi
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
 
-       # Get the real and link names of the library.
-       eval shared_ext=\"$shrext_cmds\"
-       eval library_names=\"$library_names_spec\"
-       set dummy $library_names
-       realname="$2"
-       shift; shift
+  int i;
 
-       if test -n "$soname_spec"; then
-         eval soname=\"$soname_spec\"
-       else
-         soname="$realname"
-       fi
-       if test -z "$dlname"; then
-         dlname=$soname
-       fi
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
 
-       lib="$output_objdir/$realname"
-       linknames=
-       for link
-       do
-         linknames="$linknames $link"
-       done
+  /* very simple arg parsing; don't want to rely on getopt */
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+       {
+EOF
+           case "$host" in
+             *mingw* | *cygwin* )
+               # make stdout use "unix" line endings
+               echo "          setmode(1,_O_BINARY);"
+               ;;
+             esac
 
-       # Use standard objects if they are pic
-       test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+           cat <<"EOF"
+         printf ("%s", script_text_part1);
+         printf ("%s", script_text_part2);
+         return 0;
+       }
+    }
 
-       # Prepare the list of exported symbols
-       if test -z "$export_symbols"; then
-         if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-           $show "generating symbol list for \`$libname.la'"
-           export_symbols="$output_objdir/$libname.exp"
-           $run $rm $export_symbols
-           cmds=$export_symbols_cmds
-           save_ifs="$IFS"; IFS='~'
-           for cmd in $cmds; do
-             IFS="$save_ifs"
-             eval cmd=\"$cmd\"
-             if len=`expr "X$cmd" : ".*"` &&
-              test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-               $show "$cmd"
-               $run eval "$cmd" || exit $?
-               skipped_export=false
-             else
-               # The command line is too long to execute in one step.
-               $show "using reloadable object file for export list..."
-               skipped_export=:
-               # Break out early, otherwise skipped_export may be
-               # set to false by a later but shorter cmd.
-               break
-             fi
-           done
-           IFS="$save_ifs"
-           if test -n "$export_symbols_regex"; then
-             $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-             $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-             $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-             $run eval '$mv "${export_symbols}T" "$export_symbols"'
-           fi
-         fi
-       fi
+  newargz = XMALLOC (char *, argc + 1);
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal ("Couldn't find %s", argv[0]);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+                         tmp_pathspec));
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+                         actual_cwrapper_path));
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+                         target_name));
+EOF
 
-       if test -n "$export_symbols" && test -n "$include_expsyms"; then
-         $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-       fi
+           cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+                   strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
 
-       tmp_deplibs=
-       for test_deplib in $deplibs; do
-               case " $convenience " in
-               *" $test_deplib "*) ;;
-               *)
-                       tmp_deplibs="$tmp_deplibs $test_deplib"
-                       ;;
-               esac
-       done
-       deplibs="$tmp_deplibs"
+           cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
 
-       if test -n "$convenience"; then
-         if test -n "$whole_archive_flag_spec"; then
-           save_libobjs=$libobjs
-           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-         else
-           gentop="$output_objdir/${outputname}x"
-           generated="$generated $gentop"
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
 
-           func_extract_archives $gentop $convenience
-           libobjs="$libobjs $func_extract_archives_result"
-         fi
-       fi
-       
-       if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-         eval flag=\"$thread_safe_flag_spec\"
-         linker_flags="$linker_flags $flag"
-       fi
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
 
-       # Make a backup of the uninstalled library when relinking
-       if test "$mode" = relink; then
-         $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-       fi
+           case $host_os in
+             mingw*)
+           cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+       *p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+       *p = '/';
+      }
+  }
+EOF
+           ;;
+           esac
 
-       # Do each of the archive commands.
-       if test "$module" = yes && test -n "$module_cmds" ; then
-         if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-           eval test_cmds=\"$module_expsym_cmds\"
-           cmds=$module_expsym_cmds
-         else
-           eval test_cmds=\"$module_cmds\"
-           cmds=$module_cmds
-         fi
-       else
-       if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-         eval test_cmds=\"$archive_expsym_cmds\"
-         cmds=$archive_expsym_cmds
-       else
-         eval test_cmds=\"$archive_cmds\"
-         cmds=$archive_cmds
-         fi
-       fi
+           cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
 
-       if test "X$skipped_export" != "X:" &&
-          len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-          test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-         :
-       else
-         # The command line is too long to link in one step, link piecewise.
-         $echo "creating reloadable object files..."
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
 
-         # Save the value of $output and $libobjs because we want to
-         # use them later.  If we have whole_archive_flag_spec, we
-         # want to use save_libobjs as it was before
-         # whole_archive_flag_spec was expanded, because we can't
-         # assume the linker understands whole_archive_flag_spec.
-         # This may have to be revisited, in case too many
-         # convenience libraries get linked in and end up exceeding
-         # the spec.
-         if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-           save_libobjs=$libobjs
-         fi
-         save_output=$output
-         output_la=`$echo "X$output" | $Xsed -e "$basename"`
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+        {
+          if (argv[i][env_set_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_set_opt_len + 1;
+              lt_opt_process_env_set (p);
+            }
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_set_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+        {
+          if (argv[i][env_prepend_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_prepend_opt_len + 1;
+              lt_opt_process_env_prepend (p);
+            }
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_prepend_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+        {
+          if (argv[i][env_append_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_append_opt_len + 1;
+              lt_opt_process_env_append (p);
+            }
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_append_opt);
+          continue;
+        }
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
 
-         # Clear the reloadable object creation command queue and
-         # initialize k to one.
-         test_cmds=
-         concat_cmds=
-         objlist=
-         delfiles=
-         last_robj=
-         k=1
-         output=$output_objdir/$output_la-${k}.$objext
-         # Loop over the list of objects to be linked.
-         for obj in $save_libobjs
-         do
-           eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-           if test "X$objlist" = X ||
-              { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-                test "$len" -le "$max_cmd_len"; }; then
-             objlist="$objlist $obj"
-           else
-             # The command $test_cmds is almost too long, add a
-             # command to the queue.
-             if test "$k" -eq 1 ; then
-               # The first file doesn't have a previous command to add.
-               eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-             else
-               # All subsequent reloadable object files will link in
-               # the last one created.
-               eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-             fi
-             last_robj=$output_objdir/$output_la-${k}.$objext
-             k=`expr $k + 1`
-             output=$output_objdir/$output_la-${k}.$objext
-             objlist=$obj
-             len=1
-           fi
-         done
-         # Handle the remaining objects by creating one last
-         # reloadable object file.  All subsequent reloadable object
-         # files will link in the last one created.
-         test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-         eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-         if ${skipped_export-false}; then
-           $show "generating symbol list for \`$libname.la'"
-           export_symbols="$output_objdir/$libname.exp"
-           $run $rm $export_symbols
-           libobjs=$output
-           # Append the command to create the export file.
-           eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-         # Set up a command to remove the reloadable object files
-         # after they are used.
-         i=0
-         while test "$i" -lt "$k"
-         do
-           i=`expr $i + 1`
-           delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-         done
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  for (i = 0; i < newargc; i++)
+    {
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+    }
 
-         $echo "creating a temporary reloadable object file: $output"
+EOF
 
-         # Loop through the commands generated above and execute them.
-         save_ifs="$IFS"; IFS='~'
-         for cmd in $concat_cmds; do
-           IFS="$save_ifs"
-           $show "$cmd"
-           $run eval "$cmd" || exit $?
-         done
-         IFS="$save_ifs"
+           case $host_os in
+             mingw*)
+               cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      return 127;
+    }
+  return rval;
+EOF
+               ;;
+             *)
+               cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+               ;;
+           esac
 
-         libobjs=$output
-         # Restore the value of output.
-         output=$save_output
+           cat <<"EOF"
+}
 
-         if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-         fi
-         # Expand the library linking commands again to reset the
-         # value of $libobjs for piecewise linking.
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
 
-         # Do each of the archive commands.
-         if test "$module" = yes && test -n "$module_cmds" ; then
-           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-             cmds=$module_expsym_cmds
-           else
-             cmds=$module_cmds
-           fi
-         else
-         if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-           cmds=$archive_expsym_cmds
-         else
-           cmds=$archive_cmds
-           fi
-         fi
+  return p;
+}
 
-         # Append the command to remove the reloadable object files
-         # to the just-reset $cmds.
-         eval cmds=\"\$cmds~\$rm $delfiles\"
-       fi
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
-         IFS="$save_ifs"
-         eval cmd=\"$cmd\"
-         $show "$cmd"
-         $run eval "$cmd" || {
-           lt_exit=$?
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+                         string) : NULL;
+}
 
-           # Restore the uninstalled library and exit
-           if test "$mode" = relink; then
-             $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-           fi
+const char *
+base_name (const char *name)
+{
+  const char *base;
 
-           exit $lt_exit
-         }
-       done
-       IFS="$save_ifs"
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
 
-       # Restore the uninstalled library and exit
-       if test "$mode" = relink; then
-         $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
 
-         if test -n "$convenience"; then
-           if test -z "$whole_archive_flag_spec"; then
-             $show "${rm}r $gentop"
-             $run ${rm}r "$gentop"
-           fi
-         fi
+int
+check_executable (const char *path)
+{
+  struct stat st;
 
-         exit $EXIT_SUCCESS
-       fi
+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+                         path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
 
-       # Create links to the real library.
-       for linkname in $linknames; do
-         if test "$realname" != "$linkname"; then
-           $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-           $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-         fi
-       done
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
 
-       # If -module or -export-dynamic was specified, set the dlname.
-       if test "$module" = yes || test "$export_dynamic" = yes; then
-         # On all known operating systems, these are identical.
-         dlname="$soname"
-       fi
-      fi
-      ;;
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
 
-    obj)
-      if test -n "$deplibs"; then
-       $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+                         path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
 
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
 
-      if test -n "$rpath"; then
-       $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
 
-      if test -n "$xrpath"; then
-       $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+                         wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
 
-      if test -n "$vinfo"; then
-       $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
 
-      if test -n "$release"; then
-       $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+       return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+       {
+         concat_name = xstrdup (wrapper);
+         if (check_executable (concat_name))
+           return concat_name;
+         XFREE (concat_name);
+       }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
 
-      case $output in
-      *.lo)
-       if test -n "$objs$old_deplibs"; then
-         $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-         exit $EXIT_FAILURE
-       fi
-       libobj="$output"
-       obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-       ;;
-      *)
-       libobj=
-       obj="$output"
-       ;;
-      esac
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+       has_slash = 1;
+       break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+       {
+         for (p = path; *p; p = p_next)
+           {
+             const char *q;
+             size_t p_len;
+             for (q = p; *q; q++)
+               if (IS_PATH_SEPARATOR (*q))
+                 break;
+             p_len = q - p;
+             p_next = (*q == '\0' ? q : q + 1);
+             if (p_len == 0)
+               {
+                 /* empty path: current directory */
+                 if (getcwd (tmp, LT_PATHMAX) == NULL)
+                   lt_fatal ("getcwd failed");
+                 tmp_len = strlen (tmp);
+                 concat_name =
+                   XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+                 memcpy (concat_name, tmp, tmp_len);
+                 concat_name[tmp_len] = '/';
+                 strcpy (concat_name + tmp_len + 1, wrapper);
+               }
+             else
+               {
+                 concat_name =
+                   XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+                 memcpy (concat_name, p, p_len);
+                 concat_name[p_len] = '/';
+                 strcpy (concat_name + p_len + 1, wrapper);
+               }
+             if (check_executable (concat_name))
+               return concat_name;
+             XFREE (concat_name);
+           }
+       }
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
 
-      # Delete the old objects.
-      $run $rm $obj $libobj
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
 
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+                             tmp_pathspec));
+      if (lstat (tmp_pathspec, &s) == 0)
+       {
+         if (S_ISLNK (s.st_mode) != 0)
+           {
+             has_symlinks = 1;
+             break;
+           }
 
-      if test -n "$convenience"; then
-       if test -n "$whole_archive_flag_spec"; then
-         eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-       else
-         gentop="$output_objdir/${obj}x"
-         generated="$generated $gentop"
+         /* search backwards for last DIR_SEPARATOR */
+         p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+         while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+           p--;
+         if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+           {
+             /* no more DIR_SEPARATORS left */
+             break;
+           }
+         *p = '\0';
+       }
+      else
+       {
+         char *errstr = strerror (errno);
+         lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+       }
+    }
+  XFREE (tmp_pathspec);
 
-         func_extract_archives $gentop $convenience
-         reload_conv_objs="$reload_objs $func_extract_archives_result"
-       fi
-      fi
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
 
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal ("Could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
 
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-       IFS="$save_ifs"
-       eval cmd=\"$cmd\"
-       $show "$cmd"
-       $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
 
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-       if test -n "$gentop"; then
-         $show "${rm}r $gentop"
-         $run ${rm}r $gentop
-       fi
+  assert (str != NULL);
+  assert (pat != NULL);
 
-       exit $EXIT_SUCCESS
-      fi
+  len = strlen (str);
+  patlen = strlen (pat);
 
-      if test "$build_libtool_libs" != yes; then
-       if test -n "$gentop"; then
-         $show "${rm}r $gentop"
-         $run ${rm}r $gentop
-       fi
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+       *str = '\0';
+    }
+  return str;
+}
 
-       # Create an invalid libtool object if no PIC, so that we don't
-       # accidentally link it into a program.
-       # $show "echo timestamp > $libobj"
-       # $run eval "echo timestamp > $libobj" || exit $?
-       exit $EXIT_SUCCESS
-      fi
+static void
+lt_error_core (int exit_status, const char *mode,
+              const char *message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
 
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-       # Only do commands if we really have different PIC objects.
-       reload_objs="$libobjs $reload_conv_objs"
-       output="$libobj"
-       cmds=$reload_cmds
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
-         IFS="$save_ifs"
-         eval cmd=\"$cmd\"
-         $show "$cmd"
-         $run eval "$cmd" || exit $?
-       done
-       IFS="$save_ifs"
-      fi
+  if (exit_status >= 0)
+    exit (exit_status);
+}
 
-      if test -n "$gentop"; then
-       $show "${rm}r $gentop"
-       $run ${rm}r $gentop
-      fi
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
 
-      exit $EXIT_SUCCESS
-      ;;
+void
+lt_setenv (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
 
-    prog)
-      case $host in
-       *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-       $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
 
-      if test -n "$release"; then
-       $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
 
-      if test "$preload" = yes; then
-       if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-          test "$dlopen_self_static" = unknown; then
-         $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-       fi
-      fi
+  p = strchr (arg, (int)'=');
 
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-       # On Rhapsody replace the C library is the System framework
-       compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-       finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-       ;;
-      esac
+  if (!p)
+    return 1;
 
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
+  *value = xstrdup (++p);
 
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
 
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-       case " $new_libs " in
-       *" -L$path/$objdir "*) ;;
-       *)
-         case " $compile_deplibs " in
-         *" -L$path/$objdir "*)
-           new_libs="$new_libs -L$path/$objdir" ;;
-         esac
-         ;;
-       esac
-      done
-      for deplib in $compile_deplibs; do
-       case $deplib in
-       -L*)
-         case " $new_libs " in
-         *" $deplib "*) ;;
-         *) new_libs="$new_libs $deplib" ;;
-         esac
-         ;;
-       *) new_libs="$new_libs $deplib" ;;
-       esac
-      done
-      compile_deplibs="$new_libs"
+  return 0;
+}
 
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
 
-      if test -n "$rpath$xrpath"; then
-       # If the user specified any rpath flags, then add them.
-       for libdir in $rpath $xrpath; do
-         # This is the magic to use -rpath.
-         case "$finalize_rpath " in
-         *" $libdir "*) ;;
-         *) finalize_rpath="$finalize_rpath $libdir" ;;
-         esac
-       done
-      fi
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
 
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-       if test -n "$hardcode_libdir_flag_spec"; then
-         if test -n "$hardcode_libdir_separator"; then
-           if test -z "$hardcode_libdirs"; then
-             hardcode_libdirs="$libdir"
-           else
-             # Just accumulate the unique libdirs.
-             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-               ;;
-             *)
-               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-               ;;
-             esac
-           fi
-         else
-           eval flag=\"$hardcode_libdir_flag_spec\"
-           rpath="$rpath $flag"
-         fi
-       elif test -n "$runpath_var"; then
-         case "$perm_rpath " in
-         *" $libdir "*) ;;
-         *) perm_rpath="$perm_rpath $libdir" ;;
-         esac
-       fi
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-         testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
-         case :$dllsearchpath: in
-         *":$libdir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$libdir";;
-         esac
-         case :$dllsearchpath: in
-         *":$testbindir:"*) ;;
-         *) dllsearchpath="$dllsearchpath:$testbindir";;
-         esac
-         ;;
-       esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-        test -n "$hardcode_libdirs"; then
-       libdir="$hardcode_libdirs"
-       eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
 
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-       if test -n "$hardcode_libdir_flag_spec"; then
-         if test -n "$hardcode_libdir_separator"; then
-           if test -z "$hardcode_libdirs"; then
-             hardcode_libdirs="$libdir"
-           else
-             # Just accumulate the unique libdirs.
-             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-               ;;
-             *)
-               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-               ;;
-             esac
-           fi
-         else
-           eval flag=\"$hardcode_libdir_flag_spec\"
-           rpath="$rpath $flag"
-         fi
-       elif test -n "$runpath_var"; then
-         case "$finalize_perm_rpath " in
-         *" $libdir "*) ;;
-         *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-         esac
-       fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-        test -n "$hardcode_libdirs"; then
-       libdir="$hardcode_libdirs"
-       eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
 
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-       # Transform all the library objects into standard objects.
-       compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-       finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
 
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       if test -n "$NM" && test -n "$global_symbol_pipe"; then
-         dlsyms="${outputname}S.c"
-       else
-         $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-       fi
-      fi
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
 
-      if test -n "$dlsyms"; then
-       case $dlsyms in
-       "") ;;
-       *.c)
-         # Discover the nlist of each of the dlfiles.
-         nlist="$output_objdir/${outputname}.nm"
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
 
-         $show "$rm $nlist ${nlist}S ${nlist}T"
-         $run $rm "$nlist" "${nlist}S" "${nlist}T"
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
 
-         # Parse the name list into a source file.
-         $show "creating $output_objdir/$dlsyms"
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
 
-         test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
 
-#ifdef __cplusplus
-extern \"C\" {
-#endif
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
 
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
 
-/* External symbol declarations for the compiler. */\
-"
 
-         if test "$dlself" = yes; then
-           $show "generating symbol list for \`$output'"
+EOF
+}
+# end: func_emit_cwrapperexe_src
 
-           test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
 
-           # Add our own program objects to the symbol list.
-           progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-           for arg in $progfiles; do
-             $show "extracting global C symbols from \`$arg'"
-             $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-           done
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
 
-           if test -n "$exclude_expsyms"; then
-             $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-             $run eval '$mv "$nlist"T "$nlist"'
-           fi
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
 
-           if test -n "$export_symbols_regex"; then
-             $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-             $run eval '$mv "$nlist"T "$nlist"'
-           fi
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
 
-           # Prepare the list of exported symbols
-           if test -z "$export_symbols"; then
-             export_symbols="$output_objdir/$outputname.exp"
-             $run $rm $export_symbols
-             $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-               $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-               $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-           else
-             $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-             $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-             $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-               $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-               $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-           fi
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+       test "$build_libtool_libs" != yes && \
+         func_fatal_configuration "can not build a shared library"
+       build_old_libs=no
+       break
+       ;;
+      -all-static | -static | -static-libtool-libs)
+       case $arg in
+       -all-static)
+         if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+           func_warning "complete static linking is impossible in this configuration"
          fi
-
-         for arg in $dlprefiles; do
-           $show "extracting global C symbols from \`$arg'"
-           name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-           $run eval '$echo ": $name " >> "$nlist"'
-           $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-         done
-
-         if test -z "$run"; then
-           # Make sure we have at least an empty file.
-           test -f "$nlist" || : > "$nlist"
-
-           if test -n "$exclude_expsyms"; then
-             $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-             $mv "$nlist"T "$nlist"
-           fi
-
-           # Try sorting and uniquifying the output.
-           if grep -v "^: " < "$nlist" |
-               if sort -k 3 </dev/null >/dev/null 2>&1; then
-                 sort -k 3
-               else
-                 sort +2
-               fi |
-               uniq > "$nlist"S; then
-             :
-           else
-             grep -v "^: " < "$nlist" > "$nlist"S
-           fi
-
-           if test -f "$nlist"S; then
-             eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-           else
-             $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-           fi
-
-           $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-           case $host in
-           *cygwin* | *mingw* )
-         $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-             ;;
-           * )
-         $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-             ;;
-           esac
-
-
-         $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-           eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-           $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
+         if test -n "$link_static_flag"; then
+           dlopen_self=$dlopen_self_static
          fi
-
-         pic_flag_for_symtable=
-         case $host in
-         # compiling the symbol table file with pic_flag works around
-         # a FreeBSD bug that causes programs to crash when -lm is
-         # linked before any other PIC object.  But we must not use
-         # pic_flag when linking with -static.  The problem exists in
-         # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-         *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-           case "$compile_command " in
-           *" -static "*) ;;
-           *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-           esac;;
-         *-*-hpux*)
-           case "$compile_command " in
-           *" -static "*) ;;
-           *) pic_flag_for_symtable=" $pic_flag";;
-           esac
-         esac
-
-         # Now compile the dynamic symbol file.
-         $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-         $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-         # Clean up the generated files.
-         $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-         $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-         # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-            else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            ;;
-          esac
+         prefer_static_libs=yes
          ;;
-       *)
-         $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-         exit $EXIT_FAILURE
+       -static)
+         if test -z "$pic_flag" && test -n "$link_static_flag"; then
+           dlopen_self=$dlopen_self_static
+         fi
+         prefer_static_libs=built
+         ;;
+       -static-libtool-libs)
+         if test -z "$pic_flag" && test -n "$link_static_flag"; then
+           dlopen_self=$dlopen_self_static
+         fi
+         prefer_static_libs=yes
          ;;
        esac
-      else
-       # We keep going just in case the user didn't refer to
-       # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-       # really was required.
-
-       # Nullify the symbol file.
-       compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-       finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-       # Replace the output file specification.
-       compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-       link_command="$compile_command$compile_rpath"
+       build_libtool_libs=no
+       build_old_libs=yes
+       break
+       ;;
+      esac
+    done
 
-       # We have no uninstalled library dependencies, so finalize right now.
-       $show "$link_command"
-       $run eval "$link_command"
-       exit_status=$?
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 
-       # Delete the generated files.
-       if test -n "$dlsyms"; then
-         $show "$rm $output_objdir/${outputname}S.${objext}"
-         $run $rm "$output_objdir/${outputname}S.${objext}"
-       fi
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
 
-       exit $exit_status
-      fi
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+       case $prev in
+       output)
+         func_append compile_command " @OUTPUT@"
+         func_append finalize_command " @OUTPUT@"
+         ;;
+       esac
 
-      if test -n "$shlibpath_var"; then
-       # We should set the shlibpath_var
-       rpath=
-       for dir in $temp_rpath; do
-         case $dir in
-         [\\/]* | [A-Za-z]:[\\/]*)
-           # Absolute path.
-           rpath="$rpath$dir:"
+       case $prev in
+       dlfiles|dlprefiles)
+         if test "$preload" = no; then
+           # Add the symbol object into the linking commands.
+           func_append compile_command " @SYMFILE@"
+           func_append finalize_command " @SYMFILE@"
+           preload=yes
+         fi
+         case $arg in
+         *.la | *.lo) ;;  # We handle these cases below.
+         force)
+           if test "$dlself" = no; then
+             dlself=needless
+             export_dynamic=yes
+           fi
+           prev=
+           continue
+           ;;
+         self)
+           if test "$prev" = dlprefiles; then
+             dlself=yes
+           elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+             dlself=yes
+           else
+             dlself=needless
+             export_dynamic=yes
+           fi
+           prev=
+           continue
            ;;
          *)
-           # Relative path: add a thisdir entry.
-           rpath="$rpath\$thisdir/$dir:"
+           if test "$prev" = dlfiles; then
+             dlfiles="$dlfiles $arg"
+           else
+             dlprefiles="$dlprefiles $arg"
+           fi
+           prev=
+           continue
            ;;
          esac
-       done
-       temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-       compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-       finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
+         ;;
+       expsyms)
+         export_symbols="$arg"
+         test -f "$arg" \
+           || func_fatal_error "symbol file \`$arg' does not exist"
+         prev=
+         continue
+         ;;
+       expsyms_regex)
+         export_symbols_regex="$arg"
+         prev=
+         continue
+         ;;
+       framework)
+         case $host in
+           *-*-darwin*)
+             case "$deplibs " in
+               *" $qarg.ltframework "*) ;;
+               *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+                  ;;
+             esac
+             ;;
+         esac
+         prev=
+         continue
+         ;;
+       inst_prefix)
+         inst_prefix_dir="$arg"
+         prev=
+         continue
+         ;;
+       objectlist)
+         if test -f "$arg"; then
+           save_arg=$arg
+           moreargs=
+           for fil in `cat "$save_arg"`
+           do
+#            moreargs="$moreargs $fil"
+             arg=$fil
+             # A libtool-controlled object.
 
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-       if test -n "$perm_rpath"; then
-         # We should set the runpath_var.
-         rpath=
-         for dir in $perm_rpath; do
-           rpath="$rpath$dir:"
-         done
-         compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-       fi
-       if test -n "$finalize_perm_rpath"; then
-         # We should set the runpath_var.
-         rpath=
-         for dir in $finalize_perm_rpath; do
-           rpath="$rpath$dir:"
-         done
-         finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-       fi
-      fi
+             # Check to see that this really is a libtool object.
+             if func_lalib_unsafe_p "$arg"; then
+               pic_object=
+               non_pic_object=
 
-      if test "$no_install" = yes; then
-       # We don't need to create a wrapper script.
-       link_command="$compile_var$compile_command$compile_rpath"
-       # Replace the output file specification.
-       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-       # Delete the old output file.
-       $run $rm $output
-       # Link the executable and exit
-       $show "$link_command"
-       $run eval "$link_command" || exit $?
-       exit $EXIT_SUCCESS
-      fi
+               # Read the .lo file
+               func_source "$arg"
 
-      if test "$hardcode_action" = relink; then
-       # Fast installation is not supported
-       link_command="$compile_var$compile_command$compile_rpath"
-       relink_command="$finalize_var$finalize_command$finalize_rpath"
+               if test -z "$pic_object" ||
+                  test -z "$non_pic_object" ||
+                  test "$pic_object" = none &&
+                  test "$non_pic_object" = none; then
+                 func_fatal_error "cannot find name of object for \`$arg'"
+               fi
 
-       $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-       $echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-       if test "$fast_install" != no; then
-         link_command="$finalize_var$compile_command$finalize_rpath"
-         if test "$fast_install" = yes; then
-           relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-         else
-           # fast_install is set to needless
-           relink_command=
-         fi
-       else
-         link_command="$compile_var$compile_command$compile_rpath"
-         relink_command="$finalize_var$finalize_command$finalize_rpath"
-       fi
-      fi
+               # Extract subdirectory from the argument.
+               func_dirname "$arg" "/" ""
+               xdir="$func_dirname_result"
 
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+               if test "$pic_object" != none; then
+                 # Prepend the subdirectory the object is found in.
+                 pic_object="$xdir$pic_object"
 
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+                 if test "$prev" = dlfiles; then
+                   if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+                     dlfiles="$dlfiles $pic_object"
+                     prev=
+                     continue
+                   else
+                     # If libtool objects are unsupported, then we need to preload.
+                     prev=dlprefiles
+                   fi
+                 fi
 
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
+                 # CHECK ME:  I think I busted this.  -Ossama
+                 if test "$prev" = dlprefiles; then
+                   # Preload the old-style object.
+                   dlprefiles="$dlprefiles $pic_object"
+                   prev=
+                 fi
 
-      # Now create the wrapper script.
-      $show "creating $output"
+                 # A PIC object.
+                 func_append libobjs " $pic_object"
+                 arg="$pic_object"
+               fi
 
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-       # Preserve any variables that may affect compiler behavior
-       for var in $variables_saved_for_relink; do
-         if eval test -z \"\${$var+set}\"; then
-           relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-         elif eval var_value=\$$var; test -z "$var_value"; then
-           relink_command="$var=; export $var; $relink_command"
-         else
-           var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-           relink_command="$var=\"$var_value\"; export $var; $relink_command"
-         fi
-       done
-       relink_command="(cd `pwd`; $relink_command)"
-       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
+               # Non-PIC object.
+               if test "$non_pic_object" != none; then
+                 # Prepend the subdirectory the object is found in.
+                 non_pic_object="$xdir$non_pic_object"
 
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-       case $progpath in
-       [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-       *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-       esac
-       qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-       qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-       # win32 will think the script is a binary if it has
-       # a .exe suffix, so we strip it off here.
-       case $output in
-         *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-       esac
-       # test for cygwin because mv fails w/o .exe extensions
-       case $host in
-         *cygwin*)
-           exeext=.exe
-           outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-         *) exeext= ;;
+                 # A standard non-PIC object
+                 func_append non_pic_objects " $non_pic_object"
+                 if test -z "$pic_object" || test "$pic_object" = none ; then
+                   arg="$non_pic_object"
+                 fi
+               else
+                 # If the PIC object exists, use it instead.
+                 # $xdir was prepended to $pic_object above.
+                 non_pic_object="$pic_object"
+                 func_append non_pic_objects " $non_pic_object"
+               fi
+             else
+               # Only an error if not doing a dry-run.
+               if $opt_dry_run; then
+                 # Extract subdirectory from the argument.
+                 func_dirname "$arg" "/" ""
+                 xdir="$func_dirname_result"
+
+                 func_lo2o "$arg"
+                 pic_object=$xdir$objdir/$func_lo2o_result
+                 non_pic_object=$xdir$func_lo2o_result
+                 func_append libobjs " $pic_object"
+                 func_append non_pic_objects " $non_pic_object"
+               else
+                 func_fatal_error "\`$arg' is not a valid libtool object"
+               fi
+             fi
+           done
+         else
+           func_fatal_error "link input file \`$arg' does not exist"
+         fi
+         arg=$save_arg
+         prev=
+         continue
+         ;;
+       precious_regex)
+         precious_files_regex="$arg"
+         prev=
+         continue
+         ;;
+       release)
+         release="-$arg"
+         prev=
+         continue
+         ;;
+       rpath | xrpath)
+         # We need an absolute path.
+         case $arg in
+         [\\/]* | [A-Za-z]:[\\/]*) ;;
+         *)
+           func_fatal_error "only absolute run-paths are allowed"
+           ;;
+         esac
+         if test "$prev" = rpath; then
+           case "$rpath " in
+           *" $arg "*) ;;
+           *) rpath="$rpath $arg" ;;
+           esac
+         else
+           case "$xrpath " in
+           *" $arg "*) ;;
+           *) xrpath="$xrpath $arg" ;;
+           esac
+         fi
+         prev=
+         continue
+         ;;
+       shrext)
+         shrext_cmds="$arg"
+         prev=
+         continue
+         ;;
+       weak)
+         weak_libs="$weak_libs $arg"
+         prev=
+         continue
+         ;;
+       xcclinker)
+         linker_flags="$linker_flags $qarg"
+         compiler_flags="$compiler_flags $qarg"
+         prev=
+         func_append compile_command " $qarg"
+         func_append finalize_command " $qarg"
+         continue
+         ;;
+       xcompiler)
+         compiler_flags="$compiler_flags $qarg"
+         prev=
+         func_append compile_command " $qarg"
+         func_append finalize_command " $qarg"
+         continue
+         ;;
+       xlinker)
+         linker_flags="$linker_flags $qarg"
+         compiler_flags="$compiler_flags $wl$qarg"
+         prev=
+         func_append compile_command " $wl$qarg"
+         func_append finalize_command " $wl$qarg"
+         continue
+         ;;
+       *)
+         eval "$prev=\"\$arg\""
+         prev=
+         continue
+         ;;
        esac
-       case $host in
-         *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-            cwrapper="$output_path/$output_name.exe"
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-           cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-           cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
+      fi # test -n "$prev"
 
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
+      prevarg="$arg"
 
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
+      case $arg in
+      -all-static)
+       if test -n "$link_static_flag"; then
+         # See comment for -static flag below, for more details.
+         func_append compile_command " $link_static_flag"
+         func_append finalize_command " $link_static_flag"
+       fi
+       continue
+       ;;
 
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
+      -allow-undefined)
+       # FIXME: remove this flag sometime in the future.
+       func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+       ;;
 
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
+      -avoid-version)
+       avoid_version=yes
+       continue
+       ;;
 
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
+      -dlopen)
+       prev=dlfiles
+       continue
+       ;;
 
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
+      -dlpreopen)
+       prev=dlprefiles
+       continue
+       ;;
 
-const char *program_name = NULL;
+      -export-dynamic)
+       export_dynamic=yes
+       continue
+       ;;
 
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+      -export-symbols | -export-symbols-regex)
+       if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+         func_fatal_error "more than one -exported-symbols argument is not allowed"
+       fi
+       if test "X$arg" = "X-export-symbols"; then
+         prev=expsyms
+       else
+         prev=expsyms_regex
+       fi
+       continue
+       ;;
 
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
+      -framework)
+       prev=framework
+       continue
+       ;;
 
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
+      -inst-prefix-dir)
+       prev=inst_prefix
+       continue
+       ;;
 
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+       case $with_gcc/$host in
+       no/*-*-irix* | /*-*-irix*)
+         func_append compile_command " $arg"
+         func_append finalize_command " $arg"
+         ;;
+       esac
+       continue
+       ;;
 
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
+      -L*)
+       func_stripname '-L' '' "$arg"
+       dir=$func_stripname_result
+       if test -z "$dir"; then
+         if test "$#" -gt 0; then
+           func_fatal_error "require no space between \`-L' and \`$1'"
+         else
+           func_fatal_error "need path for \`-L' option"
+         fi
+       fi
+       # We need an absolute path.
+       case $dir in
+       [\\/]* | [A-Za-z]:[\\/]*) ;;
+       *)
+         absdir=`cd "$dir" && pwd`
+         test -z "$absdir" && \
+           func_fatal_error "cannot determine absolute directory name of \`$dir'"
+         dir="$absdir"
+         ;;
+       esac
+       case "$deplibs " in
+       *" -L$dir "*) ;;
+       *)
+         deplibs="$deplibs -L$dir"
+         lib_search_path="$lib_search_path $dir"
+         ;;
+       esac
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+         testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+         case :$dllsearchpath: in
+         *":$dir:"*) ;;
+         ::) dllsearchpath=$dir;;
+         *) dllsearchpath="$dllsearchpath:$dir";;
+         esac
+         case :$dllsearchpath: in
+         *":$testbindir:"*) ;;
+         ::) dllsearchpath=$testbindir;;
+         *) dllsearchpath="$dllsearchpath:$testbindir";;
+         esac
+         ;;
+       esac
+       continue
+       ;;
 
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
+      -l*)
+       if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+         case $host in
+         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+           # These systems don't actually have a C or math library (as such)
+           continue
+           ;;
+         *-*-os2*)
+           # These systems don't actually have a C library (as such)
+           test "X$arg" = "X-lc" && continue
+           ;;
+         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+           # Do not include libc due to us having libc/libc_r.
+           test "X$arg" = "X-lc" && continue
+           ;;
+         *-*-rhapsody* | *-*-darwin1.[012])
+           # Rhapsody C and math libraries are in the System framework
+           deplibs="$deplibs System.ltframework"
+           continue
+           ;;
+         *-*-sco3.2v5* | *-*-sco5v6*)
+           # Causes problems with __ctype
+           test "X$arg" = "X-lc" && continue
+           ;;
+         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+           # Compiler inserts libc in the correct place for threads to work
+           test "X$arg" = "X-lc" && continue
+           ;;
+         esac
+       elif test "X$arg" = "X-lc_r"; then
+        case $host in
+        *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+          # Do not include libc_r directly, use -pthread flag.
+          continue
+          ;;
+        esac
+       fi
+       deplibs="$deplibs $arg"
+       continue
+       ;;
 
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
+      -module)
+       module=yes
+       continue
+       ;;
 
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot)
+       compiler_flags="$compiler_flags $arg"
+       func_append compile_command " $arg"
+       func_append finalize_command " $arg"
+       prev=xcompiler
+       continue
+       ;;
 
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+       compiler_flags="$compiler_flags $arg"
+       func_append compile_command " $arg"
+       func_append finalize_command " $arg"
+       case "$new_inherited_linker_flags " in
+           *" $arg "*) ;;
+           * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+       esac
+       continue
+       ;;
 
-  return p;
-}
+      -multi_module)
+       single_module="${wl}-multi_module"
+       continue
+       ;;
 
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
+      -no-fast-install)
+       fast_install=no
+       continue
+       ;;
 
-const char *
-base_name (const char *name)
-{
-  const char *base;
+      -no-install)
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+         # The PATH hackery in wrapper scripts is required on Windows
+         # and Darwin in order for the loader to find any dlls it needs.
+         func_warning "\`-no-install' is ignored for $host"
+         func_warning "assuming \`-no-fast-install' instead"
+         fast_install=no
+         ;;
+       *) no_install=yes ;;
+       esac
+       continue
+       ;;
 
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-    name += 2;
-#endif
+      -no-undefined)
+       allow_undefined=no
+       continue
+       ;;
 
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
+      -objectlist)
+       prev=objectlist
+       continue
+       ;;
 
-int
-check_executable(const char * path)
-{
-  struct stat st;
+      -o) prev=output ;;
 
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
+      -precious-files-regex)
+       prev=precious_regex
+       continue
+       ;;
 
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
+      -release)
+       prev=release
+       continue
+       ;;
 
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
-  int has_slash = 0;
-  const char* p;
-  const char* p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char* concat_name;
+      -rpath)
+       prev=rpath
+       continue
+       ;;
 
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+      -R)
+       prev=xrpath
+       continue
+       ;;
 
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
+      -R*)
+       func_stripname '-R' '' "$arg"
+       dir=$func_stripname_result
+       # We need an absolute path.
+       case $dir in
+       [\\/]* | [A-Za-z]:[\\/]*) ;;
+       *)
+         func_fatal_error "only absolute run-paths are allowed"
+         ;;
+       esac
+       case "$xrpath " in
+       *" $dir "*) ;;
+       *) xrpath="$xrpath $dir" ;;
+       esac
+       continue
+       ;;
 
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-  {
-    concat_name = xstrdup (wrapper);
-    if (check_executable(concat_name))
-      return concat_name;
-    XFREE(concat_name);
-  }
-  else
-  {
-#endif
-    if (IS_DIR_SEPARATOR (wrapper[0]))
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable(concat_name))
-        return concat_name;
-      XFREE(concat_name);
-    }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  }
-#endif
+      -shared)
+       # The effects of -shared are defined in a previous loop.
+       continue
+       ;;
 
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-    {
-      has_slash = 1;
-      break;
-    }
-  if (!has_slash)
-  {
-    /* no slashes; search PATH */
-    const char* path = getenv ("PATH");
-    if (path != NULL)
-    {
-      for (p = path; *p; p = p_next)
-      {
-        const char* q;
-        size_t p_len;
-        for (q = p; *q; q++)
-          if (IS_PATH_SEPARATOR(*q))
-            break;
-        p_len = q - p;
-        p_next = (*q == '\0' ? q : q + 1);
-        if (p_len == 0)
-        {
-          /* empty path: current directory */
-          if (getcwd (tmp, LT_PATHMAX) == NULL)
-            lt_fatal ("getcwd failed");
-          tmp_len = strlen(tmp);
-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, tmp, tmp_len);
-          concat_name[tmp_len] = '/';
-          strcpy (concat_name + tmp_len + 1, wrapper);
-        }
-        else
-        {
-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, p, p_len);
-          concat_name[p_len] = '/';
-          strcpy (concat_name + p_len + 1, wrapper);
-        }
-        if (check_executable(concat_name))
-          return concat_name;
-        XFREE(concat_name);
-      }
-    }
-    /* not found in PATH; assume curdir */
-  }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen(tmp);
-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
+      -shrext)
+       prev=shrext
+       continue
+       ;;
 
-  if (check_executable(concat_name))
-    return concat_name;
-  XFREE(concat_name);
-  return NULL;
-}
+      -static | -static-libtool-libs)
+       # The effects of -static are defined in a previous loop.
+       # We used to do the same as -all-static on platforms that
+       # didn't have a PIC flag, but the assumption that the effects
+       # would be equivalent was wrong.  It would break on at least
+       # Digital Unix and AIX.
+       continue
+       ;;
 
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
+      -thread-safe)
+       thread_safe=yes
+       continue
+       ;;
 
-  assert(str != NULL);
-  assert(pat != NULL);
+      -version-info)
+       prev=vinfo
+       continue
+       ;;
 
-  len = strlen(str);
-  patlen = strlen(pat);
+      -version-number)
+       prev=vinfo
+       vinfo_number=yes
+       continue
+       ;;
 
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
+      -weak)
+        prev=weak
+       continue
+       ;;
 
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
+      -Wc,*)
+       func_stripname '-Wc,' '' "$arg"
+       args=$func_stripname_result
+       arg=
+       save_ifs="$IFS"; IFS=','
+       for flag in $args; do
+         IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+         arg="$arg $wl$func_quote_for_eval_result"
+         compiler_flags="$compiler_flags $func_quote_for_eval_result"
+       done
+       IFS="$save_ifs"
+       func_stripname ' ' '' "$arg"
+       arg=$func_stripname_result
+       ;;
 
-  if (exit_status >= 0)
-    exit (exit_status);
-}
+      -Wl,*)
+       func_stripname '-Wl,' '' "$arg"
+       args=$func_stripname_result
+       arg=
+       save_ifs="$IFS"; IFS=','
+       for flag in $args; do
+         IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+         arg="$arg $wl$func_quote_for_eval_result"
+         compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+         linker_flags="$linker_flags $func_quote_for_eval_result"
+       done
+       IFS="$save_ifs"
+       func_stripname ' ' '' "$arg"
+       arg=$func_stripname_result
+       ;;
 
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+      -Xcompiler)
+       prev=xcompiler
+       continue
+       ;;
 
-       $echo > $output "\
-#! $SHELL
+      -Xlinker)
+       prev=xlinker
+       continue
+       ;;
 
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
+      -XCClinker)
+       prev=xcclinker
+       continue
+       ;;
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
+      # -msg_* for osf cc
+      -msg_*)
+       func_quote_for_eval "$arg"
+       arg="$func_quote_for_eval_result"
+       ;;
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+        func_quote_for_eval "$arg"
+       arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
 
-relink_command=\"$relink_command\"
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+       arg="$func_quote_for_eval_result"
+       ;;
 
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
+      *.$objext)
+       # A standard object.
+       objs="$objs $arg"
+       ;;
+
+      *.lo)
+       # A libtool-controlled object.
+
+       # Check to see that this really is a libtool object.
+       if func_lalib_unsafe_p "$arg"; then
+         pic_object=
+         non_pic_object=
+
+         # Read the .lo file
+         func_source "$arg"
+
+         if test -z "$pic_object" ||
+            test -z "$non_pic_object" ||
+            test "$pic_object" = none &&
+            test "$non_pic_object" = none; then
+           func_fatal_error "cannot find name of object for \`$arg'"
+         fi
+
+         # Extract subdirectory from the argument.
+         func_dirname "$arg" "/" ""
+         xdir="$func_dirname_result"
+
+         if test "$pic_object" != none; then
+           # Prepend the subdirectory the object is found in.
+           pic_object="$xdir$pic_object"
+
+           if test "$prev" = dlfiles; then
+             if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+               dlfiles="$dlfiles $pic_object"
+               prev=
+               continue
+             else
+               # If libtool objects are unsupported, then we need to preload.
+               prev=dlprefiles
+             fi
+           fi
+
+           # CHECK ME:  I think I busted this.  -Ossama
+           if test "$prev" = dlprefiles; then
+             # Preload the old-style object.
+             dlprefiles="$dlprefiles $pic_object"
+             prev=
+           fi
+
+           # A PIC object.
+           func_append libobjs " $pic_object"
+           arg="$pic_object"
+         fi
+
+         # Non-PIC object.
+         if test "$non_pic_object" != none; then
+           # Prepend the subdirectory the object is found in.
+           non_pic_object="$xdir$non_pic_object"
+
+           # A standard non-PIC object
+           func_append non_pic_objects " $non_pic_object"
+           if test -z "$pic_object" || test "$pic_object" = none ; then
+             arg="$non_pic_object"
+           fi
+         else
+           # If the PIC object exists, use it instead.
+           # $xdir was prepended to $pic_object above.
+           non_pic_object="$pic_object"
+           func_append non_pic_objects " $non_pic_object"
+         fi
+       else
+         # Only an error if not doing a dry-run.
+         if $opt_dry_run; then
+           # Extract subdirectory from the argument.
+           func_dirname "$arg" "/" ""
+           xdir="$func_dirname_result"
+
+           func_lo2o "$arg"
+           pic_object=$xdir$objdir/$func_lo2o_result
+           non_pic_object=$xdir$func_lo2o_result
+           func_append libobjs " $pic_object"
+           func_append non_pic_objects " $non_pic_object"
+         else
+           func_fatal_error "\`$arg' is not a valid libtool object"
+         fi
+       fi
+       ;;
+
+      *.$libext)
+       # An archive.
+       deplibs="$deplibs $arg"
+       old_deplibs="$old_deplibs $arg"
+       continue
+       ;;
+
+      *.la)
+       # A libtool-controlled library.
+
+       if test "$prev" = dlfiles; then
+         # This library was specified with -dlopen.
+         dlfiles="$dlfiles $arg"
+         prev=
+       elif test "$prev" = dlprefiles; then
+         # The library was specified with -dlpreopen.
+         dlprefiles="$dlprefiles $arg"
+         prev=
+       else
+         deplibs="$deplibs $arg"
+       fi
+       continue
+       ;;
+
+      # Some other compiler argument.
+      *)
+       # Unknown arguments in both finalize_command and compile_command need
+       # to be aesthetically quoted because they are evaled later.
+       func_quote_for_eval "$arg"
+       arg="$func_quote_for_eval_result"
+       ;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+       func_append compile_command " $arg"
+       func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
     else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+      shlib_search_path=
     fi
-  fi\
-"
-       $echo >> $output "\
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
 
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_duplicate_deps ; then
+       case "$libs " in
+       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+       esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+       for pre_post_dep in $predeps $postdeps; do
+         case "$pre_post_deps " in
+         *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+         esac
+         pre_post_deps="$pre_post_deps $pre_post_dep"
+       done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+       passes="conv dlpreopen link"
+       for file in $dlfiles $dlprefiles; do
+         case $file in
+         *.la) ;;
+         *)
+           func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+           ;;
+         esac
+       done
+       ;;
+    prog)
+       compile_deplibs=
+       finalize_deplibs=
+       alldeplibs=no
+       newdlfiles=
+       newdlprefiles=
+       passes="conv scan dlopen dlpreopen link"
+       ;;
+    *)  passes="conv"
+       ;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+       ## FIXME: Find the place where the list is rebuilt in the wrong
+       ##        order, and fix it there properly
+        tmp_deplibs=
+       for deplib in $deplibs; do
+         tmp_deplibs="$deplib $tmp_deplibs"
+       done
+       deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+        test "$linkmode,$pass" = "prog,scan"; then
+       libs="$deplibs"
+       deplibs=
+      fi
+      if test "$linkmode" = prog; then
+       case $pass in
+       dlopen) libs="$dlfiles" ;;
+       dlpreopen) libs="$dlprefiles" ;;
+       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+       esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+       # Collect and forward deplibs of preopened libtool libs
+       for lib in $dlprefiles; do
+         # Ignore non-libtool-libs
+         dependency_libs=
+         case $lib in
+         *.la) func_source "$lib" ;;
+         esac
+
+         # Collect preopened libtool deplibs, except any this library
+         # has declared as weak libs
+         for deplib in $dependency_libs; do
+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+           case " $weak_libs " in
+           *" $deplib_base "*) ;;
+           *) deplibs="$deplibs $deplib" ;;
+           esac
+         done
+       done
+       libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+       # Collect dlpreopened libraries
+       save_deplibs="$deplibs"
+       deplibs=
+      fi
+
+      for deplib in $libs; do
+       lib=
+       found=no
+       case $deplib in
+       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+         if test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$deplib $compile_deplibs"
+           finalize_deplibs="$deplib $finalize_deplibs"
+         else
+           compiler_flags="$compiler_flags $deplib"
+           if test "$linkmode" = lib ; then
+               case "$new_inherited_linker_flags " in
+                   *" $deplib "*) ;;
+                   * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+               esac
+           fi
+         fi
+         continue
+         ;;
+       -l*)
+         if test "$linkmode" != lib && test "$linkmode" != prog; then
+           func_warning "\`-l' is ignored for archives/objects"
+           continue
+         fi
+         func_stripname '-l' '' "$deplib"
+         name=$func_stripname_result
+         if test "$linkmode" = lib; then
+           searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+         else
+           searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+         fi
+         for searchdir in $searchdirs; do
+           for search_ext in .la $std_shrext .so .a; do
+             # Search the libtool library
+             lib="$searchdir/lib${name}${search_ext}"
+             if test -f "$lib"; then
+               if test "$search_ext" = ".la"; then
+                 found=yes
+               else
+                 found=no
+               fi
+               break 2
+             fi
+           done
+         done
+         if test "$found" != yes; then
+           # deplib doesn't seem to be a libtool library
+           if test "$linkmode,$pass" = "prog,link"; then
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           else
+             deplibs="$deplib $deplibs"
+             test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+           fi
+           continue
+         else # deplib is a libtool library
+           # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+           # We need to do some special things here, and not later.
+           if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+             case " $predeps $postdeps " in
+             *" $deplib "*)
+               if func_lalib_p "$lib"; then
+                 library_names=
+                 old_library=
+                 func_source "$lib"
+                 for l in $old_library $library_names; do
+                   ll="$l"
+                 done
+                 if test "X$ll" = "X$old_library" ; then # only static version available
+                   found=no
+                   func_dirname "$lib" "" "."
+                   ladir="$func_dirname_result"
+                   lib=$ladir/$old_library
+                   if test "$linkmode,$pass" = "prog,link"; then
+                     compile_deplibs="$deplib $compile_deplibs"
+                     finalize_deplibs="$deplib $finalize_deplibs"
+                   else
+                     deplibs="$deplib $deplibs"
+                     test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+                   fi
+                   continue
+                 fi
+               fi
+               ;;
+             *) ;;
+             esac
+           fi
+         fi
+         ;; # -l
+       *.ltframework)
+         if test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$deplib $compile_deplibs"
+           finalize_deplibs="$deplib $finalize_deplibs"
+         else
+           deplibs="$deplib $deplibs"
+           if test "$linkmode" = lib ; then
+               case "$new_inherited_linker_flags " in
+                   *" $deplib "*) ;;
+                   * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+               esac
+           fi
+         fi
+         continue
+         ;;
+       -L*)
+         case $linkmode in
+         lib)
+           deplibs="$deplib $deplibs"
+           test "$pass" = conv && continue
+           newdependency_libs="$deplib $newdependency_libs"
+           func_stripname '-L' '' "$deplib"
+           newlib_search_path="$newlib_search_path $func_stripname_result"
+           ;;
+         prog)
+           if test "$pass" = conv; then
+             deplibs="$deplib $deplibs"
+             continue
+           fi
+           if test "$pass" = scan; then
+             deplibs="$deplib $deplibs"
+           else
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           fi
+           func_stripname '-L' '' "$deplib"
+           newlib_search_path="$newlib_search_path $func_stripname_result"
+           ;;
+         *)
+           func_warning "\`-L' is ignored for archives/objects"
+           ;;
+         esac # linkmode
+         continue
+         ;; # -L
+       -R*)
+         if test "$pass" = link; then
+           func_stripname '-R' '' "$deplib"
+           dir=$func_stripname_result
+           # Make sure the xrpath contains only unique directories.
+           case "$xrpath " in
+           *" $dir "*) ;;
+           *) xrpath="$xrpath $dir" ;;
+           esac
+         fi
+         deplibs="$deplib $deplibs"
+         continue
+         ;;
+       *.la) lib="$deplib" ;;
+       *.$libext)
+         if test "$pass" = conv; then
+           deplibs="$deplib $deplibs"
+           continue
+         fi
+         case $linkmode in
+         lib)
+           # Linking convenience modules into shared libraries is allowed,
+           # but linking other static libraries is non-portable.
+           case " $dlpreconveniencelibs " in
+           *" $deplib "*) ;;
+           *)
+             valid_a_lib=no
+             case $deplibs_check_method in
+               match_pattern*)
+                 set dummy $deplibs_check_method; shift
+                 match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+                 if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+                   | $EGREP "$match_pattern_regex" > /dev/null; then
+                   valid_a_lib=yes
+                 fi
+               ;;
+               pass_all)
+                 valid_a_lib=yes
+               ;;
+             esac
+             if test "$valid_a_lib" != yes; then
+               $ECHO
+               $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+               $ECHO "*** I have the capability to make that library automatically link in when"
+               $ECHO "*** you link to this library.  But I can only do this if you have a"
+               $ECHO "*** shared version of the library, which you do not appear to have"
+               $ECHO "*** because the file extensions .$libext of this argument makes me believe"
+               $ECHO "*** that it is just a static archive that I should not use here."
+             else
+               $ECHO
+               $ECHO "*** Warning: Linking the shared library $output against the"
+               $ECHO "*** static library $deplib is not portable!"
+               deplibs="$deplib $deplibs"
+             fi
+             ;;
+           esac
+           continue
+           ;;
+         prog)
+           if test "$pass" != link; then
+             deplibs="$deplib $deplibs"
+           else
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           fi
+           continue
+           ;;
+         esac # linkmode
+         ;; # *.$libext
+       *.lo | *.$objext)
+         if test "$pass" = conv; then
+           deplibs="$deplib $deplibs"
+         elif test "$linkmode" = prog; then
+           if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+             # If there is no dlopen support or we're linking statically,
+             # we need to preload.
+             newdlprefiles="$newdlprefiles $deplib"
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           else
+             newdlfiles="$newdlfiles $deplib"
+           fi
+         fi
+         continue
+         ;;
+       %DEPLIBS%)
+         alldeplibs=yes
+         continue
+         ;;
+       esac # case $deplib
+
+       if test "$found" = yes || test -f "$lib"; then :
+       else
+         func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+       fi
+
+       # Check to see that this really is a libtool archive.
+       func_lalib_unsafe_p "$lib" \
+         || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+       func_dirname "$lib" "" "."
+       ladir="$func_dirname_result"
+
+       dlname=
+       dlopen=
+       dlpreopen=
+       libdir=
+       library_names=
+       old_library=
+       inherited_linker_flags=
+       # If the library was installed with an old release of libtool,
+       # it will not redefine variables installed, or shouldnotlink
+       installed=yes
+       shouldnotlink=no
+       avoidtemprpath=
+
+
+       # Read the .la file
+       func_source "$lib"
+
+       # Convert "-framework foo" to "foo.ltframework"
+       if test -n "$inherited_linker_flags"; then
+         tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+         for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+           case " $new_inherited_linker_flags " in
+             *" $tmp_inherited_linker_flag "*) ;;
+             *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+           esac
+         done
+       fi
+       dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+       if test "$linkmode,$pass" = "lib,link" ||
+          test "$linkmode,$pass" = "prog,scan" ||
+          { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+         test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+         test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+       fi
+
+       if test "$pass" = conv; then
+         # Only check for convenience libraries
+         deplibs="$lib $deplibs"
+         if test -z "$libdir"; then
+           if test -z "$old_library"; then
+             func_fatal_error "cannot find name of link library for \`$lib'"
+           fi
+           # It is a libtool convenience library, so add in its objects.
+           convenience="$convenience $ladir/$objdir/$old_library"
+           old_convenience="$old_convenience $ladir/$objdir/$old_library"
+         elif test "$linkmode" != prog && test "$linkmode" != lib; then
+           func_fatal_error "\`$lib' is not a convenience library"
+         fi
+         tmp_libs=
+         for deplib in $dependency_libs; do
+           deplibs="$deplib $deplibs"
+           if $opt_duplicate_deps ; then
+             case "$tmp_libs " in
+             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+             esac
+           fi
+           tmp_libs="$tmp_libs $deplib"
+         done
+         continue
+       fi # $pass = conv
+
+
+       # Get the name of the library we link against.
+       linklib=
+       for l in $old_library $library_names; do
+         linklib="$l"
+       done
+       if test -z "$linklib"; then
+         func_fatal_error "cannot find name of link library for \`$lib'"
+       fi
+
+       # This library was specified with -dlopen.
+       if test "$pass" = dlopen; then
+         if test -z "$libdir"; then
+           func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+         fi
+         if test -z "$dlname" ||
+            test "$dlopen_support" != yes ||
+            test "$build_libtool_libs" = no; then
+           # If there is no dlname, no dlopen support or we're linking
+           # statically, we need to preload.  We also need to preload any
+           # dependent libraries so libltdl's deplib preloader doesn't
+           # bomb out in the load deplibs phase.
+           dlprefiles="$dlprefiles $lib $dependency_libs"
+         else
+           newdlfiles="$newdlfiles $lib"
+         fi
+         continue
+       fi # $pass = dlopen
+
+       # We need an absolute path.
+       case $ladir in
+       [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+       *)
+         abs_ladir=`cd "$ladir" && pwd`
+         if test -z "$abs_ladir"; then
+           func_warning "cannot determine absolute directory name of \`$ladir'"
+           func_warning "passing it literally to the linker, although it might fail"
+           abs_ladir="$ladir"
+         fi
+         ;;
+       esac
+       func_basename "$lib"
+       laname="$func_basename_result"
+
+       # Find the relevant object directory and library name.
+       if test "X$installed" = Xyes; then
+         if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+           func_warning "library \`$lib' was moved."
+           dir="$ladir"
+           absdir="$abs_ladir"
+           libdir="$abs_ladir"
+         else
+           dir="$libdir"
+           absdir="$libdir"
+         fi
+         test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+       else
+         if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+           dir="$ladir"
+           absdir="$abs_ladir"
+           # Remove this search path later
+           notinst_path="$notinst_path $abs_ladir"
+         else
+           dir="$ladir/$objdir"
+           absdir="$abs_ladir/$objdir"
+           # Remove this search path later
+           notinst_path="$notinst_path $abs_ladir"
+         fi
+       fi # $installed = yes
+       func_stripname 'lib' '.la' "$laname"
+       name=$func_stripname_result
+
+       # This library was specified with -dlpreopen.
+       if test "$pass" = dlpreopen; then
+         if test -z "$libdir" && test "$linkmode" = prog; then
+           func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+         fi
+         # Prefer using a static library (so that no silly _DYNAMIC symbols
+         # are required to link).
+         if test -n "$old_library"; then
+           newdlprefiles="$newdlprefiles $dir/$old_library"
+           # Keep a list of preopened convenience libraries to check
+           # that they are being used correctly in the link pass.
+           test -z "$libdir" && \
+               dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+         # Otherwise, use the dlname, so that lt_dlopen finds it.
+         elif test -n "$dlname"; then
+           newdlprefiles="$newdlprefiles $dir/$dlname"
+         else
+           newdlprefiles="$newdlprefiles $dir/$linklib"
+         fi
+       fi # $pass = dlpreopen
+
+       if test -z "$libdir"; then
+         # Link the convenience library
+         if test "$linkmode" = lib; then
+           deplibs="$dir/$old_library $deplibs"
+         elif test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$dir/$old_library $compile_deplibs"
+           finalize_deplibs="$dir/$old_library $finalize_deplibs"
+         else
+           deplibs="$lib $deplibs" # used for prog,scan pass
+         fi
+         continue
+       fi
+
+
+       if test "$linkmode" = prog && test "$pass" != link; then
+         newlib_search_path="$newlib_search_path $ladir"
+         deplibs="$lib $deplibs"
+
+         linkalldeplibs=no
+         if test "$link_all_deplibs" != no || test -z "$library_names" ||
+            test "$build_libtool_libs" = no; then
+           linkalldeplibs=yes
+         fi
+
+         tmp_libs=
+         for deplib in $dependency_libs; do
+           case $deplib in
+           -L*) func_stripname '-L' '' "$deplib"
+                newlib_search_path="$newlib_search_path $func_stripname_result"
+                ;;
+           esac
+           # Need to link against all dependency_libs?
+           if test "$linkalldeplibs" = yes; then
+             deplibs="$deplib $deplibs"
+           else
+             # Need to hardcode shared library paths
+             # or/and link against static libraries
+             newdependency_libs="$deplib $newdependency_libs"
+           fi
+           if $opt_duplicate_deps ; then
+             case "$tmp_libs " in
+             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+             esac
+           fi
+           tmp_libs="$tmp_libs $deplib"
+         done # for deplib
+         continue
+       fi # $linkmode = prog...
+
+       if test "$linkmode,$pass" = "prog,link"; then
+         if test -n "$library_names" &&
+            { { test "$prefer_static_libs" = no ||
+                test "$prefer_static_libs,$installed" = "built,yes"; } ||
+              test -z "$old_library"; }; then
+           # We need to hardcode the library path
+           if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+             # Make sure the rpath contains only unique directories.
+             case "$temp_rpath:" in
+             *"$absdir:"*) ;;
+             *) temp_rpath="$temp_rpath$absdir:" ;;
+             esac
+           fi
+
+           # Hardcode the library path.
+           # Skip directories that are in the system default run-time
+           # search path.
+           case " $sys_lib_dlsearch_path " in
+           *" $absdir "*) ;;
+           *)
+             case "$compile_rpath " in
+             *" $absdir "*) ;;
+             *) compile_rpath="$compile_rpath $absdir"
+             esac
+             ;;
+           esac
+           case " $sys_lib_dlsearch_path " in
+           *" $libdir "*) ;;
+           *)
+             case "$finalize_rpath " in
+             *" $libdir "*) ;;
+             *) finalize_rpath="$finalize_rpath $libdir"
+             esac
+             ;;
+           esac
+         fi # $linkmode,$pass = prog,link...
+
+         if test "$alldeplibs" = yes &&
+            { test "$deplibs_check_method" = pass_all ||
+              { test "$build_libtool_libs" = yes &&
+                test -n "$library_names"; }; }; then
+           # We only need to search for static libraries
+           continue
+         fi
+       fi
+
+       link_static=no # Whether the deplib will be linked statically
+       use_static_libs=$prefer_static_libs
+       if test "$use_static_libs" = built && test "$installed" = yes; then
+         use_static_libs=no
+       fi
+       if test -n "$library_names" &&
+          { test "$use_static_libs" = no || test -z "$old_library"; }; then
+         case $host in
+         *cygwin* | *mingw* | *cegcc*)
+             # No point in relinking DLLs because paths are not encoded
+             notinst_deplibs="$notinst_deplibs $lib"
+             need_relink=no
+           ;;
+         *)
+           if test "$installed" = no; then
+             notinst_deplibs="$notinst_deplibs $lib"
+             need_relink=yes
+           fi
+           ;;
+         esac
+         # This is a shared library
+
+         # Warn about portability, can't link against -module's on some
+         # systems (darwin).  Don't bleat about dlopened modules though!
+         dlopenmodule=""
+         for dlpremoduletest in $dlprefiles; do
+           if test "X$dlpremoduletest" = "X$lib"; then
+             dlopenmodule="$dlpremoduletest"
+             break
+           fi
+         done
+         if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+           $ECHO
+           if test "$linkmode" = prog; then
+             $ECHO "*** Warning: Linking the executable $output against the loadable module"
+           else
+             $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+           fi
+           $ECHO "*** $linklib is not portable!"
+         fi
+         if test "$linkmode" = lib &&
+            test "$hardcode_into_libs" = yes; then
+           # Hardcode the library path.
+           # Skip directories that are in the system default run-time
+           # search path.
+           case " $sys_lib_dlsearch_path " in
+           *" $absdir "*) ;;
+           *)
+             case "$compile_rpath " in
+             *" $absdir "*) ;;
+             *) compile_rpath="$compile_rpath $absdir"
+             esac
+             ;;
+           esac
+           case " $sys_lib_dlsearch_path " in
+           *" $libdir "*) ;;
+           *)
+             case "$finalize_rpath " in
+             *" $libdir "*) ;;
+             *) finalize_rpath="$finalize_rpath $libdir"
+             esac
+             ;;
+           esac
+         fi
+
+         if test -n "$old_archive_from_expsyms_cmds"; then
+           # figure out the soname
+           set dummy $library_names
+           shift
+           realname="$1"
+           shift
+           libname=`eval "\\$ECHO \"$libname_spec\""`
+           # use dlname if we got it. it's perfectly good, no?
+           if test -n "$dlname"; then
+             soname="$dlname"
+           elif test -n "$soname_spec"; then
+             # bleh windows
+             case $host in
+             *cygwin* | mingw* | *cegcc*)
+               func_arith $current - $age
+               major=$func_arith_result
+               versuffix="-$major"
+               ;;
+             esac
+             eval soname=\"$soname_spec\"
+           else
+             soname="$realname"
+           fi
+
+           # Make a new name for the extract_expsyms_cmds to use
+           soroot="$soname"
+           func_basename "$soroot"
+           soname="$func_basename_result"
+           func_stripname 'lib' '.dll' "$soname"
+           newlib=libimp-$func_stripname_result.a
+
+           # If the library has no export list, then create one now
+           if test -f "$output_objdir/$soname-def"; then :
+           else
+             func_verbose "extracting exported symbol list from \`$soname'"
+             func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+           fi
+
+           # Create $newlib
+           if test -f "$output_objdir/$newlib"; then :; else
+             func_verbose "generating import library for \`$soname'"
+             func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+           fi
+           # make sure the library variables are pointing to the new library
+           dir=$output_objdir
+           linklib=$newlib
+         fi # test -n "$old_archive_from_expsyms_cmds"
+
+         if test "$linkmode" = prog || test "$mode" != relink; then
+           add_shlibpath=
+           add_dir=
+           add=
+           lib_linked=yes
+           case $hardcode_action in
+           immediate | unsupported)
+             if test "$hardcode_direct" = no; then
+               add="$dir/$linklib"
+               case $host in
+                 *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+                 *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+                 *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+                   *-*-unixware7*) add_dir="-L$dir" ;;
+                 *-*-darwin* )
+                   # if the lib is a (non-dlopened) module then we can not
+                   # link against it, someone is ignoring the earlier warnings
+                   if /usr/bin/file -L $add 2> /dev/null |
+                        $GREP ": [^:]* bundle" >/dev/null ; then
+                     if test "X$dlopenmodule" != "X$lib"; then
+                       $ECHO "*** Warning: lib $linklib is a module, not a shared library"
+                       if test -z "$old_library" ; then
+                         $ECHO
+                         $ECHO "*** And there doesn't seem to be a static archive available"
+                         $ECHO "*** The link will probably fail, sorry"
+                       else
+                         add="$dir/$old_library"
+                       fi
+                     elif test -n "$old_library"; then
+                       add="$dir/$old_library"
+                     fi
+                   fi
+               esac
+             elif test "$hardcode_minus_L" = no; then
+               case $host in
+               *-*-sunos*) add_shlibpath="$dir" ;;
+               esac
+               add_dir="-L$dir"
+               add="-l$name"
+             elif test "$hardcode_shlibpath_var" = no; then
+               add_shlibpath="$dir"
+               add="-l$name"
+             else
+               lib_linked=no
+             fi
+             ;;
+           relink)
+             if test "$hardcode_direct" = yes &&
+                test "$hardcode_direct_absolute" = no; then
+               add="$dir/$linklib"
+             elif test "$hardcode_minus_L" = yes; then
+               add_dir="-L$dir"
+               # Try looking first in the location we're being installed to.
+               if test -n "$inst_prefix_dir"; then
+                 case $libdir in
+                   [\\/]*)
+                     add_dir="$add_dir -L$inst_prefix_dir$libdir"
+                     ;;
+                 esac
+               fi
+               add="-l$name"
+             elif test "$hardcode_shlibpath_var" = yes; then
+               add_shlibpath="$dir"
+               add="-l$name"
+             else
+               lib_linked=no
+             fi
+             ;;
+           *) lib_linked=no ;;
+           esac
+
+           if test "$lib_linked" != yes; then
+             func_fatal_configuration "unsupported hardcode properties"
+           fi
+
+           if test -n "$add_shlibpath"; then
+             case :$compile_shlibpath: in
+             *":$add_shlibpath:"*) ;;
+             *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+             esac
+           fi
+           if test "$linkmode" = prog; then
+             test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+             test -n "$add" && compile_deplibs="$add $compile_deplibs"
+           else
+             test -n "$add_dir" && deplibs="$add_dir $deplibs"
+             test -n "$add" && deplibs="$add $deplibs"
+             if test "$hardcode_direct" != yes &&
+                test "$hardcode_minus_L" != yes &&
+                test "$hardcode_shlibpath_var" = yes; then
+               case :$finalize_shlibpath: in
+               *":$libdir:"*) ;;
+               *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+               esac
+             fi
+           fi
+         fi
+
+         if test "$linkmode" = prog || test "$mode" = relink; then
+           add_shlibpath=
+           add_dir=
+           add=
+           # Finalize command for both is simple: just hardcode it.
+           if test "$hardcode_direct" = yes &&
+              test "$hardcode_direct_absolute" = no; then
+             add="$libdir/$linklib"
+           elif test "$hardcode_minus_L" = yes; then
+             add_dir="-L$libdir"
+             add="-l$name"
+           elif test "$hardcode_shlibpath_var" = yes; then
+             case :$finalize_shlibpath: in
+             *":$libdir:"*) ;;
+             *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+             esac
+             add="-l$name"
+           elif test "$hardcode_automatic" = yes; then
+             if test -n "$inst_prefix_dir" &&
+                test -f "$inst_prefix_dir$libdir/$linklib" ; then
+               add="$inst_prefix_dir$libdir/$linklib"
+             else
+               add="$libdir/$linklib"
+             fi
+           else
+             # We cannot seem to hardcode it, guess we'll fake it.
+             add_dir="-L$libdir"
+             # Try looking first in the location we're being installed to.
+             if test -n "$inst_prefix_dir"; then
+               case $libdir in
+                 [\\/]*)
+                   add_dir="$add_dir -L$inst_prefix_dir$libdir"
+                   ;;
+               esac
+             fi
+             add="-l$name"
+           fi
+
+           if test "$linkmode" = prog; then
+             test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+             test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+           else
+             test -n "$add_dir" && deplibs="$add_dir $deplibs"
+             test -n "$add" && deplibs="$add $deplibs"
+           fi
+         fi
+       elif test "$linkmode" = prog; then
+         # Here we assume that one of hardcode_direct or hardcode_minus_L
+         # is not unsupported.  This is valid on all known static and
+         # shared platforms.
+         if test "$hardcode_direct" != unsupported; then
+           test -n "$old_library" && linklib="$old_library"
+           compile_deplibs="$dir/$linklib $compile_deplibs"
+           finalize_deplibs="$dir/$linklib $finalize_deplibs"
+         else
+           compile_deplibs="-l$name -L$dir $compile_deplibs"
+           finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+         fi
+       elif test "$build_libtool_libs" = yes; then
+         # Not a shared library
+         if test "$deplibs_check_method" != pass_all; then
+           # We're trying link a shared library against a static one
+           # but the system doesn't support it.
+
+           # Just print a warning and add the library to dependency_libs so
+           # that the program can be linked against the static library.
+           $ECHO
+           $ECHO "*** Warning: This system can not link to static lib archive $lib."
+           $ECHO "*** I have the capability to make that library automatically link in when"
+           $ECHO "*** you link to this library.  But I can only do this if you have a"
+           $ECHO "*** shared version of the library, which you do not appear to have."
+           if test "$module" = yes; then
+             $ECHO "*** But as you try to build a module library, libtool will still create "
+             $ECHO "*** a static module, that should work as long as the dlopening application"
+             $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+             if test -z "$global_symbol_pipe"; then
+               $ECHO
+               $ECHO "*** However, this would only work if libtool was able to extract symbol"
+               $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+               $ECHO "*** not find such a program.  So, this module is probably useless."
+               $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+             fi
+             if test "$build_old_libs" = no; then
+               build_libtool_libs=module
+               build_old_libs=yes
+             else
+               build_libtool_libs=no
+             fi
+           fi
+         else
+           deplibs="$dir/$old_library $deplibs"
+           link_static=yes
+         fi
+       fi # link shared/static library?
+
+       if test "$linkmode" = lib; then
+         if test -n "$dependency_libs" &&
+            { test "$hardcode_into_libs" != yes ||
+              test "$build_old_libs" = yes ||
+              test "$link_static" = yes; }; then
+           # Extract -R from dependency_libs
+           temp_deplibs=
+           for libdir in $dependency_libs; do
+             case $libdir in
+             -R*) func_stripname '-R' '' "$libdir"
+                  temp_xrpath=$func_stripname_result
+                  case " $xrpath " in
+                  *" $temp_xrpath "*) ;;
+                  *) xrpath="$xrpath $temp_xrpath";;
+                  esac;;
+             *) temp_deplibs="$temp_deplibs $libdir";;
+             esac
+           done
+           dependency_libs="$temp_deplibs"
+         fi
+
+         newlib_search_path="$newlib_search_path $absdir"
+         # Link against this library
+         test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+         # ... and its dependency_libs
+         tmp_libs=
+         for deplib in $dependency_libs; do
+           newdependency_libs="$deplib $newdependency_libs"
+           if $opt_duplicate_deps ; then
+             case "$tmp_libs " in
+             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+             esac
+           fi
+           tmp_libs="$tmp_libs $deplib"
+         done
+
+         if test "$link_all_deplibs" != no; then
+           # Add the search paths of all dependency libraries
+           for deplib in $dependency_libs; do
+             case $deplib in
+             -L*) path="$deplib" ;;
+             *.la)
+               func_dirname "$deplib" "" "."
+               dir="$func_dirname_result"
+               # We need an absolute path.
+               case $dir in
+               [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+               *)
+                 absdir=`cd "$dir" && pwd`
+                 if test -z "$absdir"; then
+                   func_warning "cannot determine absolute directory name of \`$dir'"
+                   absdir="$dir"
+                 fi
+                 ;;
+               esac
+               if $GREP "^installed=no" $deplib > /dev/null; then
+               case $host in
+               *-*-darwin*)
+                 depdepl=
+                 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+                 if test -n "$deplibrary_names" ; then
+                   for tmp in $deplibrary_names ; do
+                     depdepl=$tmp
+                   done
+                   if test -f "$absdir/$objdir/$depdepl" ; then
+                     depdepl="$absdir/$objdir/$depdepl"
+                     darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+                     compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+                     linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+                     path=
+                   fi
+                 fi
+                 ;;
+               *)
+                 path="-L$absdir/$objdir"
+                 ;;
+               esac
+               else
+                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+                 test -z "$libdir" && \
+                   func_fatal_error "\`$deplib' is not a valid libtool archive"
+                 test "$absdir" != "$libdir" && \
+                   func_warning "\`$deplib' seems to be moved"
+
+                 path="-L$absdir"
+               fi
+               ;;
+             esac
+             case " $deplibs " in
+             *" $path "*) ;;
+             *) deplibs="$path $deplibs" ;;
+             esac
+           done
+         fi # link_all_deplibs != no
+       fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+       if test "$linkmode" = "prog"; then
+         compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+         finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+       else
+         compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+       fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+       # Link the dlpreopened libraries before other libraries
+       for deplib in $save_deplibs; do
+         deplibs="$deplib $deplibs"
+       done
+      fi
+      if test "$pass" != dlopen; then
+       if test "$pass" != conv; then
+         # Make sure lib_search_path contains only unique directories.
+         lib_search_path=
+         for dir in $newlib_search_path; do
+           case "$lib_search_path " in
+           *" $dir "*) ;;
+           *) lib_search_path="$lib_search_path $dir" ;;
+           esac
+         done
+         newlib_search_path=
+       fi
+
+       if test "$linkmode,$pass" != "prog,link"; then
+         vars="deplibs"
+       else
+         vars="compile_deplibs finalize_deplibs"
+       fi
+       for var in $vars dependency_libs; do
+         # Add libraries to $var in reverse order
+         eval tmp_libs=\"\$$var\"
+         new_libs=
+         for deplib in $tmp_libs; do
+           # FIXME: Pedantically, this is the right thing to do, so
+           #        that some nasty dependency loop isn't accidentally
+           #        broken:
+           #new_libs="$deplib $new_libs"
+           # Pragmatically, this seems to cause very few problems in
+           # practice:
+           case $deplib in
+           -L*) new_libs="$deplib $new_libs" ;;
+           -R*) ;;
+           *)
+             # And here is the reason: when a library appears more
+             # than once as an explicit dependence of a library, or
+             # is implicitly linked in more than once by the
+             # compiler, it is considered special, and multiple
+             # occurrences thereof are not removed.  Compare this
+             # with having the same library being listed as a
+             # dependency of multiple other libraries: in this case,
+             # we know (pedantically, we assume) the library does not
+             # need to be listed more than once, so we keep only the
+             # last copy.  This is not always right, but it is rare
+             # enough that we require users that really mean to play
+             # such unportable linking tricks to link the library
+             # using -Wl,-lname, so that libtool does not consider it
+             # for duplicate removal.
+             case " $specialdeplibs " in
+             *" $deplib "*) new_libs="$deplib $new_libs" ;;
+             *)
+               case " $new_libs " in
+               *" $deplib "*) ;;
+               *) new_libs="$deplib $new_libs" ;;
+               esac
+               ;;
+             esac
+             ;;
+           esac
+         done
+         tmp_libs=
+         for deplib in $new_libs; do
+           case $deplib in
+           -L*)
+             case " $tmp_libs " in
+             *" $deplib "*) ;;
+             *) tmp_libs="$tmp_libs $deplib" ;;
+             esac
+             ;;
+           *) tmp_libs="$tmp_libs $deplib" ;;
+           esac
+         done
+         eval $var=\"$tmp_libs\"
+       done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+       case " $predeps $postdeps $compiler_lib_search_path " in
+       *" $i "*)
+         i=""
+         ;;
+       esac
+       if test -n "$i" ; then
+         tmp_libs="$tmp_libs $i"
+       fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+       func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+       func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+       func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+       func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+       func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+       func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+       func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+       func_stripname 'lib' '.la' "$outputname"
+       name=$func_stripname_result
+       eval shared_ext=\"$shrext_cmds\"
+       eval libname=\"$libname_spec\"
+       ;;
+      *)
+       test "$module" = no && \
+         func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+       if test "$need_lib_prefix" != no; then
+         # Add the "lib" prefix for modules if required
+         func_stripname '' '.la' "$outputname"
+         name=$func_stripname_result
+         eval shared_ext=\"$shrext_cmds\"
+         eval libname=\"$libname_spec\"
+       else
+         func_stripname '' '.la' "$outputname"
+         libname=$func_stripname_result
+       fi
+       ;;
+      esac
+
+      if test -n "$objs"; then
+       if test "$deplibs_check_method" != pass_all; then
+         func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+       else
+         $ECHO
+         $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+         $ECHO "*** objects $objs is not portable!"
+         libobjs="$libobjs $objs"
+       fi
+      fi
+
+      test "$dlself" != no && \
+       func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+       func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+       if test "$build_libtool_libs" = yes; then
+         # Building a libtool convenience library.
+         # Some compilers have problems with a `.al' extension so
+         # convenience libraries should have the same extension an
+         # archive normally would.
+         oldlibs="$output_objdir/$libname.$libext $oldlibs"
+         build_libtool_libs=convenience
+         build_old_libs=yes
+       fi
+
+       test -n "$vinfo" && \
+         func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+       test -n "$release" && \
+         func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+       # Parse the version information argument.
+       save_ifs="$IFS"; IFS=':'
+       set dummy $vinfo 0 0 0
+       shift
+       IFS="$save_ifs"
+
+       test -n "$7" && \
+         func_fatal_help "too many parameters to \`-version-info'"
+
+       # convert absolute version numbers to libtool ages
+       # this retains compatibility with .la files and attempts
+       # to make the code below a bit more comprehensible
+
+       case $vinfo_number in
+       yes)
+         number_major="$1"
+         number_minor="$2"
+         number_revision="$3"
+         #
+         # There are really only two kinds -- those that
+         # use the current revision as the major version
+         # and those that subtract age and use age as
+         # a minor version.  But, then there is irix
+         # which has an extra 1 added just for fun
+         #
+         case $version_type in
+         darwin|linux|osf|windows|none)
+           func_arith $number_major + $number_minor
+           current=$func_arith_result
+           age="$number_minor"
+           revision="$number_revision"
+           ;;
+         freebsd-aout|freebsd-elf|sunos)
+           current="$number_major"
+           revision="$number_minor"
+           age="0"
+           ;;
+         irix|nonstopux)
+           func_arith $number_major + $number_minor
+           current=$func_arith_result
+           age="$number_minor"
+           revision="$number_minor"
+           lt_irix_increment=no
+           ;;
+         esac
+         ;;
+       no)
+         current="$1"
+         revision="$2"
+         age="$3"
+         ;;
+       esac
+
+       # Check that each of the things are valid numbers.
+       case $current in
+       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+       *)
+         func_error "CURRENT \`$current' must be a nonnegative integer"
+         func_fatal_error "\`$vinfo' is not valid version information"
+         ;;
+       esac
+
+       case $revision in
+       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+       *)
+         func_error "REVISION \`$revision' must be a nonnegative integer"
+         func_fatal_error "\`$vinfo' is not valid version information"
+         ;;
+       esac
+
+       case $age in
+       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+       *)
+         func_error "AGE \`$age' must be a nonnegative integer"
+         func_fatal_error "\`$vinfo' is not valid version information"
+         ;;
+       esac
+
+       if test "$age" -gt "$current"; then
+         func_error "AGE \`$age' is greater than the current interface number \`$current'"
+         func_fatal_error "\`$vinfo' is not valid version information"
+       fi
+
+       # Calculate the version variables.
+       major=
+       versuffix=
+       verstring=
+       case $version_type in
+       none) ;;
+
+       darwin)
+         # Like Linux, but with the current version available in
+         # verstring for coding it into the library header
+         func_arith $current - $age
+         major=.$func_arith_result
+         versuffix="$major.$age.$revision"
+         # Darwin ld doesn't like 0 for these options...
+         func_arith $current + 1
+         minor_current=$func_arith_result
+         xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+         verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+         ;;
+
+       freebsd-aout)
+         major=".$current"
+         versuffix=".$current.$revision";
+         ;;
+
+       freebsd-elf)
+         major=".$current"
+         versuffix=".$current"
+         ;;
+
+       irix | nonstopux)
+         if test "X$lt_irix_increment" = "Xno"; then
+           func_arith $current - $age
+         else
+           func_arith $current - $age + 1
+         fi
+         major=$func_arith_result
+
+         case $version_type in
+           nonstopux) verstring_prefix=nonstopux ;;
+           *)         verstring_prefix=sgi ;;
+         esac
+         verstring="$verstring_prefix$major.$revision"
+
+         # Add in all the interfaces that we are compatible with.
+         loop=$revision
+         while test "$loop" -ne 0; do
+           func_arith $revision - $loop
+           iface=$func_arith_result
+           func_arith $loop - 1
+           loop=$func_arith_result
+           verstring="$verstring_prefix$major.$iface:$verstring"
+         done
+
+         # Before this point, $major must not contain `.'.
+         major=.$major
+         versuffix="$major.$revision"
+         ;;
+
+       linux)
+         func_arith $current - $age
+         major=.$func_arith_result
+         versuffix="$major.$age.$revision"
+         ;;
+
+       osf)
+         func_arith $current - $age
+         major=.$func_arith_result
+         versuffix=".$current.$age.$revision"
+         verstring="$current.$age.$revision"
+
+         # Add in all the interfaces that we are compatible with.
+         loop=$age
+         while test "$loop" -ne 0; do
+           func_arith $current - $loop
+           iface=$func_arith_result
+           func_arith $loop - 1
+           loop=$func_arith_result
+           verstring="$verstring:${iface}.0"
+         done
+
+         # Make executables depend on our current version.
+         verstring="$verstring:${current}.0"
+         ;;
+
+       qnx)
+         major=".$current"
+         versuffix=".$current"
+         ;;
+
+       sunos)
+         major=".$current"
+         versuffix=".$current.$revision"
+         ;;
+
+       windows)
+         # Use '-' rather than '.', since we only want one
+         # extension on DOS 8.3 filesystems.
+         func_arith $current - $age
+         major=$func_arith_result
+         versuffix="-$major"
+         ;;
+
+       *)
+         func_fatal_configuration "unknown library version type \`$version_type'"
+         ;;
+       esac
+
+       # Clear the version info if we defaulted, and they specified a release.
+       if test -z "$vinfo" && test -n "$release"; then
+         major=
+         case $version_type in
+         darwin)
+           # we can't check for "0.0" in archive_cmds due to quoting
+           # problems, so we reset it completely
+           verstring=
+           ;;
+         *)
+           verstring="0.0"
+           ;;
+         esac
+         if test "$need_version" = no; then
+           versuffix=
+         else
+           versuffix=".0.0"
+         fi
+       fi
+
+       # Remove version info from name if versioning should be avoided
+       if test "$avoid_version" = yes && test "$need_version" = no; then
+         major=
+         versuffix=
+         verstring=""
+       fi
+
+       # Check to see if the archive will have undefined symbols.
+       if test "$allow_undefined" = yes; then
+         if test "$allow_undefined_flag" = unsupported; then
+           func_warning "undefined symbols not allowed in $host shared libraries"
+           build_libtool_libs=no
+           build_old_libs=yes
+         fi
+       else
+         # Don't allow undefined symbols.
+         allow_undefined_flag="$no_undefined_flag"
+       fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      libobjs="$libobjs $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$mode" != relink; then
+       # Remove our outputs, but don't remove object files since they
+       # may have been created when compiling PIC objects.
+       removelist=
+       tempremovelist=`$ECHO "$output_objdir/*"`
+       for p in $tempremovelist; do
+         case $p in
+           *.$objext | *.gcno)
+              ;;
+           $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+              if test "X$precious_files_regex" != "X"; then
+                if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+                then
+                  continue
+                fi
+              fi
+              removelist="$removelist $p"
+              ;;
+           *) ;;
+         esac
+       done
+       test -n "$removelist" && \
+         func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+       oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+       # Transform .lo files to .o files.
+       oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #        lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+      #        deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+      #        dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+       # If the user specified any rpath flags, then add them.
+       temp_xrpath=
+       for libdir in $xrpath; do
+         temp_xrpath="$temp_xrpath -R$libdir"
+         case "$finalize_rpath " in
+         *" $libdir "*) ;;
+         *) finalize_rpath="$finalize_rpath $libdir" ;;
+         esac
+       done
+       if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+         dependency_libs="$temp_xrpath $dependency_libs"
+       fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+       case " $dlprefiles $dlfiles " in
+       *" $lib "*) ;;
+       *) dlfiles="$dlfiles $lib" ;;
+       esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+       case "$dlprefiles " in
+       *" $lib "*) ;;
+       *) dlprefiles="$dlprefiles $lib" ;;
+       esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+       if test -n "$rpath"; then
+         case $host in
+         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+           # these systems don't actually have a c library (as such)!
+           ;;
+         *-*-rhapsody* | *-*-darwin1.[012])
+           # Rhapsody C library is in the System framework
+           deplibs="$deplibs System.ltframework"
+           ;;
+         *-*-netbsd*)
+           # Don't link with libc until the a.out ld.so is fixed.
+           ;;
+         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+           # Do not include libc due to us having libc/libc_r.
+           ;;
+         *-*-sco3.2v5* | *-*-sco5v6*)
+           # Causes problems with __ctype
+           ;;
+         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+           # Compiler inserts libc in the correct place for threads to work
+           ;;
+         *)
+           # Add libc to deplibs on all other systems if necessary.
+           if test "$build_libtool_need_lc" = "yes"; then
+             deplibs="$deplibs -lc"
+           fi
+           ;;
+         esac
+       fi
+
+       # Transform deplibs into only deplibs that can be linked in shared.
+       name_save=$name
+       libname_save=$libname
+       release_save=$release
+       versuffix_save=$versuffix
+       major_save=$major
+       # I'm not sure if I'm treating the release correctly.  I think
+       # release should show up in the -l (ie -lgmp5) so we don't want to
+       # add it in twice.  Is that correct?
+       release=""
+       versuffix=""
+       major=""
+       newdeplibs=
+       droppeddeps=no
+       case $deplibs_check_method in
+       pass_all)
+         # Don't check for shared/static.  Everything works.
+         # This might be a little naive.  We might want to check
+         # whether the library exists or not.  But this is on
+         # osf3 & osf4 and I'm not really sure... Just
+         # implementing what was already the behavior.
+         newdeplibs=$deplibs
+         ;;
+       test_compile)
+         # This code stresses the "libraries are programs" paradigm to its
+         # limits. Maybe even breaks it.  We compile a program, linking it
+         # against the deplibs as a proxy for the library.  Then we can check
+         # whether they linked in statically or dynamically with ldd.
+         $opt_dry_run || $RM conftest.c
+         cat > conftest.c <<EOF
+         int main() { return 0; }
+EOF
+         $opt_dry_run || $RM conftest
+         if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+           ldd_output=`ldd conftest`
+           for i in $deplibs; do
+             case $i in
+             -l*)
+               func_stripname -l '' "$i"
+               name=$func_stripname_result
+               if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                 case " $predeps $postdeps " in
+                 *" $i "*)
+                   newdeplibs="$newdeplibs $i"
+                   i=""
+                   ;;
+                 esac
+               fi
+               if test -n "$i" ; then
+                 libname=`eval "\\$ECHO \"$libname_spec\""`
+                 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+                 set dummy $deplib_matches; shift
+                 deplib_match=$1
+                 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+                   newdeplibs="$newdeplibs $i"
+                 else
+                   droppeddeps=yes
+                   $ECHO
+                   $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+                   $ECHO "*** I have the capability to make that library automatically link in when"
+                   $ECHO "*** you link to this library.  But I can only do this if you have a"
+                   $ECHO "*** shared version of the library, which I believe you do not have"
+                   $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+                   $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+                 fi
+               fi
+               ;;
+             *)
+               newdeplibs="$newdeplibs $i"
+               ;;
+             esac
+           done
+         else
+           # Error occurred in the first compile.  Let's try to salvage
+           # the situation: Compile a separate program for each library.
+           for i in $deplibs; do
+             case $i in
+             -l*)
+               func_stripname -l '' "$i"
+               name=$func_stripname_result
+               $opt_dry_run || $RM conftest
+               if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+                 ldd_output=`ldd conftest`
+                 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+                   case " $predeps $postdeps " in
+                   *" $i "*)
+                     newdeplibs="$newdeplibs $i"
+                     i=""
+                     ;;
+                   esac
+                 fi
+                 if test -n "$i" ; then
+                   libname=`eval "\\$ECHO \"$libname_spec\""`
+                   deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+                   set dummy $deplib_matches; shift
+                   deplib_match=$1
+                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+                     newdeplibs="$newdeplibs $i"
+                   else
+                     droppeddeps=yes
+                     $ECHO
+                     $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+                     $ECHO "*** I have the capability to make that library automatically link in when"
+                     $ECHO "*** you link to this library.  But I can only do this if you have a"
+                     $ECHO "*** shared version of the library, which you do not appear to have"
+                     $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+                     $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+                   fi
+                 fi
+               else
+                 droppeddeps=yes
+                 $ECHO
+                 $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+                 $ECHO "*** make it link in!  You will probably need to install it or some"
+                 $ECHO "*** library that it depends on before this library will be fully"
+                 $ECHO "*** functional.  Installing it before continuing would be even better."
+               fi
+               ;;
+             *)
+               newdeplibs="$newdeplibs $i"
+               ;;
+             esac
+           done
+         fi
+         ;;
+       file_magic*)
+         set dummy $deplibs_check_method; shift
+         file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+         for a_deplib in $deplibs; do
+           case $a_deplib in
+           -l*)
+             func_stripname -l '' "$a_deplib"
+             name=$func_stripname_result
+             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+               case " $predeps $postdeps " in
+               *" $a_deplib "*)
+                 newdeplibs="$newdeplibs $a_deplib"
+                 a_deplib=""
+                 ;;
+               esac
+             fi
+             if test -n "$a_deplib" ; then
+               libname=`eval "\\$ECHO \"$libname_spec\""`
+               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                 for potent_lib in $potential_libs; do
+                     # Follow soft links.
+                     if ls -lLd "$potent_lib" 2>/dev/null |
+                        $GREP " -> " >/dev/null; then
+                       continue
+                     fi
+                     # The statement above tries to avoid entering an
+                     # endless loop below, in case of cyclic links.
+                     # We might still enter an endless loop, since a link
+                     # loop can be closed while we follow links,
+                     # but so what?
+                     potlib="$potent_lib"
+                     while test -h "$potlib" 2>/dev/null; do
+                       potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+                       case $potliblink in
+                       [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+                       *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+                       esac
+                     done
+                     if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+                        $SED -e 10q |
+                        $EGREP "$file_magic_regex" > /dev/null; then
+                       newdeplibs="$newdeplibs $a_deplib"
+                       a_deplib=""
+                       break 2
+                     fi
+                 done
+               done
+             fi
+             if test -n "$a_deplib" ; then
+               droppeddeps=yes
+               $ECHO
+               $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+               $ECHO "*** I have the capability to make that library automatically link in when"
+               $ECHO "*** you link to this library.  But I can only do this if you have a"
+               $ECHO "*** shared version of the library, which you do not appear to have"
+               $ECHO "*** because I did check the linker path looking for a file starting"
+               if test -z "$potlib" ; then
+                 $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+               else
+                 $ECHO "*** with $libname and none of the candidates passed a file format test"
+                 $ECHO "*** using a file magic. Last file checked: $potlib"
+               fi
+             fi
+             ;;
+           *)
+             # Add a -L argument.
+             newdeplibs="$newdeplibs $a_deplib"
+             ;;
+           esac
+         done # Gone through all deplibs.
+         ;;
+       match_pattern*)
+         set dummy $deplibs_check_method; shift
+         match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+         for a_deplib in $deplibs; do
+           case $a_deplib in
+           -l*)
+             func_stripname -l '' "$a_deplib"
+             name=$func_stripname_result
+             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+               case " $predeps $postdeps " in
+               *" $a_deplib "*)
+                 newdeplibs="$newdeplibs $a_deplib"
+                 a_deplib=""
+                 ;;
+               esac
+             fi
+             if test -n "$a_deplib" ; then
+               libname=`eval "\\$ECHO \"$libname_spec\""`
+               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                 for potent_lib in $potential_libs; do
+                   potlib="$potent_lib" # see symlink-check above in file_magic test
+                   if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+                      $EGREP "$match_pattern_regex" > /dev/null; then
+                     newdeplibs="$newdeplibs $a_deplib"
+                     a_deplib=""
+                     break 2
+                   fi
+                 done
+               done
+             fi
+             if test -n "$a_deplib" ; then
+               droppeddeps=yes
+               $ECHO
+               $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+               $ECHO "*** I have the capability to make that library automatically link in when"
+               $ECHO "*** you link to this library.  But I can only do this if you have a"
+               $ECHO "*** shared version of the library, which you do not appear to have"
+               $ECHO "*** because I did check the linker path looking for a file starting"
+               if test -z "$potlib" ; then
+                 $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+               else
+                 $ECHO "*** with $libname and none of the candidates passed a file format test"
+                 $ECHO "*** using a regex pattern. Last file checked: $potlib"
+               fi
+             fi
+             ;;
+           *)
+             # Add a -L argument.
+             newdeplibs="$newdeplibs $a_deplib"
+             ;;
+           esac
+         done # Gone through all deplibs.
+         ;;
+       none | unknown | *)
+         newdeplibs=""
+         tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+             -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+         if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+           for i in $predeps $postdeps ; do
+             # can't use Xsed below, because $i might contain '/'
+             tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+           done
+         fi
+         if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[      ]//g' |
+            $GREP . >/dev/null; then
+           $ECHO
+           if test "X$deplibs_check_method" = "Xnone"; then
+             $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+           else
+             $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+           fi
+           $ECHO "*** All declared inter-library dependencies are being dropped."
+           droppeddeps=yes
+         fi
+         ;;
+       esac
+       versuffix=$versuffix_save
+       major=$major_save
+       release=$release_save
+       libname=$libname_save
+       name=$name_save
+
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+         # On Rhapsody replace the C library with the System framework
+         newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+         ;;
+       esac
+
+       if test "$droppeddeps" = yes; then
+         if test "$module" = yes; then
+           $ECHO
+           $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+           $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+           $ECHO "*** a static module, that should work as long as the dlopening"
+           $ECHO "*** application is linked with the -dlopen flag."
+           if test -z "$global_symbol_pipe"; then
+             $ECHO
+             $ECHO "*** However, this would only work if libtool was able to extract symbol"
+             $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+             $ECHO "*** not find such a program.  So, this module is probably useless."
+             $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+           fi
+           if test "$build_old_libs" = no; then
+             oldlibs="$output_objdir/$libname.$libext"
+             build_libtool_libs=module
+             build_old_libs=yes
+           else
+             build_libtool_libs=no
+           fi
+         else
+           $ECHO "*** The inter-library dependencies that have been dropped here will be"
+           $ECHO "*** automatically added whenever a program is linked with this library"
+           $ECHO "*** or is declared to -dlopen it."
+
+           if test "$allow_undefined" = no; then
+             $ECHO
+             $ECHO "*** Since this library must not contain undefined symbols,"
+             $ECHO "*** because either the platform does not support them or"
+             $ECHO "*** it was explicitly requested with -no-undefined,"
+             $ECHO "*** libtool will only create a static version of it."
+             if test "$build_old_libs" = no; then
+               oldlibs="$output_objdir/$libname.$libext"
+               build_libtool_libs=module
+               build_old_libs=yes
+             else
+               build_libtool_libs=no
+             fi
+           fi
+         fi
+       fi
+       # Done checking deplibs!
+       deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+       *-*-darwin*)
+         newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+         new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+         deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+         ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+       case " $new_libs " in
+       *" -L$path/$objdir "*) ;;
+       *)
+         case " $deplibs " in
+         *" -L$path/$objdir "*)
+           new_libs="$new_libs -L$path/$objdir" ;;
+         esac
+         ;;
+       esac
+      done
+      for deplib in $deplibs; do
+       case $deplib in
+       -L*)
+         case " $new_libs " in
+         *" $deplib "*) ;;
+         *) new_libs="$new_libs $deplib" ;;
+         esac
+         ;;
+       *) new_libs="$new_libs $deplib" ;;
+       esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+       if test "$hardcode_into_libs" = yes; then
+         # Hardcode the library paths
+         hardcode_libdirs=
+         dep_rpath=
+         rpath="$finalize_rpath"
+         test "$mode" != relink && rpath="$compile_rpath$rpath"
+         for libdir in $rpath; do
+           if test -n "$hardcode_libdir_flag_spec"; then
+             if test -n "$hardcode_libdir_separator"; then
+               if test -z "$hardcode_libdirs"; then
+                 hardcode_libdirs="$libdir"
+               else
+                 # Just accumulate the unique libdirs.
+                 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+                 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+                   ;;
+                 *)
+                   hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+                   ;;
+                 esac
+               fi
+             else
+               eval flag=\"$hardcode_libdir_flag_spec\"
+               dep_rpath="$dep_rpath $flag"
+             fi
+           elif test -n "$runpath_var"; then
+             case "$perm_rpath " in
+             *" $libdir "*) ;;
+             *) perm_rpath="$perm_rpath $libdir" ;;
+             esac
+           fi
+         done
+         # Substitute the hardcoded libdirs into the rpath.
+         if test -n "$hardcode_libdir_separator" &&
+            test -n "$hardcode_libdirs"; then
+           libdir="$hardcode_libdirs"
+           if test -n "$hardcode_libdir_flag_spec_ld"; then
+             eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+           else
+             eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+           fi
+         fi
+         if test -n "$runpath_var" && test -n "$perm_rpath"; then
+           # We should set the runpath_var.
+           rpath=
+           for dir in $perm_rpath; do
+             rpath="$rpath$dir:"
+           done
+           eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+         fi
+         test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+       fi
 
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
+       shlibpath="$finalize_shlibpath"
+       test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+       if test -n "$shlibpath"; then
+         eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+       fi
 
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
+       # Get the real and link names of the library.
+       eval shared_ext=\"$shrext_cmds\"
+       eval library_names=\"$library_names_spec\"
+       set dummy $library_names
+       shift
+       realname="$1"
+       shift
 
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
+       if test -n "$soname_spec"; then
+         eval soname=\"$soname_spec\"
+       else
+         soname="$realname"
+       fi
+       if test -z "$dlname"; then
+         dlname=$soname
+       fi
 
-       if test "$fast_install" = yes; then
-         $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
+       lib="$output_objdir/$realname"
+       linknames=
+       for link
+       do
+         linknames="$linknames $link"
+       done
 
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+       # Use standard objects if they are pic
+       test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+       test "X$libobjs" = "X " && libobjs=
 
-    file=\"\$\$-\$program\"
+       delfiles=
+       if test -n "$export_symbols" && test -n "$include_expsyms"; then
+         $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+         export_symbols="$output_objdir/$libname.uexp"
+         delfiles="$delfiles $export_symbols"
+       fi
 
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
+       orig_export_symbols=
+       case $host_os in
+       cygwin* | mingw* | cegcc*)
+         if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+           # exporting using user supplied symfile
+           if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+             # and it's NOT already a .def file. Must figure out
+             # which of the given symbols are data symbols and tag
+             # them as such. So, trigger use of export_symbols_cmds.
+             # export_symbols gets reassigned inside the "prepare
+             # the list of exported symbols" if statement, so the
+             # include_expsyms logic still works.
+             orig_export_symbols="$export_symbols"
+             export_symbols=
+             always_export_symbols=yes
+           fi
+         fi
+         ;;
+       esac
 
-         $echo >> $output "\
+       # Prepare the list of exported symbols
+       if test -z "$export_symbols"; then
+         if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+           func_verbose "generating symbol list for \`$libname.la'"
+           export_symbols="$output_objdir/$libname.exp"
+           $opt_dry_run || $RM $export_symbols
+           cmds=$export_symbols_cmds
+           save_ifs="$IFS"; IFS='~'
+           for cmd in $cmds; do
+             IFS="$save_ifs"
+             eval cmd=\"$cmd\"
+             func_len " $cmd"
+             len=$func_len_result
+             if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+               func_show_eval "$cmd" 'exit $?'
+               skipped_export=false
+             else
+               # The command line is too long to execute in one step.
+               func_verbose "using reloadable object file for export list..."
+               skipped_export=:
+               # Break out early, otherwise skipped_export may be
+               # set to false by a later but shorter cmd.
+               break
+             fi
+           done
+           IFS="$save_ifs"
+           if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+             func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+             func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+           fi
+         fi
+       fi
 
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-       $echo \"\$relink_command_output\" >&2
-       $rm \"\$progdir/\$file\"
-       exit $EXIT_FAILURE
-      fi
-    fi
+       if test -n "$export_symbols" && test -n "$include_expsyms"; then
+         tmp_export_symbols="$export_symbols"
+         test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+         $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+       fi
 
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-       else
-         $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
+       if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+         # The given exports_symbols file has to be filtered, so filter it.
+         func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+         # FIXME: $output_objdir/$libname.filter potentially contains lots of
+         # 's' commands which not all seds can handle. GNU sed should be fine
+         # though. Also, the filter scales superlinearly with the number of
+         # global variables. join(1) would be nice here, but unfortunately
+         # isn't a blessed tool.
+         $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+         delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+         export_symbols=$output_objdir/$libname.def
+         $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
        fi
 
-       $echo >> $output "\
+       tmp_deplibs=
+       for test_deplib in $deplibs; do
+         case " $convenience " in
+         *" $test_deplib "*) ;;
+         *)
+           tmp_deplibs="$tmp_deplibs $test_deplib"
+           ;;
+         esac
+       done
+       deplibs="$tmp_deplibs"
 
-  if test -f \"\$progdir/\$program\"; then"
+       if test -n "$convenience"; then
+         if test -n "$whole_archive_flag_spec" &&
+           test "$compiler_needs_object" = yes &&
+           test -z "$libobjs"; then
+           # extract the archives, so we have objects to list.
+           # TODO: could optimize this to just extract one archive.
+           whole_archive_flag_spec=
+         fi
+         if test -n "$whole_archive_flag_spec"; then
+           save_libobjs=$libobjs
+           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+           test "X$libobjs" = "X " && libobjs=
+         else
+           gentop="$output_objdir/${outputname}x"
+           generated="$generated $gentop"
 
-       # Export our shlibpath_var if we have one.
-       if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-         $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+           func_extract_archives $gentop $convenience
+           libobjs="$libobjs $func_extract_archives_result"
+           test "X$libobjs" = "X " && libobjs=
+         fi
+       fi
 
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+       if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+         eval flag=\"$thread_safe_flag_spec\"
+         linker_flags="$linker_flags $flag"
+       fi
 
-    export $shlibpath_var
-"
+       # Make a backup of the uninstalled library when relinking
+       if test "$mode" = relink; then
+         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
        fi
 
-       # fixup the dll searchpath if we need to.
-       if test -n "$dllsearchpath"; then
-         $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
+       # Do each of the archive commands.
+       if test "$module" = yes && test -n "$module_cmds" ; then
+         if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+           eval test_cmds=\"$module_expsym_cmds\"
+           cmds=$module_expsym_cmds
+         else
+           eval test_cmds=\"$module_cmds\"
+           cmds=$module_cmds
+         fi
+       else
+         if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+           eval test_cmds=\"$archive_expsym_cmds\"
+           cmds=$archive_expsym_cmds
+         else
+           eval test_cmds=\"$archive_cmds\"
+           cmds=$archive_cmds
+         fi
        fi
 
-       $echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-       case $host in
-       # Backslashes separate directories on plain windows
-       *-*-mingw | *-*-os2*)
-         $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-         ;;
+       if test "X$skipped_export" != "X:" &&
+          func_len " $test_cmds" &&
+          len=$func_len_result &&
+          test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+         :
+       else
+         # The command line is too long to link in one step, link piecewise
+         # or, if using GNU ld and skipped_export is not :, use a linker
+         # script.
 
-       *)
-         $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-         ;;
-       esac
-       $echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-       chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
+         # Save the value of $output and $libobjs because we want to
+         # use them later.  If we have whole_archive_flag_spec, we
+         # want to use save_libobjs as it was before
+         # whole_archive_flag_spec was expanded, because we can't
+         # assume the linker understands whole_archive_flag_spec.
+         # This may have to be revisited, in case too many
+         # convenience libraries get linked in and end up exceeding
+         # the spec.
+         if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+           save_libobjs=$libobjs
+         fi
+         save_output=$output
+         output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
 
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
+         # Clear the reloadable object creation command queue and
+         # initialize k to one.
+         test_cmds=
+         concat_cmds=
+         objlist=
+         last_robj=
+         k=1
 
-      if test "$build_libtool_libs" = convenience; then
-       oldobjs="$libobjs_save"
-       addlibs="$convenience"
-       build_libtool_libs=no
-      else
-       if test "$build_libtool_libs" = module; then
-         oldobjs="$libobjs_save"
-         build_libtool_libs=no
-       else
-         oldobjs="$old_deplibs $non_pic_objects"
-       fi
-       addlibs="$old_convenience"
-      fi
+         if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+           output=${output_objdir}/${output_la}.lnkscript
+           func_verbose "creating GNU ld script: $output"
+           $ECHO 'INPUT (' > $output
+           for obj in $save_libobjs
+           do
+             $ECHO "$obj" >> $output
+           done
+           $ECHO ')' >> $output
+           delfiles="$delfiles $output"
+         elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+           output=${output_objdir}/${output_la}.lnk
+           func_verbose "creating linker input file list: $output"
+           : > $output
+           set x $save_libobjs
+           shift
+           firstobj=
+           if test "$compiler_needs_object" = yes; then
+             firstobj="$1 "
+             shift
+           fi
+           for obj
+           do
+             $ECHO "$obj" >> $output
+           done
+           delfiles="$delfiles $output"
+           output=$firstobj\"$file_list_spec$output\"
+         else
+           if test -n "$save_libobjs"; then
+             func_verbose "creating reloadable object files..."
+             output=$output_objdir/$output_la-${k}.$objext
+             eval test_cmds=\"$reload_cmds\"
+             func_len " $test_cmds"
+             len0=$func_len_result
+             len=$len0
+
+             # Loop over the list of objects to be linked.
+             for obj in $save_libobjs
+             do
+               func_len " $obj"
+               func_arith $len + $func_len_result
+               len=$func_arith_result
+               if test "X$objlist" = X ||
+                  test "$len" -lt "$max_cmd_len"; then
+                 func_append objlist " $obj"
+               else
+                 # The command $test_cmds is almost too long, add a
+                 # command to the queue.
+                 if test "$k" -eq 1 ; then
+                   # The first file doesn't have a previous command to add.
+                   eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+                 else
+                   # All subsequent reloadable object files will link in
+                   # the last one created.
+                   eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+                 fi
+                 last_robj=$output_objdir/$output_la-${k}.$objext
+                 func_arith $k + 1
+                 k=$func_arith_result
+                 output=$output_objdir/$output_la-${k}.$objext
+                 objlist=$obj
+                 func_len " $last_robj"
+                 func_arith $len0 + $func_len_result
+                 len=$func_arith_result
+               fi
+             done
+             # Handle the remaining objects by creating one last
+             # reloadable object file.  All subsequent reloadable object
+             # files will link in the last one created.
+             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+             eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+             if test -n "$last_robj"; then
+               eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+             fi
+             delfiles="$delfiles $output"
 
-      if test -n "$addlibs"; then
-       gentop="$output_objdir/${outputname}x"
-       generated="$generated $gentop"
+           else
+             output=
+           fi
 
-       func_extract_archives $gentop $addlibs
-       oldobjs="$oldobjs $func_extract_archives_result"
-      fi
+           if ${skipped_export-false}; then
+             func_verbose "generating symbol list for \`$libname.la'"
+             export_symbols="$output_objdir/$libname.exp"
+             $opt_dry_run || $RM $export_symbols
+             libobjs=$output
+             # Append the command to create the export file.
+             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+             eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+             if test -n "$last_robj"; then
+               eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+             fi
+           fi
 
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-       # POSIX demands no paths to be encoded in archives.  We have
-       # to avoid creating archives with duplicate basenames if we
-       # might have to extract them afterwards, e.g., when creating a
-       # static archive out of a convenience library, or when linking
-       # the entirety of a libtool archive into another (currently
-       # not supported by libtool).
-       if (for obj in $oldobjs
-           do
-             $echo "X$obj" | $Xsed -e 's%^.*/%%'
-           done | sort | sort -uc >/dev/null 2>&1); then
-         :
-       else
-         $echo "copying selected object files to avoid basename conflicts..."
+           test -n "$save_libobjs" &&
+             func_verbose "creating a temporary reloadable object file: $output"
 
-         if test -z "$gentop"; then
-           gentop="$output_objdir/${outputname}x"
-           generated="$generated $gentop"
+           # Loop through the commands generated above and execute them.
+           save_ifs="$IFS"; IFS='~'
+           for cmd in $concat_cmds; do
+             IFS="$save_ifs"
+             $opt_silent || {
+                 func_quote_for_expand "$cmd"
+                 eval "func_echo $func_quote_for_expand_result"
+             }
+             $opt_dry_run || eval "$cmd" || {
+               lt_exit=$?
+
+               # Restore the uninstalled library and exit
+               if test "$mode" = relink; then
+                 ( cd "$output_objdir" && \
+                   $RM "${realname}T" && \
+                   $MV "${realname}U" "$realname" )
+               fi
 
-           $show "${rm}r $gentop"
-           $run ${rm}r "$gentop"
-           $show "$mkdir $gentop"
-           $run $mkdir "$gentop"
-           exit_status=$?
-           if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-             exit $exit_status
+               exit $lt_exit
+             }
+           done
+           IFS="$save_ifs"
+
+           if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+             func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+             func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
            fi
          fi
 
-         save_oldobjs=$oldobjs
-         oldobjs=
-         counter=1
-         for obj in $save_oldobjs
-         do
-           objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-           case " $oldobjs " in
-           " ") oldobjs=$obj ;;
-           *[\ /]"$objbase "*)
-             while :; do
-               # Make sure we don't pick an alternate name that also
-               # overlaps.
-               newobj=lt$counter-$objbase
-               counter=`expr $counter + 1`
-               case " $oldobjs " in
-               *[\ /]"$newobj "*) ;;
-               *) if test ! -f "$gentop/$newobj"; then break; fi ;;
-               esac
-             done
-             $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-             $run ln "$obj" "$gentop/$newobj" ||
-             $run cp "$obj" "$gentop/$newobj"
-             oldobjs="$oldobjs $gentop/$newobj"
-             ;;
-           *) oldobjs="$oldobjs $obj" ;;
-           esac
-         done
-       fi
+          if ${skipped_export-false}; then
+           if test -n "$export_symbols" && test -n "$include_expsyms"; then
+             tmp_export_symbols="$export_symbols"
+             test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+             $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+           fi
 
-       eval cmds=\"$old_archive_cmds\"
+           if test -n "$orig_export_symbols"; then
+             # The given exports_symbols file has to be filtered, so filter it.
+             func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+             # FIXME: $output_objdir/$libname.filter potentially contains lots of
+             # 's' commands which not all seds can handle. GNU sed should be fine
+             # though. Also, the filter scales superlinearly with the number of
+             # global variables. join(1) would be nice here, but unfortunately
+             # isn't a blessed tool.
+             $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+             delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+             export_symbols=$output_objdir/$libname.def
+             $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+           fi
+         fi
 
-       if len=`expr "X$cmds" : ".*"` &&
-            test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-         cmds=$old_archive_cmds
-       else
-         # the command line is too long to link in one step, link in parts
-         $echo "using piecewise archive linking..."
-         save_RANLIB=$RANLIB
-         RANLIB=:
-         objlist=
-         concat_cmds=
-         save_oldobjs=$oldobjs
+         libobjs=$output
+         # Restore the value of output.
+         output=$save_output
 
-         # Is there a better way of finding the last object in the list?
-         for obj in $save_oldobjs
-         do
-           last_oldobj=$obj
-         done
-         for obj in $save_oldobjs
-         do
-           oldobjs="$objlist $obj"
-           objlist="$objlist $obj"
-           eval test_cmds=\"$old_archive_cmds\"
-           if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-              test "$len" -le "$max_cmd_len"; then
-             :
+         if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+           test "X$libobjs" = "X " && libobjs=
+         fi
+         # Expand the library linking commands again to reset the
+         # value of $libobjs for piecewise linking.
+
+         # Do each of the archive commands.
+         if test "$module" = yes && test -n "$module_cmds" ; then
+           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+             cmds=$module_expsym_cmds
            else
-             # the above command should be used before it gets too long
-             oldobjs=$objlist
-             if test "$obj" = "$last_oldobj" ; then
-               RANLIB=$save_RANLIB
-             fi
-             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-             eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-             objlist=
+             cmds=$module_cmds
            fi
-         done
-         RANLIB=$save_RANLIB
-         oldobjs=$objlist
-         if test "X$oldobjs" = "X" ; then
-           eval cmds=\"\$concat_cmds\"
          else
-           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+           if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+             cmds=$archive_expsym_cmds
+           else
+             cmds=$archive_cmds
+           fi
          fi
        fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-       IFS="$save_ifs"
-       $show "$cmd"
-       $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
 
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
+       if test -n "$delfiles"; then
+         # Append the command to remove temporary files to $cmds.
+         eval cmds=\"\$cmds~\$RM $delfiles\"
+       fi
 
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
+       # Add any objects from preloaded convenience libraries
+       if test -n "$dlprefiles"; then
+         gentop="$output_objdir/${outputname}x"
+         generated="$generated $gentop"
 
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-       if eval test -z \"\${$var+set}\"; then
-         relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-       elif eval var_value=\$$var; test -z "$var_value"; then
-         relink_command="$var=; export $var; $relink_command"
-       else
-         var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-         relink_command="$var=\"$var_value\"; export $var; $relink_command"
+         func_extract_archives $gentop $dlprefiles
+         libobjs="$libobjs $func_extract_archives_result"
+         test "X$libobjs" = "X " && libobjs=
        fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-       relink_command=
-      fi
 
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+         IFS="$save_ifs"
+         eval cmd=\"$cmd\"
+         $opt_silent || {
+           func_quote_for_expand "$cmd"
+           eval "func_echo $func_quote_for_expand_result"
+         }
+         $opt_dry_run || eval "$cmd" || {
+           lt_exit=$?
 
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-       for installed in no yes; do
-         if test "$installed" = yes; then
-           if test -z "$install_libdir"; then
-             break
+           # Restore the uninstalled library and exit
+           if test "$mode" = relink; then
+             ( cd "$output_objdir" && \
+               $RM "${realname}T" && \
+               $MV "${realname}U" "$realname" )
+           fi
+
+           exit $lt_exit
+         }
+       done
+       IFS="$save_ifs"
+
+       # Restore the uninstalled library and exit
+       if test "$mode" = relink; then
+         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+         if test -n "$convenience"; then
+           if test -z "$whole_archive_flag_spec"; then
+             func_show_eval '${RM}r "$gentop"'
            fi
-           output="$output_objdir/$outputname"i
-           # Replace all uninstalled libtool libraries with the installed ones
-           newdependency_libs=
-           for deplib in $dependency_libs; do
-             case $deplib in
-             *.la)
-               name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-               if test -z "$libdir"; then
-                 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-                 exit $EXIT_FAILURE
-               fi
-               newdependency_libs="$newdependency_libs $libdir/$name"
-               ;;
-             *) newdependency_libs="$newdependency_libs $deplib" ;;
-             esac
-           done
-           dependency_libs="$newdependency_libs"
-           newdlfiles=
-           for lib in $dlfiles; do
-             name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-             eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-             if test -z "$libdir"; then
-               $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-               exit $EXIT_FAILURE
-             fi
-             newdlfiles="$newdlfiles $libdir/$name"
-           done
-           dlfiles="$newdlfiles"
-           newdlprefiles=
-           for lib in $dlprefiles; do
-             name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-             eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-             if test -z "$libdir"; then
-               $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-               exit $EXIT_FAILURE
-             fi
-             newdlprefiles="$newdlprefiles $libdir/$name"
-           done
-           dlprefiles="$newdlprefiles"
-         else
-           newdlfiles=
-           for lib in $dlfiles; do
-             case $lib in
-               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-               *) abs=`pwd`"/$lib" ;;
-             esac
-             newdlfiles="$newdlfiles $abs"
-           done
-           dlfiles="$newdlfiles"
-           newdlprefiles=
-           for lib in $dlprefiles; do
-             case $lib in
-               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-               *) abs=`pwd`"/$lib" ;;
-             esac
-             newdlprefiles="$newdlprefiles $abs"
-           done
-           dlprefiles="$newdlprefiles"
          fi
-         $rm $output
-         # place dlname in correct position for cygwin
-         tdlname=$dlname
-         case $host,$output,$installed,$module,$dlname in
-           *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-         esac
-         $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
 
-# The name that we can dlopen(3).
-dlname='$tdlname'
+         exit $EXIT_SUCCESS
+       fi
 
-# Names of this library.
-library_names='$library_names'
+       # Create links to the real library.
+       for linkname in $linknames; do
+         if test "$realname" != "$linkname"; then
+           func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+         fi
+       done
+
+       # If -module or -export-dynamic was specified, set the dlname.
+       if test "$module" = yes || test "$export_dynamic" = yes; then
+         # On all known operating systems, these are identical.
+         dlname="$soname"
+       fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+       func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+       func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+       func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+       func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+       func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+       func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+       test -n "$objs$old_deplibs" && \
+         func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+       libobj=$output
+       func_lo2o "$libobj"
+       obj=$func_lo2o_result
+       ;;
+      *)
+       libobj=
+       obj="$output"
+       ;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+       if test -n "$whole_archive_flag_spec"; then
+         eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+         reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+       else
+         gentop="$output_objdir/${obj}x"
+         generated="$generated $gentop"
+
+         func_extract_archives $gentop $convenience
+         reload_conv_objs="$reload_objs $func_extract_archives_result"
+       fi
+      fi
 
-# The name of the static archive.
-old_library='$old_library'
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
 
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+       if test -n "$gentop"; then
+         func_show_eval '${RM}r "$gentop"'
+       fi
 
-# Is this an already installed library?
-installed=$installed
+       exit $EXIT_SUCCESS
+      fi
 
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
+      if test "$build_libtool_libs" != yes; then
+       if test -n "$gentop"; then
+         func_show_eval '${RM}r "$gentop"'
+       fi
 
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
+       # Create an invalid libtool object if no PIC, so that we don't
+       # accidentally link it into a program.
+       # $show "echo timestamp > $libobj"
+       # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+       exit $EXIT_SUCCESS
+      fi
 
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-         if test "$installed" = no && test "$need_relink" = yes; then
-           $echo >> $output "\
-relink_command=\"$relink_command\""
-         fi
-       done
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+       # Only do commands if we really have different PIC objects.
+       reload_objs="$libobjs $reload_conv_objs"
+       output="$libobj"
+       func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
+      if test -n "$gentop"; then
+       func_show_eval '${RM}r "$gentop"'
+      fi
 
-  # libtool install mode
-  install)
-    modename="$modename: install"
+      exit $EXIT_SUCCESS
+      ;;
 
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       arg="\"$arg\""
-       ;;
+    prog)
+      case $host in
+       *cygwin*) func_stripname '' '.exe' "$output"
+                 output=$func_stripname_result.exe;;
       esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
+      test -n "$vinfo" && \
+       func_warning "\`-version-info' is ignored for programs"
 
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \      ]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
+      test -n "$release" && \
+       func_warning "\`-release' is ignored for programs"
 
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-       files="$files $dest"
-       dest=$arg
-       continue
-      fi
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+       && test "$dlopen_self" = unknown \
+       && test "$dlopen_self_static" = unknown && \
+         func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-       case " $install_prog " in
-       *[\\\ /]cp\ *) ;;
-       *) prev=$arg ;;
-       esac
-       ;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-       stripme=" -s"
-       continue
-       ;;
-      -*)
-       ;;
-      *)
-       # If the previous option needed an argument, then skip it.
-       if test -n "$prev"; then
-         prev=
-       else
-         dest=$arg
-         continue
-       fi
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+       # On Rhapsody replace the C library is the System framework
+       compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+       finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
        ;;
       esac
 
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-       arg="\"$arg\""
+      case $host in
+      *-*-darwin*)
+       # Don't allow lazy linking, it breaks C++ global constructors
+       # But is supposedly fixed on 10.4 or later (yay!).
+       if test "$tagname" = CXX ; then
+         case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+           10.[0123])
+             compile_command="$compile_command ${wl}-bind_at_load"
+             finalize_command="$finalize_command ${wl}-bind_at_load"
+           ;;
+         esac
+       fi
+       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+       compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+       finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
        ;;
       esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-       $echo "$modename: no file or destination specified" 1>&2
-      else
-       $echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
 
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
 
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-       $echo "$modename: \`$dest' is not a directory" 1>&2
-       $echo "$help" 1>&2
-       exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-       case $file in
-       *.lo) ;;
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+       case " $new_libs " in
+       *" -L$path/$objdir "*) ;;
        *)
-         $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
+         case " $compile_deplibs " in
+         *" -L$path/$objdir "*)
+           new_libs="$new_libs -L$path/$objdir" ;;
+         esac
          ;;
        esac
       done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
+      for deplib in $compile_deplibs; do
+       case $deplib in
+       -L*)
+         case " $new_libs " in
+         *" $deplib "*) ;;
+         *) new_libs="$new_libs $deplib" ;;
+         esac
+         ;;
+       *) new_libs="$new_libs $deplib" ;;
+       esac
+      done
+      compile_deplibs="$new_libs"
 
-      # Do each installation.
-      case $file in
-      *.$libext)
-       # Do the static libraries later.
-       staticlibs="$staticlibs $file"
-       ;;
 
-      *.la)
-       # Check to see that this really is a libtool archive.
-       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-       else
-         $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-       fi
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
 
-       library_names=
-       old_library=
-       relink_command=
-       # If there is no directory component, then add one.
-       case $file in
-       */* | *\\*) . $file ;;
-       *) . ./$file ;;
-       esac
+      if test -n "$rpath$xrpath"; then
+       # If the user specified any rpath flags, then add them.
+       for libdir in $rpath $xrpath; do
+         # This is the magic to use -rpath.
+         case "$finalize_rpath " in
+         *" $libdir "*) ;;
+         *) finalize_rpath="$finalize_rpath $libdir" ;;
+         esac
+       done
+      fi
 
-       # Add the libdir to current_libdirs if it is the destination.
-       if test "X$destdir" = "X$libdir"; then
-         case "$current_libdirs " in
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+       if test -n "$hardcode_libdir_flag_spec"; then
+         if test -n "$hardcode_libdir_separator"; then
+           if test -z "$hardcode_libdirs"; then
+             hardcode_libdirs="$libdir"
+           else
+             # Just accumulate the unique libdirs.
+             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+               ;;
+             *)
+               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+               ;;
+             esac
+           fi
+         else
+           eval flag=\"$hardcode_libdir_flag_spec\"
+           rpath="$rpath $flag"
+         fi
+       elif test -n "$runpath_var"; then
+         case "$perm_rpath " in
          *" $libdir "*) ;;
-         *) current_libdirs="$current_libdirs $libdir" ;;
+         *) perm_rpath="$perm_rpath $libdir" ;;
          esac
-       else
-         # Note the libdir as a future libdir.
-         case "$future_libdirs " in
+       fi
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+         testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+         case :$dllsearchpath: in
+         *":$libdir:"*) ;;
+         ::) dllsearchpath=$libdir;;
+         *) dllsearchpath="$dllsearchpath:$libdir";;
+         esac
+         case :$dllsearchpath: in
+         *":$testbindir:"*) ;;
+         ::) dllsearchpath=$testbindir;;
+         *) dllsearchpath="$dllsearchpath:$testbindir";;
+         esac
+         ;;
+       esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+        test -n "$hardcode_libdirs"; then
+       libdir="$hardcode_libdirs"
+       eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+       if test -n "$hardcode_libdir_flag_spec"; then
+         if test -n "$hardcode_libdir_separator"; then
+           if test -z "$hardcode_libdirs"; then
+             hardcode_libdirs="$libdir"
+           else
+             # Just accumulate the unique libdirs.
+             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+               ;;
+             *)
+               hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+               ;;
+             esac
+           fi
+         else
+           eval flag=\"$hardcode_libdir_flag_spec\"
+           rpath="$rpath $flag"
+         fi
+       elif test -n "$runpath_var"; then
+         case "$finalize_perm_rpath " in
          *" $libdir "*) ;;
-         *) future_libdirs="$future_libdirs $libdir" ;;
+         *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
          esac
        fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+        test -n "$hardcode_libdirs"; then
+       libdir="$hardcode_libdirs"
+       eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
 
-       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-       test "X$dir" = "X$file/" && dir=
-       dir="$dir$objdir"
-
-       if test -n "$relink_command"; then
-         # Determine the prefix the user has applied to our future dir.
-         inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-         # Don't allow the user to place us outside of our expected
-         # location b/c this prevents finding dependent libraries that
-         # are installed to the same prefix.
-         # At present, this check doesn't affect windows .dll's that
-         # are installed into $libdir/../bin (currently, that works fine)
-         # but it's something to keep an eye on.
-         if test "$inst_prefix_dir" = "$destdir"; then
-           $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-           exit $EXIT_FAILURE
-         fi
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+       # Transform all the library objects into standard objects.
+       compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+       finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
 
-         if test -n "$inst_prefix_dir"; then
-           # Stick the inst_prefix_dir data into the link command.
-           relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-         else
-           relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-         fi
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
 
-         $echo "$modename: warning: relinking \`$file'" 1>&2
-         $show "$relink_command"
-         if $run eval "$relink_command"; then :
-         else
-           $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-           exit $EXIT_FAILURE
-         fi
-       fi
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+       func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
 
-       # See the names of the shared library.
-       set dummy $library_names
-       if test -n "$2"; then
-         realname="$2"
-         shift
-         shift
+      wrappers_required=yes
+      case $host in
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+       # Replace the output file specification.
+       compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+       link_command="$compile_command$compile_rpath"
 
-         srcname="$realname"
-         test -n "$relink_command" && srcname="$realname"T
+       # We have no uninstalled library dependencies, so finalize right now.
+       exit_status=0
+       func_show_eval "$link_command" 'exit_status=$?'
 
-         # Install the shared library and build the symlinks.
-         $show "$install_prog $dir/$srcname $destdir/$realname"
-         $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-         if test -n "$stripme" && test -n "$striplib"; then
-           $show "$striplib $destdir/$realname"
-           $run eval "$striplib $destdir/$realname" || exit $?
-         fi
+       # Delete the generated files.
+       if test -f "$output_objdir/${outputname}S.${objext}"; then
+         func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+       fi
 
-         if test "$#" -gt 0; then
-           # Delete the old symlinks, and create new ones.
-           # Try `ln -sf' first, because the `ln' binary might depend on
-           # the symlink we replace!  Solaris /bin/ln does not understand -f,
-           # so we also need to try rm && ln -s.
-           for linkname
-           do
-             if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-             fi
-           done
-         fi
+       exit $exit_status
+      fi
 
-         # Do each command in the postinstall commands.
-         lib="$destdir/$realname"
-         cmds=$postinstall_cmds
-         save_ifs="$IFS"; IFS='~'
-         for cmd in $cmds; do
-           IFS="$save_ifs"
-           eval cmd=\"$cmd\"
-           $show "$cmd"
-           $run eval "$cmd" || {
-             lt_exit=$?
-
-             # Restore the uninstalled library and exit
-             if test "$mode" = relink; then
-               $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-             fi
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+       compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+       finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
 
-             exit $lt_exit
-           }
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+       if test -n "$perm_rpath"; then
+         # We should set the runpath_var.
+         rpath=
+         for dir in $perm_rpath; do
+           rpath="$rpath$dir:"
          done
-         IFS="$save_ifs"
+         compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
        fi
+       if test -n "$finalize_perm_rpath"; then
+         # We should set the runpath_var.
+         rpath=
+         for dir in $finalize_perm_rpath; do
+           rpath="$rpath$dir:"
+         done
+         finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+       fi
+      fi
 
-       # Install the pseudo-library for information purposes.
-       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-       instname="$dir/$name"i
-       $show "$install_prog $instname $destdir/$name"
-       $run eval "$install_prog $instname $destdir/$name" || exit $?
-
-       # Maybe install the static library, too.
-       test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-       ;;
+      if test "$no_install" = yes; then
+       # We don't need to create a wrapper script.
+       link_command="$compile_var$compile_command$compile_rpath"
+       # Replace the output file specification.
+       link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+       # Delete the old output file.
+       $opt_dry_run || $RM $output
+       # Link the executable and exit
+       func_show_eval "$link_command" 'exit $?'
+       exit $EXIT_SUCCESS
+      fi
 
-      *.lo)
-       # Install (i.e. copy) a libtool object.
+      if test "$hardcode_action" = relink; then
+       # Fast installation is not supported
+       link_command="$compile_var$compile_command$compile_rpath"
+       relink_command="$finalize_var$finalize_command$finalize_rpath"
 
-       # Figure out destination file name, if it wasn't already specified.
-       if test -n "$destname"; then
-         destfile="$destdir/$destname"
+       func_warning "this platform does not like uninstalled shared libraries"
+       func_warning "\`$output' will be relinked during installation"
+      else
+       if test "$fast_install" != no; then
+         link_command="$finalize_var$compile_command$finalize_rpath"
+         if test "$fast_install" = yes; then
+           relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+         else
+           # fast_install is set to needless
+           relink_command=
+         fi
        else
-         destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-         destfile="$destdir/$destfile"
+         link_command="$compile_var$compile_command$compile_rpath"
+         relink_command="$finalize_var$finalize_command$finalize_rpath"
        fi
+      fi
 
-       # Deduce the name of the destination old-style object file.
-       case $destfile in
-       *.lo)
-         staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-         ;;
-       *.$objext)
-         staticdest="$destfile"
-         destfile=
-         ;;
-       *)
-         $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
-         ;;
-       esac
+      # Replace the output file specification.
+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
-       # Install the libtool object if requested.
-       if test -n "$destfile"; then
-         $show "$install_prog $file $destfile"
-         $run eval "$install_prog $file $destfile" || exit $?
-       fi
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
-       # Install the old object if enabled.
-       if test "$build_old_libs" = yes; then
-         # Deduce the name of the old-style object file.
-         staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+      func_show_eval "$link_command" 'exit $?'
 
-         $show "$install_prog $staticobj $staticdest"
-         $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-       fi
-       exit $EXIT_SUCCESS
-       ;;
+      # Now create the wrapper script.
+      func_verbose "creating $output"
 
-      *)
-       # Figure out destination file name, if it wasn't already specified.
-       if test -n "$destname"; then
-         destfile="$destdir/$destname"
-       else
-         destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-         destfile="$destdir/$destfile"
-       fi
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+       # Preserve any variables that may affect compiler behavior
+       for var in $variables_saved_for_relink; do
+         if eval test -z \"\${$var+set}\"; then
+           relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+         elif eval var_value=\$$var; test -z "$var_value"; then
+           relink_command="$var=; export $var; $relink_command"
+         else
+           func_quote_for_eval "$var_value"
+           relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+         fi
+       done
+       relink_command="(cd `pwd`; $relink_command)"
+       relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
 
-       # If the file is missing, and there is a .exe on the end, strip it
-       # because it is most likely a libtool script we actually want to
-       # install
-       stripped_ext=""
-       case $file in
-         *.exe)
-           if test ! -f "$file"; then
-             file=`$echo $file|${SED} 's,.exe$,,'`
-             stripped_ext=".exe"
-           fi
-           ;;
+      # Quote $ECHO for shipping.
+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+       case $progpath in
+       [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+       *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
        esac
+       qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+       qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+      fi
 
-       # Do a test to see if this is really a libtool program.
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+       # win32 will think the script is a binary if it has
+       # a .exe suffix, so we strip it off here.
+       case $output in
+         *.exe) func_stripname '' '.exe' "$output"
+                output=$func_stripname_result ;;
+       esac
+       # test for cygwin because mv fails w/o .exe extensions
        case $host in
-       *cygwin*|*mingw*)
-           wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-           ;;
-       *)
-           wrapper=$file
-           ;;
+         *cygwin*)
+           exeext=.exe
+           func_stripname '' '.exe' "$outputname"
+           outputname=$func_stripname_result ;;
+         *) exeext= ;;
        esac
-       if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-         notinst_deplibs=
-         relink_command=
-
-         # Note that it is not necessary on cygwin/mingw to append a dot to
-         # foo even if both foo and FILE.exe exist: automatic-append-.exe
-         # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-         # `FILE.' does not work on cygwin managed mounts.
-         #
-         # If there is no directory component, then add one.
-         case $wrapper in
-         */* | *\\*) . ${wrapper} ;;
-         *) . ./${wrapper} ;;
-         esac
-
-         # Check the variables that should have been set.
-         if test -z "$notinst_deplibs"; then
-           $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-           exit $EXIT_FAILURE
-         fi
-
-         finalize=yes
-         for lib in $notinst_deplibs; do
-           # Check to see that each library is installed.
-           libdir=
-           if test -f "$lib"; then
-             # If there is no directory component, then add one.
-             case $lib in
-             */* | *\\*) . $lib ;;
-             *) . ./$lib ;;
-             esac
-           fi
-           libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-           if test -n "$libdir" && test ! -f "$libfile"; then
-             $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-             finalize=no
-           fi
-         done
-
-         relink_command=
-         # Note that it is not necessary on cygwin/mingw to append a dot to
-         # foo even if both foo and FILE.exe exist: automatic-append-.exe
-         # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-         # `FILE.' does not work on cygwin managed mounts.
-         #
-         # If there is no directory component, then add one.
-         case $wrapper in
-         */* | *\\*) . ${wrapper} ;;
-         *) . ./${wrapper} ;;
-         esac
+       case $host in
+         *cygwin* | *mingw* )
+           func_dirname_and_basename "$output" "" "."
+           output_name=$func_basename_result
+           output_path=$func_dirname_result
+           cwrappersource="$output_path/$objdir/lt-$output_name.c"
+           cwrapper="$output_path/$output_name.exe"
+           $RM $cwrappersource $cwrapper
+           trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+           func_emit_cwrapperexe_src > $cwrappersource
+
+           # The wrapper executable is built using the $host compiler,
+           # because it contains $host paths and files. If cross-
+           # compiling, it, like the target executable, must be
+           # executed on the $host or under an emulation environment.
+           $opt_dry_run || {
+             $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+             $STRIP $cwrapper
+           }
 
-         outputname=
-         if test "$fast_install" = no && test -n "$relink_command"; then
-           if test "$finalize" = yes && test -z "$run"; then
-             tmpdir=`func_mktempdir`
-             file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-             outputname="$tmpdir/$file"
-             # Replace the output file specification.
-             relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-             $show "$relink_command"
-             if $run eval "$relink_command"; then :
+           # Now, create the wrapper script for func_source use:
+           func_ltwrapper_scriptname $cwrapper
+           $RM $func_ltwrapper_scriptname_result
+           trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+           $opt_dry_run || {
+             # note: this script will not be executed, so do not chmod.
+             if test "x$build" = "x$host" ; then
+               $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
              else
-               $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-               ${rm}r "$tmpdir"
-               continue
+               func_emit_wrapper no > $func_ltwrapper_scriptname_result
              fi
-             file="$outputname"
-           else
-             $echo "$modename: warning: cannot relink \`$file'" 1>&2
-           fi
-         else
-           # Install the binary that we compiled earlier.
-           file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-         fi
-       fi
+           }
+         ;;
+         * )
+           $RM $output
+           trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
 
-       # remove .exe since cygwin /usr/bin/install will append another
-       # one anyway 
-       case $install_prog,$host in
-       */usr/bin/install*,*cygwin*)
-         case $file:$destfile in
-         *.exe:*.exe)
-           # this is ok
-           ;;
-         *.exe:*)
-           destfile=$destfile.exe
-           ;;
-         *:*.exe)
-           destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-           ;;
-         esac
+           func_emit_wrapper no > $output
+           chmod +x $output
          ;;
        esac
-       $show "$install_prog$stripme $file $destfile"
-       $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-       test -n "$outputname" && ${rm}r "$tmpdir"
-       ;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
 
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
 
-      if test -n "$stripme" && test -n "$old_striplib"; then
-       $show "$old_striplib $oldlib"
-       $run eval "$old_striplib $oldlib" || exit $?
+      if test "$build_libtool_libs" = convenience; then
+       oldobjs="$libobjs_save $symfileobj"
+       addlibs="$convenience"
+       build_libtool_libs=no
+      else
+       if test "$build_libtool_libs" = module; then
+         oldobjs="$libobjs_save"
+         build_libtool_libs=no
+       else
+         oldobjs="$old_deplibs $non_pic_objects"
+         if test "$preload" = yes && test -f "$symfileobj"; then
+           oldobjs="$oldobjs $symfileobj"
+         fi
+       fi
+       addlibs="$old_convenience"
       fi
 
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-       IFS="$save_ifs"
-       eval cmd=\"$cmd\"
-       $show "$cmd"
-       $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
+      if test -n "$addlibs"; then
+       gentop="$output_objdir/${outputname}x"
+       generated="$generated $gentop"
 
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
+       func_extract_archives $gentop $addlibs
+       oldobjs="$oldobjs $func_extract_archives_result"
+      fi
 
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+       cmds=$old_archive_from_new_cmds
+      else
 
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
+       # Add any objects from preloaded convenience libraries
+       if test -n "$dlprefiles"; then
+         gentop="$output_objdir/${outputname}x"
+         generated="$generated $gentop"
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-       libdirs="$libdirs $dir"
-      done
+         func_extract_archives $gentop $dlprefiles
+         oldobjs="$oldobjs $func_extract_archives_result"
+       fi
 
-      for libdir in $libdirs; do
-       if test -n "$finish_cmds"; then
-         # Do each command in the finish commands.
-         cmds=$finish_cmds
-         save_ifs="$IFS"; IFS='~'
-         for cmd in $cmds; do
-           IFS="$save_ifs"
-           eval cmd=\"$cmd\"
-           $show "$cmd"
-           $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
+       # POSIX demands no paths to be encoded in archives.  We have
+       # to avoid creating archives with duplicate basenames if we
+       # might have to extract them afterwards, e.g., when creating a
+       # static archive out of a convenience library, or when linking
+       # the entirety of a libtool archive into another (currently
+       # not supported by libtool).
+       if (for obj in $oldobjs
+           do
+             func_basename "$obj"
+             $ECHO "$func_basename_result"
+           done | sort | sort -uc >/dev/null 2>&1); then
+         :
+       else
+         $ECHO "copying selected object files to avoid basename conflicts..."
+         gentop="$output_objdir/${outputname}x"
+         generated="$generated $gentop"
+         func_mkdir_p "$gentop"
+         save_oldobjs=$oldobjs
+         oldobjs=
+         counter=1
+         for obj in $save_oldobjs
+         do
+           func_basename "$obj"
+           objbase="$func_basename_result"
+           case " $oldobjs " in
+           " ") oldobjs=$obj ;;
+           *[\ /]"$objbase "*)
+             while :; do
+               # Make sure we don't pick an alternate name that also
+               # overlaps.
+               newobj=lt$counter-$objbase
+               func_arith $counter + 1
+               counter=$func_arith_result
+               case " $oldobjs " in
+               *[\ /]"$newobj "*) ;;
+               *) if test ! -f "$gentop/$newobj"; then break; fi ;;
+               esac
+             done
+             func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+             oldobjs="$oldobjs $gentop/$newobj"
+             ;;
+           *) oldobjs="$oldobjs $obj" ;;
+           esac
          done
-         IFS="$save_ifs"
-       fi
-       if test -n "$finish_eval"; then
-         # Do the single finish_eval.
-         eval cmds=\"$finish_eval\"
-         $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
        fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
+       eval cmds=\"$old_archive_cmds\"
 
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
+       func_len " $cmds"
+       len=$func_len_result
+       if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+         cmds=$old_archive_cmds
+       else
+         # the command line is too long to link in one step, link in parts
+         func_verbose "using piecewise archive linking..."
+         save_RANLIB=$RANLIB
+         RANLIB=:
+         objlist=
+         concat_cmds=
+         save_oldobjs=$oldobjs
+         oldobjs=
+         # Is there a better way of finding the last object in the list?
+         for obj in $save_oldobjs
+         do
+           last_oldobj=$obj
+         done
+         eval test_cmds=\"$old_archive_cmds\"
+         func_len " $test_cmds"
+         len0=$func_len_result
+         len=$len0
+         for obj in $save_oldobjs
+         do
+           func_len " $obj"
+           func_arith $len + $func_len_result
+           len=$func_arith_result
+           func_append objlist " $obj"
+           if test "$len" -lt "$max_cmd_len"; then
+             :
+           else
+             # the above command should be used before it gets too long
+             oldobjs=$objlist
+             if test "$obj" = "$last_oldobj" ; then
+               RANLIB=$save_RANLIB
+             fi
+             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+             eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+             objlist=
+             len=$len0
+           fi
+         done
+         RANLIB=$save_RANLIB
+         oldobjs=$objlist
+         if test "X$oldobjs" = "X" ; then
+           eval cmds=\"\$concat_cmds\"
+         else
+           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+         fi
+       fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
     done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-    ;;
 
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
 
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-       $echo "$modename: \`$file' is not a file" 1>&2
-       $echo "$help" 1>&2
-       exit $EXIT_FAILURE
-      fi
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
 
-      dir=
-      case $file in
-      *.la)
-       # Check to see that this really is a libtool archive.
-       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+       if eval test -z \"\${$var+set}\"; then
+         relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+       elif eval var_value=\$$var; test -z "$var_value"; then
+         relink_command="$var=; export $var; $relink_command"
        else
-         $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-         $echo "$help" 1>&2
-         exit $EXIT_FAILURE
+         func_quote_for_eval "$var_value"
+         relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
        fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+       relink_command=
+      fi
 
-       # Read the libtool library.
-       dlname=
-       library_names=
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+       for installed in no yes; do
+         if test "$installed" = yes; then
+           if test -z "$install_libdir"; then
+             break
+           fi
+           output="$output_objdir/$outputname"i
+           # Replace all uninstalled libtool libraries with the installed ones
+           newdependency_libs=
+           for deplib in $dependency_libs; do
+             case $deplib in
+             *.la)
+               func_basename "$deplib"
+               name="$func_basename_result"
+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+               test -z "$libdir" && \
+                 func_fatal_error "\`$deplib' is not a valid libtool archive"
+               newdependency_libs="$newdependency_libs $libdir/$name"
+               ;;
+             *) newdependency_libs="$newdependency_libs $deplib" ;;
+             esac
+           done
+           dependency_libs="$newdependency_libs"
+           newdlfiles=
+
+           for lib in $dlfiles; do
+             case $lib in
+             *.la)
+               func_basename "$lib"
+               name="$func_basename_result"
+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+               test -z "$libdir" && \
+                 func_fatal_error "\`$lib' is not a valid libtool archive"
+               newdlfiles="$newdlfiles $libdir/$name"
+               ;;
+             *) newdlfiles="$newdlfiles $lib" ;;
+             esac
+           done
+           dlfiles="$newdlfiles"
+           newdlprefiles=
+           for lib in $dlprefiles; do
+             case $lib in
+             *.la)
+               # Only pass preopened files to the pseudo-archive (for
+               # eventual linking with the app. that links it) if we
+               # didn't already link the preopened objects directly into
+               # the library:
+               func_basename "$lib"
+               name="$func_basename_result"
+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+               test -z "$libdir" && \
+                 func_fatal_error "\`$lib' is not a valid libtool archive"
+               newdlprefiles="$newdlprefiles $libdir/$name"
+               ;;
+             esac
+           done
+           dlprefiles="$newdlprefiles"
+         else
+           newdlfiles=
+           for lib in $dlfiles; do
+             case $lib in
+               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+               *) abs=`pwd`"/$lib" ;;
+             esac
+             newdlfiles="$newdlfiles $abs"
+           done
+           dlfiles="$newdlfiles"
+           newdlprefiles=
+           for lib in $dlprefiles; do
+             case $lib in
+               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+               *) abs=`pwd`"/$lib" ;;
+             esac
+             newdlprefiles="$newdlprefiles $abs"
+           done
+           dlprefiles="$newdlprefiles"
+         fi
+         $RM $output
+         # place dlname in correct position for cygwin
+         tdlname=$dlname
+         case $host,$output,$installed,$module,$dlname in
+           *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+         esac
+         $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
 
-       # If there is no directory component, then add one.
-       case $file in
-       */* | *\\*) . $file ;;
-       *) . ./$file ;;
-       esac
+# The name that we can dlopen(3).
+dlname='$tdlname'
 
-       # Skip this library if it cannot be dlopened.
-       if test -z "$dlname"; then
-         # Warn if it was a shared library.
-         test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-         continue
-       fi
+# Names of this library.
+library_names='$library_names'
 
-       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-       test "X$dir" = "X$file" && dir=.
+# The name of the static archive.
+old_library='$old_library'
 
-       if test -f "$dir/$objdir/$dlname"; then
-         dir="$dir/$objdir"
-       else
-         $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-         exit $EXIT_FAILURE
-       fi
-       ;;
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
 
-      *.lo)
-       # Just add the directory containing the .lo file.
-       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-       test "X$dir" = "X$file" && dir=.
-       ;;
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
 
-      *)
-       $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-       continue
-       ;;
-      esac
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
 
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
 
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-       eval "$shlibpath_var=\"\$dir\""
-      else
-       eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
+# Is this an already installed library?
+installed=$installed
 
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
 
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-       # Do a test to see if this is really a libtool program.
-       if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-         # If there is no directory component, then add one.
-         case $file in
-         */* | *\\*) . $file ;;
-         *) . ./$file ;;
-         esac
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
 
-         # Transform arg to wrapped name.
-         file="$progdir/$program"
-       fi
-       ;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+         if test "$installed" = no && test "$need_relink" = yes; then
+           $ECHO >> $output "\
+relink_command=\"$relink_command\""
+         fi
+       done
+      }
 
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-       # Export the shlibpath_var.
-       eval "export $shlibpath_var"
-      fi
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
 
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-       LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-       LANG="$save_LANG"; export LANG
-      fi
+{ test "$mode" = link || test "$mode" = relink; } &&
+    func_mode_link ${1+"$@"}
 
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-       eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-       $echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
 
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
     files=
     rmforce=
     exit_status=0
@@ -6448,30 +8202,28 @@ relink_command=\"$relink_command\""
     for arg
     do
       case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
+      -f) RM="$RM $arg"; rmforce=yes ;;
+      -*) RM="$RM $arg" ;;
       *) files="$files $arg" ;;
       esac
     done
 
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
 
     rmdirs=
 
     origobjdir="$objdir"
     for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-       dir=.
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
        objdir="$origobjdir"
       else
        objdir="$dir/$origobjdir"
       fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      func_basename "$file"
+      name="$func_basename_result"
       test "$mode" = uninstall && objdir="$dir"
 
       # Remember objdir for removal later, being careful to avoid duplicates
@@ -6483,9 +8235,9 @@ relink_command=\"$relink_command\""
       fi
 
       # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-       || (test -h "$file") >/dev/null 2>&1 \
-       || test -f "$file"; then
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+        { test -h "$file"; } >/dev/null 2>&1 ||
+        test -f "$file"; then
        :
       elif test -d "$file"; then
        exit_status=1
@@ -6499,8 +8251,8 @@ relink_command=\"$relink_command\""
       case $name in
       *.la)
        # Possibly a libtool archive, so verify it.
-       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-         . $dir/$name
+       if func_lalib_p "$file"; then
+         func_source $dir/$name
 
          # Delete the libtool libraries and symlinks.
          for n in $library_names; do
@@ -6515,39 +8267,17 @@ relink_command=\"$relink_command\""
            *" $dlname "*) ;;
            *) rmfiles="$rmfiles $objdir/$dlname" ;;
            esac
-            test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+           test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
            ;;
          uninstall)
            if test -n "$library_names"; then
              # Do each command in the postuninstall commands.
-             cmds=$postuninstall_cmds
-             save_ifs="$IFS"; IFS='~'
-             for cmd in $cmds; do
-               IFS="$save_ifs"
-               eval cmd=\"$cmd\"
-               $show "$cmd"
-               $run eval "$cmd"
-               if test "$?" -ne 0 && test "$rmforce" != yes; then
-                 exit_status=1
-               fi
-             done
-             IFS="$save_ifs"
+             func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
            fi
 
            if test -n "$old_library"; then
              # Do each command in the old_postuninstall commands.
-             cmds=$old_postuninstall_cmds
-             save_ifs="$IFS"; IFS='~'
-             for cmd in $cmds; do
-               IFS="$save_ifs"
-               eval cmd=\"$cmd\"
-               $show "$cmd"
-               $run eval "$cmd"
-               if test "$?" -ne 0 && test "$rmforce" != yes; then
-                 exit_status=1
-               fi
-             done
-             IFS="$save_ifs"
+             func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
            fi
            # FIXME: should reinstall the best remaining shared library.
            ;;
@@ -6557,20 +8287,20 @@ relink_command=\"$relink_command\""
 
       *.lo)
        # Possibly a libtool object, so verify it.
-       if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+       if func_lalib_p "$file"; then
 
          # Read the .lo file
-         . $dir/$name
+         func_source $dir/$name
 
          # Add PIC object to the list of files to remove.
-         if test -n "$pic_object" \
-            && test "$pic_object" != none; then
+         if test -n "$pic_object" &&
+            test "$pic_object" != none; then
            rmfiles="$rmfiles $dir/$pic_object"
          fi
 
          # Add non-PIC object to the list of files to remove.
-         if test -n "$non_pic_object" \
-            && test "$non_pic_object" != none; then
+         if test -n "$non_pic_object" &&
+            test "$non_pic_object" != none; then
            rmfiles="$rmfiles $dir/$non_pic_object"
          fi
        fi
@@ -6581,17 +8311,26 @@ relink_command=\"$relink_command\""
          noexename=$name
          case $file in
          *.exe)
-           file=`$echo $file|${SED} 's,.exe$,,'`
-           noexename=`$echo $name|${SED} 's,.exe$,,'`
+           func_stripname '' '.exe' "$file"
+           file=$func_stripname_result
+           func_stripname '' '.exe' "$name"
+           noexename=$func_stripname_result
            # $file with .exe has already been added to rmfiles,
            # add $file without .exe
            rmfiles="$rmfiles $file"
            ;;
          esac
          # Do a test to see if this is a libtool program.
-         if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-           relink_command=
-           . $dir/$noexename
+         if func_ltwrapper_p "$file"; then
+           if func_ltwrapper_executable_p "$file"; then
+             func_ltwrapper_scriptname "$file"
+             relink_command=
+             func_source $func_ltwrapper_scriptname_result
+             rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+           else
+             relink_command=
+             func_source $dir/$noexename
+           fi
 
            # note $name still contains .exe if it was in $file originally
            # as does the version of $file that was added into $rmfiles
@@ -6606,237 +8345,38 @@ relink_command=\"$relink_command\""
        fi
        ;;
       esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
     objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
-       $show "rmdir $dir"
-       $run rmdir $dir >/dev/null 2>&1
+       func_show_eval "rmdir $dir >/dev/null 2>&1"
       fi
     done
 
     exit $exit_status
-    ;;
+}
 
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
 
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
+test -z "$mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$mode'"
 
 if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
+  eval exec "$exec_cmd"
   exit $EXIT_FAILURE
 fi
 
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                   try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                   try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                   specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
+exit $exit_status
 
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -6850,14 +8390,17 @@ exit $?
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
+build_libtool_libs=no
+build_old_libs=yes
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script
 # sh-indentation:2
 # End:
+# vi:sw=2
+
index 82ba245963cdab38a04054c34a6ed50d7f064bc7..ee49d192c1ce7e88b13cd952364e3affb31fbc79 100755 (executable)
@@ -578,22 +578,22 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$ECHO in
+case X$lt_ECHO in
 X*--fallback-echo)
   # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
   ;;
 esac
 
-echo=${ECHO-echo}
+ECHO=${lt_ECHO-echo}
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
 elif test "X$1" = X--fallback-echo; then
   # Avoid inline document here, it may be left over
   :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
   :
 else
   # Restart under the correct shell.
@@ -603,9 +603,9 @@ fi
 if test "X$1" = X--fallback-echo; then
   # used as fallback echo
   shift
-  cat <<EOF
+  cat <<_LT_EOF
 $*
-EOF
+_LT_EOF
   exit 0
 fi
 
@@ -613,121 +613,116 @@ fi
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+        { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
 
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
 
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
     IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
 
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-        test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-        echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-        test "X$echo_testing_string" = "X$echo_test_string"; then
-       # Cool, printf works
-       :
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-          test "X$echo_testing_string" = 'X\t' &&
-          echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-          test "X$echo_testing_string" = "X$echo_test_string"; then
-       CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-       export CONFIG_SHELL
-       SHELL="$CONFIG_SHELL"
-       export SHELL
-       echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-          test "X$echo_testing_string" = 'X\t' &&
-          echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-          test "X$echo_testing_string" = "X$echo_test_string"; then
-       echo="$CONFIG_SHELL $0 --fallback-echo"
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+          test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
       else
-       # maybe with a smaller string...
-       prev=:
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+          echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+          test "X$echo_testing_string" = "X$echo_test_string"; then
+         # Cool, printf works
+         :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+            test "X$echo_testing_string" = 'X\t' &&
+            echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+            test "X$echo_testing_string" = "X$echo_test_string"; then
+         CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+         export CONFIG_SHELL
+         SHELL="$CONFIG_SHELL"
+         export SHELL
+         ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+            test "X$echo_testing_string" = 'X\t' &&
+            echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+            test "X$echo_testing_string" = "X$echo_test_string"; then
+         ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+         # maybe with a smaller string...
+         prev=:
 
-       for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-         if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-         then
-           break
-         fi
-         prev="$cmd"
-       done
+         for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+           if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+           then
+             break
+           fi
+           prev="$cmd"
+         done
 
-       if test "$prev" != 'sed 50q "$0"'; then
-         echo_test_string=`eval $prev`
-         export echo_test_string
-         exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-       else
-         # Oops.  We lost completely, so just stick with echo.
-         echo=echo
-       fi
+         if test "$prev" != 'sed 50q "$0"'; then
+           echo_test_string=`eval $prev`
+           export echo_test_string
+           exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+         else
+           # Oops.  We lost completely, so just stick with echo.
+           ECHO=echo
+         fi
+        fi
       fi
     fi
   fi
 fi
-fi
 
 # Copy echo and quote the copy suitably for passing to libtool from
 # the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 fi
 
 
 
 
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
 exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
@@ -827,6 +822,8 @@ BUILD_IMAGEIO_TRUE
 IMAGELIBS
 BUILD_V4L_FALSE
 BUILD_V4L_TRUE
+BUILD_DC1394_2_FALSE
+BUILD_DC1394_2_TRUE
 BUILD_DC1394_FALSE
 BUILD_DC1394_TRUE
 IEEE1394LIBS
@@ -874,20 +871,21 @@ SIMD_FLAGS
 OPENMP_CXXFLAGS
 BUILD_APPS_FALSE
 BUILD_APPS_TRUE
-LIBTOOL
-ac_ct_F77
-FFLAGS
-F77
 CPP
-OBJDUMP
-AS
-DLLTOOL
+OTOOL64
+OTOOL
+LIPO
 NMEDIT
 DSYMUTIL
+lt_ECHO
 RANLIB
 AR
-ECHO
 LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
 EGREP
 GREP
 SED
@@ -897,6 +895,7 @@ CCDEPMODE
 ac_ct_CC
 CFLAGS
 CC
+LIBTOOL
 CXXCPP
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -914,6 +913,9 @@ CPPFLAGS
 LDFLAGS
 CXXFLAGS
 CXX
+OBJDUMP
+DLLTOOL
+AS
 LT_VERSION
 MSUBMINOR
 MMINOR
@@ -996,11 +998,10 @@ enable_option_checking
 enable_static
 enable_dependency_tracking
 enable_shared
+with_pic
 enable_fast_install
 with_gnu_ld
 enable_libtool_lock
-with_pic
-with_tags
 enable_debug
 enable_optimization
 enable_sse
@@ -1035,8 +1036,6 @@ CXXCPP
 CC
 CFLAGS
 CPP
-F77
-FFLAGS
 PYTHON
 SWIG'
 
@@ -1687,10 +1686,9 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
-  --with-tags[=TAGS]      include additional configurations [automatic]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-native-lapack    use platform native BLAS and LAPACK [no]
   --with-swig             use swig wrapper generator [no]
   --with-python           use python for wrapping [yes]
@@ -1720,8 +1718,6 @@ Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   CPP         C preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
   PYTHON      Python Executable Path
   SWIG        Simplified Wrapper and Interface Generator, used for Python
               bindings
@@ -2880,99 +2876,23 @@ fi
 
 
 
-# Do compilation tests using CXX and CXXCPP and use extension .C for test programs.
-# Use compilation flags: CPPFLAGS with CXXCPP, and both CPPFLAGS and CXXFLAGS with CXX.
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-# checks for programs.
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-       @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
 
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
 
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
 
+enable_win32_dll=yes
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
+if test "${ac_cv_prog_AS+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2981,7 +2901,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    ac_cv_prog_AS="${ac_tool_prefix}as"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2991,32 +2911,28 @@ IFS=$as_save_IFS
 
 fi
 fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:$LINENO: result: $AS" >&5
+$as_echo "$AS" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-    test -n "$CXX" && break
-  done
 fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3025,7 +2941,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    ac_cv_prog_ac_ct_AS="as"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -3035,21 +2951,17 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -3057,628 +2969,289 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CXX=$ac_ct_CXX
+    AS=$ac_ct_AS
   fi
+else
+  AS="$ac_cv_prog_AS"
 fi
 
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
 
-ac_rmfiles=
-for ac_file in $ac_files
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
-rm -f $ac_rmfiles
+done
+IFS=$as_save_IFS
 
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-       ;;
-    [ab].out )
-       # We found the default executable, but exeext='' is most
-       # certainly right.
-       break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-       then :; else
-          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-       fi
-       # We set ac_cv_exeext here because the later test for it is not
-       # safe: cross compilers may not add the suffix if given an `-o'
-       # argument, so we may need to know it at that point already.
-       # Even if this section looks crufty: it has the advantage of
-       # actually working.
-       break;;
-    * )
-       break;;
-  esac
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
+done
+IFS=$as_save_IFS
 
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
-  ac_file=''
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
 fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-ac_exeext=$ac_cv_exeext
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
   else
-    if test "$cross_compiling" = maybe; then
-       cross_compiling=yes
-    else
-       { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-    fi
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
   fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+  ;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-         break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
 
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+test -z "$AS" && AS=as
 
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
 
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+test -z "$DLLTOOL" && DLLTOOL=dlltool
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_compiler_gnu=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+test -z "$OBJDUMP" && OBJDUMP=objdump
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-        CXXFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
+# Do compilation tests using CXX and CXXCPP and use extension .C for test programs.
+# Use compilation flags: CPPFLAGS with CXXCPP, and both CPPFLAGS and CXXFLAGS with CXX.
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
+# checks for programs.
+DEPDIR="${am__leading_dot}deps"
 
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ac_config_commands="$ac_config_commands depfiles"
 
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-       continue
-      else
-       break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+       @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
 fi
 
+
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval=$enable_dependency_tracking;
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
 else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
 fi
 
 
@@ -3687,257 +3260,25 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -4063,12 +3404,7 @@ $as_echo "$ac_try_echo") >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4078,63 +3414,193 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-#ifndef __GNUC__
-       choke me
-#endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+       ;;
+    [ab].out )
+       # We found the default executable, but exeext='' is most
+       # certainly right.
+       break;;
+    *.* )
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+       then :; else
+          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+       fi
+       # We set ac_cv_exeext here because the later test for it is not
+       # safe: cross compilers may not add the suffix if given an `-o'
+       # argument, so we may need to know it at that point already.
+       # Even if this section looks crufty: it has the advantage of
+       # actually working.
+       break;;
+    * )
+       break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
+  ac_file=''
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_compiler_gnu=no
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C++ compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ac_exeext=$ac_cv_exeext
 
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+       cross_compiling=yes
+    else
+       { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+    fi
+  fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+         break;;
+    * ) break;;
+  esac
+done
 else
-  GXX=
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
+
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4149,7 +3615,7 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
+rm -f conftest.o conftest.obj
 if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -4157,23 +3623,43 @@ case "(($ac_try" in
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_compile") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
+  (exit $ac_status); }; then
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4183,6 +3669,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
+#ifndef __GNUC__
+       choke me
+#endif
 
   ;
   return 0;
@@ -4206,26 +3695,128 @@ $as_echo "$ac_try_echo") >&5
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  :
+  ac_compiler_gnu=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-        CXXFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+       ac_compiler_gnu=no
+fi
 
-int
-main ()
-{
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
-  ;
-  return 0;
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+        CXXFLAGS="-g"
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
@@ -4394,109 +3985,259 @@ else
 fi
 
 
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_shared=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  enable_shared=yes
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
 fi
 
+rm -f conftest.err conftest.$ac_ext
 
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_fast_install=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
 else
-  enable_fast_install=yes
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
 
+rm -f conftest.err conftest.$ac_ext
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
 done
-done
-IFS=$as_save_IFS
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
 
 fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  :
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
 fi
 
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -4505,7 +4246,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4515,41 +4256,32 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
 
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -4558,7 +4290,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4568,164 +4300,21 @@ IFS=$as_save_IFS
 
 fi
 fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+  test -n "$ac_ct_CXX" && break
 done
-IFS=$as_save_IFS
 
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -4733,23 +4322,14 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CC=$ac_ct_CC
+    CXX=$ac_ct_CXX
   fi
 fi
 
+  fi
 fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
@@ -4786,9 +4366,9 @@ $as_echo "$ac_try_echo") >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -4824,7 +4404,7 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
@@ -4836,27 +4416,27 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
-  GCC=yes
+  GXX=yes
 else
-  GCC=
+  GXX=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4887,15 +4467,15 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
+  ac_cv_prog_cxx_g=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       CFLAGS=""
+       CXXFLAGS=""
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4926,7 +4506,7 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
@@ -4934,8 +4514,8 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
+       ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+        CXXFLAGS="-g"
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4966,10 +4546,10 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
+  ac_cv_prog_cxx_g=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -4984,152 +4564,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
   else
-    CFLAGS="-g"
+    CXXFLAGS="-g"
   fi
 else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
   else
-    CFLAGS=
+    CXXFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
+depcc="$CXX"  am_compiler_list=
 
 { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5151,7 +4615,7 @@ else
   # directory.
   mkdir sub
 
-  am_cv_CC_dependencies_compiler_type=none
+  am_cv_CXX_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
@@ -5205,7 +4669,7 @@ else
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
+        am_cv_CXX_dependencies_compiler_type=$depmode
         break
       fi
     fi
@@ -5214,755 +4678,400 @@ else
   cd ..
   rm -rf conftest.dir
 else
-  am_cv_CC_dependencies_compiler_type=none
+  am_cv_CXX_dependencies_compiler_type=none
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
  if
   test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
 else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
+case `pwd` in
+  *\ * | *\    *)
+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.6'
+macro_revision='1.3012'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
 done
+done
+IFS=$as_save_IFS
 
 fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-SED=$lt_cv_path_SED
-
-{ $as_echo "$as_me:$LINENO: result: $SED" >&5
-$as_echo "$SED" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  ac_cv_path_GREP=$GREP
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
 
-   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  with_gnu_ld=no
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+
+  fi
 fi
-if test "${lt_cv_path_LD+set}" = set; then
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-       test "$with_gnu_ld" != no && break
-       ;;
-      *)
-       test "$with_gnu_ld" != yes && break
-       ;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
 fi
 fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-$as_echo_n "checking for BSD-compatible nm... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-       # Check to see if the nm accepts a BSD-compat flag.
-       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-       #   nm: unknown option "B" ignored
-       # Tru64's nm complains that /dev/null is an invalid object file
-       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-       */dev/null* | *'Invalid file or object type'*)
-         lt_cv_path_NM="$tmp_nm -B"
-         break
-         ;;
-       *)
-         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-         */dev/null*)
-           lt_cv_path_NM="$tmp_nm -p"
-           break
-           ;;
-         *)
-           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-           continue # so that we can try to find one that supports BSD flags
-           ;;
-         esac
-         ;;
-       esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+done
+done
+IFS=$as_save_IFS
+
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-NM="$lt_cv_path_NM"
-
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
+done
+done
+IFS=$as_save_IFS
 
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+  test -n "$ac_ct_CC" && break
+done
 
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  if test "x$ac_ct_CC" = x; then
+    CC=""
   else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
   fi
-  ;;
+fi
 
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
+fi
 
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 5862 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_i386_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_x86_64_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
+  (exit $ac_status); }
 
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5972,20 +5081,23 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
+#ifndef __GNUC__
+       choke me
+#endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -5994,1237 +5106,900 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  lt_cv_cc_needs_belf=yes
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       lt_cv_cc_needs_belf=no
+       ac_compiler_gnu=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-         LD="${LD-ld} -64"
-       fi
-       ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  $as_echo_n "(cached) " >&6
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
 else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+       CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+int
+main ()
+{
 
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+       ac_c_werror_flag=$ac_save_c_werror_flag
+        CFLAGS="-g"
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
 else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
 fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:$LINENO: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AS="as"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
   fi
-done
-done
-IFS=$as_save_IFS
-
 fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-  ;;
-
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
-       }; then
-  :
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-  # Broken: fails on valid input.
-continue
+
 fi
 
-rm -f conftest.err conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
 fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
 
-rm -f conftest.err conftest.$ac_ext
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-    done
-    ac_cv_prog_CPP=$CPP
+depcc="$CC"   am_compiler_list=
 
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  :
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
-  # Broken: fails on valid input.
-continue
-fi
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-rm -f conftest.err conftest.$ac_ext
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+       continue
+      else
+       break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
+  cd ..
+  rm -rf conftest.dir
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
+  am_cv_CC_dependencies_compiler_type=none
 fi
 
-rm -f conftest.err conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     $as_unset ac_script || ac_script=
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+      $ac_path_SED_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 else
-  ac_cv_header_stdc=no
+  ac_cv_path_SED=$SED
 fi
-rm -f conftest*
 
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-                  (('a' <= (c) && (c) <= 'i') \
-                    || ('j' <= (c) && (c) <= 'r') \
-                    || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-       || toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
 
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
 
 
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
 
-fi
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 
 
 
 
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
+      $ac_path_GREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
 
 
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                 inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      $ac_path_EGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
+   fi
 fi
-
-done
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
 
-for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then
   $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_path_FGREP=$FGREP
+fi
 
-       ac_header_compiler=no
+   fi
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
 
-done
 
 
 
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  # Broken: fails on valid input.
-continue
-fi
 
-rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
 
-rm -f conftest.err conftest.$ac_ext
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
 
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
 
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
 fi
-  CXXCPP=$ac_cv_prog_CXXCPP
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+       ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  ac_cv_prog_CXXCPP=$CXXCPP
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  :
+if test "${lt_cv_path_LD+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+       test "$with_gnu_ld" != no && break
+       ;;
+      *)
+       test "$with_gnu_ld" != yes && break
+       ;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
 fi
 
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-fi
 
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       # Tru64's nm complains that /dev/null is an invalid object file
+       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+       */dev/null* | *'Invalid file or object type'*)
+         lt_cv_path_NM="$tmp_nm -B"
+         break
+         ;;
+       *)
+         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+         */dev/null*)
+           lt_cv_path_NM="$tmp_nm -p"
+           break
+           ;;
+         *)
+           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+           continue # so that we can try to find one that supports BSD flags
+           ;;
+         esac
+         ;;
+       esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_F77+set}" = set; then
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7233,7 +6008,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7243,32 +6018,32 @@ IFS=$as_save_IFS
 
 fi
 fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  { $as_echo "$as_me:$LINENO: result: $F77" >&5
-$as_echo "$F77" >&6; }
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-    test -n "$F77" && break
+    test -n "$DUMPBIN" && break
   done
 fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7277,7 +6052,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7287,21 +6062,21 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-$as_echo "$ac_ct_F77" >&6; }
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$ac_ct_F77" && break
+  test -n "$ac_ct_DUMPBIN" && break
 done
 
-  if test "x$ac_ct_F77" = x; then
-    F77=""
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7309,175 +6084,56 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    F77=$ac_ct_F77
+    DUMPBIN=$ac_ct_DUMPBIN
   fi
 fi
 
 
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_f77_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_compiler_gnu=no
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
 fi
+test -z "$NM" && NM=nm
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-$as_echo_n "checking whether $F77 accepts -g... " >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
 
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_f77_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_f77_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_prog_f77_g=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-$as_echo "$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
+
+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:6110: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:6113: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:6116: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
   fi
+  rm -f conftest*
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
 
-if test $ac_compiler_gnu = yes; then
-  G77=yes
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  G77=
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
 
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 # find the maximum length of command line arguments
 { $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
@@ -7503,7 +6159,7 @@ else
     lt_cv_sys_max_cmd_len=-1;
     ;;
 
-  cygwin* | mingw*)
+  cygwin* | mingw* | cegcc*)
     # On Win9x/ME, this test blows up -- it succeeds, but takes
     # about 5 minutes as the teststring grows exponentially.
     # Worse, since 9x/ME are not pre-emptively multitasking,
@@ -7558,7 +6214,7 @@ else
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[        ]//'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[         ]//'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
@@ -7569,20 +6225,28 @@ else
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-              = "XX$teststring") >/dev/null 2>&1 &&
-             new_result=`expr "X$teststring" : ".*" 2>&1` &&
-             lt_cv_sys_max_cmd_len=$new_result &&
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+                = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
              test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
       done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
       teststring=
-      # Add a significant safety factor because C++ compilers can tack on massive
-      # amounts of additional arguments before passing them to the linker.
-      # It appears as though 1/2 is a usable value.
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
     fi
     ;;
@@ -7597,298 +6261,115 @@ else
   { $as_echo "$as_me:$LINENO: result: none" >&5
 $as_echo "none" >&6; }
 fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
 
 
 
 
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
 
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
 
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux* | k*bsd*-gnu)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDGIRSTW]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
 
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
 
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
 
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
 
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
 
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[      ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
-  # Check to see that the pipe works correctly.
-  pipe_works=no
 
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
 
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-       mv -f "$nlist"T "$nlist"
-      else
-       rm -f "$nlist"T
-      fi
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
 
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-       if grep ' nm_test_func$' "$nlist" >/dev/null; then
-         cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-EOF
-         # Now generate the symbol file.
-         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
 
-         cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
 
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-         cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
 
-#ifdef __cplusplus
-}
-#endif
-EOF
-         # Now try linking the two files.
-         mv conftest.$ac_objext conftstm.$ac_objext
-         lt_save_LIBS="$LIBS"
-         lt_save_CFLAGS="$CFLAGS"
-         LIBS="conftstm.$ac_objext"
-         CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-         if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-           pipe_works=yes
-         fi
-         LIBS="$lt_save_LIBS"
-         CFLAGS="$lt_save_CFLAGS"
-       else
-         echo "cannot find nm_test_func in $nlist" >&5
-       fi
-      else
-       echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
 
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
 
-fi
 
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:$LINENO: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
 
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
+  lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
 
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
 
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
 
-# Constants:
-rm="rm -f"
 
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+
 
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7897,7 +6378,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7907,10 +6388,10 @@ IFS=$as_save_IFS
 
 fi
 fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-$as_echo "$AR" >&6; }
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
@@ -7918,17 +6399,17 @@ fi
 
 
 fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7937,7 +6418,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7947,17 +6428,17 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7965,22 +6446,242 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    AR=$ac_ct_AR
+    OBJDUMP=$ac_ct_OBJDUMP
   fi
 else
-  AR="$ac_cv_prog_AR"
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
 
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7989,7 +6690,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7999,28 +6700,28 @@ IFS=$as_save_IFS
 
 fi
 fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -8029,7 +6730,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    ac_cv_prog_ac_ct_AR="ar"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8039,17 +6740,17 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -8057,12 +6758,25 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    RANLIB=$ac_ct_RANLIB
+    AR=$ac_ct_AR
   fi
 else
-  RANLIB="$ac_cv_prog_RANLIB"
+  AR="$ac_cv_prog_AR"
 fi
 
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+
+
+
+
+
+
+
+
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -8155,204 +6869,23 @@ else
   STRIP="$ac_cv_prog_STRIP"
 fi
 
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
 test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-       case $deplibs_check_method in
-       "file_magic "*)
-         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-           $EGREP "$file_magic_regex" > /dev/null; then
-           :
-         else
-           cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-         fi ;;
-       esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:$LINENO: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-       case $deplibs_check_method in
-       "file_magic "*)
-         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-           $EGREP "$file_magic_regex" > /dev/null; then
-           :
-         else
-           cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
 
-EOF
-         fi ;;
-       esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-  else
-    MAGIC_CMD=:
-  fi
-fi
 
-  fi
-  ;;
-esac
 
 
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -8361,7 +6894,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8371,10 +6904,10 @@ IFS=$as_save_IFS
 
 fi
 fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
@@ -8382,17 +6915,17 @@ fi
 
 
 fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -8401,7 +6934,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -8411,17 +6944,17 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -8429,1188 +6962,473 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
+    RANLIB=$ac_ct_RANLIB
   fi
 else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+test -z "$RANLIB" && RANLIB=:
 
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
 
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
 
-    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  lt_cv_ld_exported_symbols_list=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       lt_cv_ld_exported_symbols_list=no
-fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS="$save_LDFLAGS"
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[0123])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[012]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
 
 
-enable_dlopen=no
-enable_win32_dll=yes
 
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
 
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
 
-test -z "$pic_mode" && pic_mode=default
 
-# Use C for the default configuration in the libtool script
-tagname=
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-# Source file extension for C test sources.
-ac_ext=c
 
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
 
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
 
 
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
 
 
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
 
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 
-lt_prog_compiler_no_builtin_flag=
 
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8748: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:8752: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
 
-fi
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+# Allow CC to be a program name with arguments.
+compiler=$CC
 
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
 
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
 
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
 
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
 
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
 
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic='-fPIC'
-       ;;
-      esac
-      ;;
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
 
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
   else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static='-Bstatic'
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+       mv -f "$nlist"T "$nlist"
       else
-       lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+       rm -f "$nlist"T
       fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic='-qnocommon'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       esac
-       ;;
 
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+       if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+         cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic='+Z'
-       ;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
+_LT_EOF
+         # Now generate the symbol file.
+         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
 
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
+         cat <<_LT_EOF >> conftest.$ac_ext
 
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+         cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
 
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-       # which looks to be a dead project)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-fpic'
-       lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)
-         # Sun C 5.9
-         lt_prog_compiler_pic='-KPIC'
-         lt_prog_compiler_static='-Bstatic'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       *Sun\ F*)
-         # Sun Fortran 8.3 passes all unrecognized flags to the linker
-         lt_prog_compiler_pic='-KPIC'
-         lt_prog_compiler_static='-Bstatic'
-         lt_prog_compiler_wl=''
-         ;;
-       esac
-       ;;
-      esac
-      ;;
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
 
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+         # Now try linking the two files.
+         mv conftest.$ac_objext conftstm.$ac_objext
+         lt_save_LIBS="$LIBS"
+         lt_save_CFLAGS="$CFLAGS"
+         LIBS="conftstm.$ac_objext"
+         CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+         if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+           pipe_works=yes
+         fi
+         LIBS="$lt_save_LIBS"
+         CFLAGS="$lt_save_CFLAGS"
+       else
+         echo "cannot find nm_test_func in $nlist" >&5
+       fi
+      else
+       echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
 
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
 
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-       lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-       lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
+fi
 
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
 
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-       lt_prog_compiler_pic='-Kconform_pic'
-       lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
 
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
 
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
 
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
 
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
 
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
 
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9038: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:9042: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $rm conftest*
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
 
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
 
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
 
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9142: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:9146: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
 
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-  runpath_var=
-  allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
-  archive_cmds=
-  archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
-  export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_direct=no
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  link_all_deplibs=unknown
-  hardcode_automatic=no
-  module_cmds=
-  module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval=$enable_libtool_lock;
+fi
 
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-       whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-       whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+       HPUX_IA64_MODE="32"
+       ;;
+      *ELF-64*)
+       HPUX_IA64_MODE="64"
+       ;;
     esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line 7319 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+       *32-bit*)
+         LD="${LD-ld} -melf32bsmip"
+         ;;
+       *N32*)
+         LD="${LD-ld} -melf32bmipn32"
+         ;;
+       *64-bit*)
+         LD="${LD-ld} -melf64bmip"
+       ;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+       *32-bit*)
+         LD="${LD-ld} -32"
+         ;;
+       *N32*)
+         LD="${LD-ld} -n32"
+         ;;
+       *64-bit*)
+         LD="${LD-ld} -64"
+         ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
 
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-       ld_shlibs=no
-       cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_i386_fbsd"
+           ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+         ppc64-*linux*|powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+           LD="${LD-ld} -m elf_s390"
+           ;;
+         sparc64-*linux*)
+           LD="${LD-ld} -m elf32_sparc"
+           ;;
+       esac
+       ;;
+      *64-bit*)
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+           ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+         ppc*-*linux*|powerpc*-*linux*)
+           LD="${LD-ld} -m elf64ppc"
+           ;;
+         s390*-*linux*|s390*-*tpf*)
+           LD="${LD-ld} -m elf64_s390"
+           ;;
+         sparc*-*linux*)
+           LD="${LD-ld} -m elf64_sparc"
+           ;;
+       esac
+       ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
 
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
-      ;;
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       allow_undefined_flag=unsupported
-       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-       # support --undefined.  This deserves some investigation.  FIXME
-       archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname.def;
-       else
-         echo EXPORTS > $output_objdir/$soname.def;
-         cat $export_symbols >> $output_objdir/$soname.def;
-       fi~
-       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       tmp_addflag=
-       case $cc_basename,$host_cpu in
-       pgcc*)                          # Portland Group C compiler
-         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag'
-         ;;
-       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
-         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag -Mnomain' ;;
-       ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
-         tmp_addflag=' -i_dynamic' ;;
-       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-         tmp_addflag=' -i_dynamic -nofor_main' ;;
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
-       esac
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)                       # Sun C 5.9
-         whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_sharedflag='-G' ;;
-       *Sun\ F*)                       # Sun Fortran 8.3
-         tmp_sharedflag='-G' ;;
-       *)
-         tmp_sharedflag='-shared' ;;
-       esac
-       archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-       if test $supports_anon_versioning = yes; then
-         archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-       fi
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-      else
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-       ld_shlibs=no
-       cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-       ld_shlibs=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-       ;;
-       *)
-         if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-           hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-           archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-           archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-         else
-           ld_shlibs=no
-         fi
-       ;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-       # Neither direct hardcoding nor static linking is supported with a
-       # broken collect2.
-       hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-       aix_use_runtimelinking=no
-       exp_sym_flag='-Bexport'
-       no_entry_flag=""
-      else
-       # If we're using GNU nm, then we don't want the "-C" option.
-       # -C means demangle to AIX nm, but means don't demangle with GNU nm
-       if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-         export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-       else
-         export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-       fi
-       aix_use_runtimelinking=no
-
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-         for ld_flag in $LDFLAGS; do
-         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-           aix_use_runtimelinking=yes
-           break
-         fi
-         done
-         ;;
-       esac
-
-       exp_sym_flag='-bexport'
-       no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-
-      if test "$GCC" = yes; then
-       case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
-         collect2name=`${CC} -print-prog-name=collect2`
-         if test -f "$collect2name" && \
-          strings "$collect2name" | grep resolve_lib_name >/dev/null
-         then
-         # We have reworked collect2
-         :
-         else
-         # We have old collect2
-         hardcode_direct=unsupported
-         # It fails to find uninstalled libraries when the uninstalled
-         # path is not listed in the libpath.  Setting hardcode_minus_L
-         # to unsupported forces relinking
-         hardcode_minus_L=yes
-         hardcode_libdir_flag_spec='-L$libdir'
-         hardcode_libdir_separator=
-         fi
-         ;;
-       esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
-      else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-       # chokes on -Wl,-G. The following line is correct:
-         shared_flag='-G'
-       else
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag='${wl}-G'
-         else
-           shared_flag='${wl}-bM:SRE'
-         fi
-       fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-       # Warning - without using the other runtime loading flags (-brtl),
-       # -berok will link without error, but may produce a broken library.
-       allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
+int
+main ()
+{
 
   ;
   return 0;
@@ -9637,1355 +7455,942 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_cv_cc_needs_belf=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+       lt_cv_cc_needs_belf=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-       archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-       if test "$host_cpu" = ia64; then
-         hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-         allow_undefined_flag="-z nodefs"
-         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
-        # Determine the default libpath from the value encoded in an empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+       if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+         LD="${LD-ld} -64"
+       fi
+       ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+need_locks="$enable_libtool_lock"
 
 
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-         # Warning - without using the other run time loading flags,
-         # -berok will link without error, but may produce a broken library.
-         no_undefined_flag=' ${wl}-bernotok'
-         allow_undefined_flag=' ${wl}-berok'
-         # Exported symbols can be pulled into shared objects from archives
-         whole_archive_flag_spec='$convenience'
-         archive_cmds_need_lc=yes
-         # This is similar to how AIX traditionally builds its shared libraries.
-         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-      fi
-      ;;
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
 
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    darwin* | rhapsody*)
-      allow_undefined_flag="$_lt_dar_allow_undefined"
-      archive_cmds_need_lc=no
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec=''
-      link_all_deplibs=yes
-    if test "$GCC" = yes ; then
-       output_verbose_link_cmd='echo'
-        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs=no
-          ;;
-      esac
-    fi
-      ;;
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    hpux9*)
-      if test "$GCC" = yes; then
-       archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-       archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
 
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator=:
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-       hardcode_direct=yes
-       export_dynamic_flag_spec='${wl}-E'
 
-       # hardcode_minus_L: Not really in the search PATH,
-       # but as the default location of the library.
-       hardcode_minus_L=yes
-      fi
-      ;;
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      else
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator=:
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-       case $host_cpu in
-       hppa*64*|ia64*)
-         hardcode_libdir_flag_spec_ld='+b $libdir'
-         hardcode_direct=no
-         hardcode_shlibpath_var=no
-         ;;
-       *)
-         hardcode_direct=yes
-         export_dynamic_flag_spec='${wl}-E'
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
 
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         hardcode_minus_L=yes
-         ;;
-       esac
-      fi
-      ;;
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec_ld='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      link_all_deplibs=yes
-      ;;
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-       archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
 
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-         archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-         export_dynamic_flag_spec='${wl}-E'
-       else
-         case $host_os in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-            hardcode_libdir_flag_spec='-R$libdir'
-            ;;
-          *)
-            archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-            ;;
-         esac
-        fi
-      else
-       ld_shlibs=no
-      fi
-      ;;
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
 
-    osf3*)
-      if test "$GCC" = yes; then
-       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       allow_undefined_flag=' -expect_unresolved \*'
-       archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    osf4* | osf5*)     # as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-       allow_undefined_flag=' -expect_unresolved \*'
-       archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-       $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-       # Both c and cxx compiler support -rpath directly
-       hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
 
-    solaris*)
-      no_undefined_flag=' -z text'
-      if test "$GCC" = yes; then
-       wlarc='${wl}'
-       archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-         $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-       wlarc=''
-       archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-       $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-       # The compiler driver will combine and reorder linker options,
-       # but understands `-z linker_flag'.  GCC discards it without `$wl',
-       # but is careful enough not to reorder.
-       # Supported since Solaris 2.6 (maybe 2.5.1?)
-       if test "$GCC" = yes; then
-         whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-       else
-         whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-       fi
-       ;;
-      esac
-      link_all_deplibs=yes
-      ;;
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-       # Use $CC to link under sequent, because it throws in some extra .o
-       # files that make .init and .fini sections work.
-       archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    sysv4)
-      case $host_vendor in
-       sni)
-         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct=yes # is this really true???
-       ;;
-       siemens)
-         ## LD is ld it makes a PLAMLIB
-         ## CC just makes a GrossModule.
-         archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-         reload_cmds='$CC -r -o $output$reload_objs'
-         hardcode_direct=no
-        ;;
-       motorola)
-         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-       ;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
 
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       hardcode_shlibpath_var=no
-       runpath_var=LD_RUN_PATH
-       hardcode_runpath_var=yes
-       ld_shlibs=yes
-      fi
-      ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
 
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
 
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
 
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
 
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-       pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-         archive_cmds_need_lc=no
-        else
-         archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
 
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
 
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
 
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
 
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
 
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-          echo ' yes '
-          echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-       :
-      else
-       can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
 
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
 
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
 
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
 
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
 
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
 
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
 
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
 
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+       # By default we will add the -single_module flag. You can override
+       # by either setting the environment variable LT_MULTI_MODULE
+       # non-empty at configure time, or by adding -multi_module to the
+       # link flags.
+       rm -rf libconftest.dylib*
+       echo "int foo(void){return 1;}" > conftest.c
+       echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+       $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+         -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+       if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+         lt_cv_apple_cc_single_mod=yes
+       else
+         cat conftest.err >&5
+       fi
+       rm -rf libconftest.dylib*
+       rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
+int
+main ()
+{
 
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+       LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+       10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+       10.[012]*)
+         _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+       10.*)
+         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
     ;;
   esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
     else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
 
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-       if test "$lt_cv_prog_gnu_ld" = yes; then
-               version_type=linux
-       else
-               version_type=irix
-       fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[     ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
+  # Broken: fails on valid input.
+continue
+fi
 
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
+rm -f conftest.err conftest.$ac_ext
 
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
 
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
+rm -f conftest.err conftest.$ac_ext
 
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-       shlibpath_overrides_runpath=no
-       ;;
-      *)
-       shlibpath_overrides_runpath=yes
-       ;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
 
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
+    done
+    ac_cv_prog_CPP=$CPP
 
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-rdos*)
-  dynamic_linker=no
-  ;;
+  # Broken: fails on valid input.
+continue
+fi
 
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
+rm -f conftest.err conftest.$ac_ext
 
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
 else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var" || \
-   test "X$hardcode_automatic" = "Xyes" ; then
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
+rm -f conftest.err conftest.$ac_ext
 
-striplib=
-old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
 else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         old_striplib="$STRIP -S"
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-       else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-       ;;
-   *)
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
 
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
 
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
 int
 main ()
 {
-return dlopen ();
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -10994,89 +8399,96 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dl_dlopen=yes
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdc=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_dl_dlopen=no
+       ac_cv_header_stdc=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
-   ;;
+fi
 
-  *)
-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+#include <stdlib.h>
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
-#undef shl_load
+fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                  (('a' <= (c) && (c) <= 'i') \
+                    || ('j' <= (c) && (c) <= 'r') \
+                    || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
 main ()
 {
-return shl_load ();
-  ;
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+       || toupper (i) != TOUPPER (i))
+      return 2;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -11084,74 +8496,84 @@ case "(($ac_try" in
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_link") 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shl_load=yes
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_func_shl_load=no
+( exit $ac_status )
+ac_cv_header_stdc=no
 fi
-
 rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                 inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
+#include <$ac_header>
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -11160,31 +8582,40 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dld_shl_load=yes
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_dld_shl_load=no
+       eval "$as_ac_Header=no"
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+for ac_header in dlfcn.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -11193,54 +8624,19 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+$ac_includes_default
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
+#include <$ac_header>
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -11249,1126 +8645,1164 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_dlopen=yes
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_func_dlopen=no
+       eval "$as_ac_Header=no"
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
-  lt_cv_dlopen="dlopen"
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
 int
 main ()
 {
-return dlopen ();
+#ifndef __GNUC__
+       choke me
+#endif
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dl_dlopen=yes
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_dl_dlopen=no
+       ac_compiler_gnu=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
 int
 main ()
 {
-return dlopen ();
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_svld_dlopen=yes
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_svld_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+       CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
 int
 main ()
 {
-return dld_link ();
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dld_dld_link=yes
+       } && test -s conftest.$ac_objext; then
+  :
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_dld_dld_link=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
+       ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+        CXXFLAGS="-g"
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
-fi
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
   else
-    enable_dlopen=no
+    CXXFLAGS="-g"
   fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
+depcc="$CXX"  am_compiler_list=
 
-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-         if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 11524 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
-#include <stdio.h>
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL          RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL                DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL                0
-#  endif
-#endif
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+       continue
+      else
+       break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
 
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW         DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW       RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW     DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW     0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
 
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  # Broken: fails on valid input.
+continue
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-         if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
 else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 11624 "configure"
-#include "confdefs.h"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
 
-#include <stdio.h>
+rm -f conftest.err conftest.$ac_ext
 
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL          RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL                DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL                0
-#  endif
-#endif
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
 
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW         DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW       RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW     DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW     0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
 
-#ifdef __cplusplus
-extern "C" void exit (int);
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
 #endif
+                    Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
+  # Broken: fails on valid input.
+continue
+fi
 
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
+rm -f conftest.err conftest.$ac_ext
 
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-rm -fr conftest*
 
+rm -f conftest.err conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+_lt_caught_CXX_error=yes; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
 
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
+else
+  _lt_caught_CXX_error=yes
 fi
 
 
-# Report which library types will actually be built
-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
 
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
 
-aix[4-9]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+# Set options
 
-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
 
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    compiler_lib_search_dirs \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    fix_srcfile_path \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
+
+        enable_dlopen=no
+
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
     *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_shared=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
       ;;
     esac
-  done
+else
+  enable_shared=yes
+fi
 
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
 
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
-$as_echo "$as_me: creating $ofile" >&6;}
 
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
 
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
 
-# A sed program that does not truncate output.
-SED=$lt_SED
 
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# The names of the tagged configurations supported by this script.
-available_tags=
 
-# ### BEGIN LIBTOOL CONFIG
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then
+  withval=$with_pic; pic_mode="$withval"
+else
+  pic_mode=default
+fi
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+test -z "$pic_mode" && pic_mode=default
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
 
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
 
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
 
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+       IFS="$lt_save_ifs"
+       if test "X$pkg" = "X$p"; then
+         enable_fast_install=yes
+       fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
 
-# A language-specific compiler.
-CC=$lt_compiler
 
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
 
-# An ERE matcher.
-EGREP=$lt_EGREP
 
-# The linker used to build libraries.
-LD=$lt_LD
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
 
-# A BSD-compatible nm program.
-NM=$lt_NM
 
-# A symbol stripping program
-STRIP=$lt_STRIP
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
 
-# Used on cygwin: assembler.
-AS="$AS"
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
 
-# Old archive suffix (normally "a").
-libext="$libext"
 
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
 
-# Executable file suffix (normally "").
-exeext="$exeext"
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
 
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
 
-# Do we need a version for libraries?
-need_version=$need_version
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
 
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
 
-# Library versioning type.
-version_type=$version_type
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+test -z "$LN_S" && LN_S="ln -s"
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
 
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
+# Global variables:
+ofile=libtool
+can_build_shared=yes
 
-# ### END LIBTOOL CONFIG
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
 
-__EOF__
+with_gnu_ld="$lt_cv_prog_gnu_ld"
 
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
 
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
 
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
   esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
 
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-CC="$lt_save_CC"
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+       case $deplibs_check_method in
+       "file_magic "*)
+         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+           $EGREP "$file_magic_regex" > /dev/null; then
+           :
+         else
+           cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
 
+_LT_EOF
+         fi ;;
+       esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
 
-# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
-  withval=$with_tags; tagnames="$withval"
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
 
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
 
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
 
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
     IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-       ;;
-    esac
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+       case $deplibs_check_method in
+       "file_magic "*)
+         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+           $EGREP "$file_magic_regex" > /dev/null; then
+           :
+         else
+           cat <<_LT_EOF 1>&2
 
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+         fi ;;
+       esac
+      fi
+      break
     fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
 
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-      case $tagname in
-      CXX)
-       if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-           ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-           (test "X$CXX" != "Xg++"))) ; then
-         ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+  else
+    MAGIC_CMD=:
+  fi
+fi
 
+  fi
+  ;;
+esac
 
+# Use C for the default configuration in the libtool script
 
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-compiler_lib_search_dirs_CXX=
 
-# Source file extension for C++ test sources.
-ac_ext=cpp
+# Source file extension for C test sources.
+ac_ext=c
 
-# Object file extension for compiled C++ test sources.
+# Object file extension for compiled C test sources.
 objext=o
-objext_CXX=$objext
+objext=$objext
 
 # Code to be used in simple compile tests
 lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
@@ -12379,1857 +9813,1715 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
 
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$RM -r conftest*
 
 
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  $as_unset lt_cv_prog_gnu_ld
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:9863: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:9867: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
 fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 else
-  $as_unset lt_cv_path_LD
+    :
 fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
 
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
 fi
 
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
 
 
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
 
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-       test "$with_gnu_ld" != no && break
-       ;;
-      *)
-       test "$with_gnu_ld" != yes && break
-       ;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
 
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
 
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
 
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
 
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+       # AIX 5 now supports IA64 processor
+       lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
 
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
 
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-       grep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
 
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
 
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
 
-# PORTME: fill in a description of your system's C++ link characteristics
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  aix[4-9]*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-       for ld_flag in $LDFLAGS; do
-         case $ld_flag in
-         *-brtl*)
-           aix_use_runtimelinking=yes
-           break
-           ;;
-         esac
-       done
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+       # +Z the default
+       ;;
+      *)
+       lt_prog_compiler_pic='-fPIC'
        ;;
       esac
+      ;;
 
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
 
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
 
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
 
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-       collect2name=`${CC} -print-prog-name=collect2`
-       if test -f "$collect2name" && \
-          strings "$collect2name" | grep resolve_lib_name >/dev/null
-       then
-         # We have reworked collect2
-         :
-       else
-         # We have old collect2
-         hardcode_direct_CXX=unsupported
-         # It fails to find uninstalled libraries when the uninstalled
-         # path is not listed in the libpath.  Setting hardcode_minus_L
-         # to unsupported forces relinking
-         hardcode_minus_L_CXX=yes
-         hardcode_libdir_flag_spec_CXX='-L$libdir'
-         hardcode_libdir_separator_CXX=
-       fi
-       ;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-       shared_flag="$shared_flag "'${wl}-G'
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       lt_prog_compiler_pic=-Kconform_pic
       fi
-    else
-      # not using gcc
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
       if test "$host_cpu" = ia64; then
-       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-       # chokes on -Wl,-G. The following line is correct:
-       shared_flag='-G'
+       # AIX 5 now supports IA64 processor
+       lt_prog_compiler_static='-Bstatic'
       else
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag='${wl}-G'
-       else
-         shared_flag='${wl}-bM:SRE'
-       fi
+       lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
-    fi
+      ;;
 
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
 
-int
-main ()
-{
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+       # +Z the default
+       ;;
+      *)
+       lt_prog_compiler_pic='+Z'
+       ;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-       hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-       allow_undefined_flag_CXX="-z nodefs"
-       archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-fPIC'
+       lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='--shared'
+       lt_prog_compiler_static='--static'
+       ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+       # which looks to be a dead project)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-fpic'
+       lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl*)
+       # IBM XL C 8.0/Fortran 10.1 on PPC
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-qpic'
+       lt_prog_compiler_static='-qstaticlink'
+       ;;
+      *)
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C 5.9
+         lt_prog_compiler_pic='-KPIC'
+         lt_prog_compiler_static='-Bstatic'
+         lt_prog_compiler_wl='-Wl,'
+         ;;
+       *Sun\ F*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         lt_prog_compiler_pic='-KPIC'
+         lt_prog_compiler_static='-Bstatic'
+         lt_prog_compiler_wl=''
+         ;;
+       esac
+       ;;
+      esac
+      ;;
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
 
-       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-       # Warning - without using the other run time loading flags,
-       # -berok will link without error, but may produce a broken library.
-       no_undefined_flag_CXX=' ${wl}-bernotok'
-       allow_undefined_flag_CXX=' ${wl}-berok'
-       # Exported symbols can be pulled into shared objects from archives
-       whole_archive_flag_spec_CXX='$convenience'
-       archive_cmds_need_lc_CXX=yes
-       # This is similar to how AIX traditionally builds its shared libraries.
-       archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
 
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      allow_undefined_flag_CXX=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-    ;;
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
 
-  chorus*)
-    case $cc_basename in
-      *)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-    esac
-    ;;
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
 
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-       cp $export_symbols $output_objdir/$soname.def;
-      else
-       echo EXPORTS > $output_objdir/$soname.def;
-       cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-      archive_cmds_need_lc_CXX=no
-      hardcode_direct_CXX=no
-      hardcode_automatic_CXX=yes
-      hardcode_shlibpath_var_CXX=unsupported
-      whole_archive_flag_spec_CXX=''
-      link_all_deplibs_CXX=yes
-      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
-      output_verbose_link_cmd='echo'
-      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-      fi
-      else
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_CXX=no
-          ;;
+      f77* | f90* | f95*)
+       lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+       lt_prog_compiler_wl='-Wl,';;
       esac
-      fi
-        ;;
+      ;;
 
-  dgux*)
-    case $cc_basename in
-      ec++*)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      ghcx*)
-       # Green Hills C++ Compiler
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      *)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-                               # but as the default
-                               # location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
       ;;
-    aCC*)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
       ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+       lt_prog_compiler_pic='-Kconform_pic'
+       lt_prog_compiler_static='-Bstatic'
       fi
       ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_CXX=:
 
-      case $host_cpu in
-      hppa*64*|ia64*) ;;
-      *)
-       export_dynamic_flag_spec_CXX='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
       ;;
+
     *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-                                             # but as the default
-                                             # location of the library.
+      lt_prog_compiler_can_build_shared=no
       ;;
     esac
+  fi
 
-    case $cc_basename in
-      CC*)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      aCC*)
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-         ;;
-       *)
-         archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-         ;;
-       esac
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-      *)
-       if test "$GXX" = yes; then
-         if test $with_gnu_ld = no; then
-           case $host_cpu in
-           hppa*64*)
-             archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-             ;;
-           ia64*)
-             archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-             ;;
-           *)
-             archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-             ;;
-           esac
-         fi
-       else
-         # FIXME: insert proper C++ library support
-         ld_shlibs_CXX=no
-       fi
-       ;;
-    esac
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
     ;;
-  interix[3-9]*)
-    hardcode_direct_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-       # SGI C++
-       archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-       # Archives containing C++ object files must be created using
-       # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-       # necessary to make sure instantiated templates are included
-       # in the archive.
-       old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-       ;;
-      *)
-       if test "$GXX" = yes; then
-         if test "$with_gnu_ld" = no; then
-           archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-         else
-           archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-         fi
-       fi
-       link_all_deplibs_CXX=yes
-       ;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux* | k*bsd*-gnu)
-    case $cc_basename in
-      KCC*)
-       # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-       # KCC will only create a shared library if the output file
-       # ends with ".so" (or ".sl" for HP-UX), so rename the library
-       # to its proper name (with version) after linking.
-       archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-       archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-       hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-       export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-       # Archives containing C++ object files must be created using
-       # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-       old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-       ;;
-      icpc*)
-       # Intel C++
-       with_gnu_ld=yes
-       # version 8.0 and above of icpc choke on multiply defined symbols
-       # if we add $predep_objects and $postdep_objects, however 7.1 and
-       # earlier do not add the objects themselves.
-       case `$CC -V 2>&1` in
-       *"Version 7."*)
-         archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-         archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-         ;;
-       *)  # Version 8.0 or newer
-         tmp_idyn=
-         case $host_cpu in
-           ia64*) tmp_idyn=' -i_dynamic';;
-         esac
-         archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-         archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-         ;;
-       esac
-       archive_cmds_need_lc_CXX=no
-       hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-       export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-       whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-       ;;
-      pgCC* | pgcpp*)
-        # Portland Group C++ compiler
-       archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-       archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-       hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-       export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-       whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-       # Compaq C++
-       archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-       runpath_var=LD_RUN_PATH
-       hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-       hardcode_libdir_separator_CXX=:
-
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-      *)
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)
-         # Sun C++ 5.9
-         no_undefined_flag_CXX=' -zdefs'
-         archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-         archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-         hardcode_libdir_flag_spec_CXX='-R$libdir'
-         whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
-         # Not sure whether something based on
-         # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-         # would be better.
-         output_verbose_link_cmd='echo'
-
-         # Archives containing C++ object files must be created using
-         # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-         # necessary to make sure instantiated templates are included
-         # in the archive.
-         old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-         ;;
-       esac
-       ;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      *)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    ld_shlibs_CXX=no
-    ;;
-  openbsd*)
-    if test -f /usr/libexec/ld.so; then
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-       export_dynamic_flag_spec_CXX='${wl}-E'
-       whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      fi
-      output_verbose_link_cmd='echo'
-    else
-      ld_shlibs_CXX=no
-    fi
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-       # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-       # KCC will only create a shared library if the output file
-       # ends with ".so" (or ".sl" for HP-UX), so rename the library
-       # to its proper name (with version) after linking.
-       archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
-       hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-       hardcode_libdir_separator_CXX=:
 
-       # Archives containing C++ object files must be created using
-       # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-       old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 
-       ;;
-      RCC*)
-       # Rational C++ 2.4.1
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      cxx*)
-       allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-       hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-       hardcode_libdir_separator_CXX=:
-
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-      *)
-       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-         archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
-         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-         hardcode_libdir_separator_CXX=:
 
-         # Commands to make compiler produce verbose output that lists
-         # what "hidden" libraries, object files and flags are used when
-         # linking a shared library.
-         output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-       else
-         # FIXME: insert proper C++ library support
-         ld_shlibs_CXX=no
-       fi
-       ;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-       # Kuck and Associates, Inc. (KAI) C++ Compiler
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:10202: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:10206: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
 
-       # KCC will only create a shared library if the output file
-       # ends with ".so" (or ".sl" for HP-UX), so rename the library
-       # to its proper name (with version) after linking.
-       archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-       hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-       hardcode_libdir_separator_CXX=:
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
 
-       # Archives containing C++ object files must be created using
-       # the KAI C++ compiler.
-       old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-       ;;
-      RCC*)
-       # Rational C++ 2.4.1
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      cxx*)
-       allow_undefined_flag_CXX=' -expect_unresolved \*'
-       archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-         echo "-hidden">> $lib.exp~
-         $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-         $rm $lib.exp'
-
-       hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-       hardcode_libdir_separator_CXX=:
-
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
-       #
-       # There doesn't appear to be a way to prevent this compiler from
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
-       output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-      *)
-       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-        archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+fi
 
-         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-         hardcode_libdir_separator_CXX=:
 
-         # Commands to make compiler produce verbose output that lists
-         # what "hidden" libraries, object files and flags are used when
-         # linking a shared library.
-         output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 
-       else
-         # FIXME: insert proper C++ library support
-         ld_shlibs_CXX=no
-       fi
-       ;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-       # Sun C++ 4.x
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      lcc*)
-       # Lucid
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      *)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-       # Sun C++ 4.2, 5.x and Centerline C++
-        archive_cmds_need_lc_CXX=yes
-       no_undefined_flag_CXX=' -zdefs'
-       archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-       archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-       $CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-       hardcode_libdir_flag_spec_CXX='-R$libdir'
-       hardcode_shlibpath_var_CXX=no
-       case $host_os in
-         solaris2.[0-5] | solaris2.[0-5].*) ;;
-         *)
-           # The compiler driver will combine and reorder linker options,
-           # but understands `-z linker_flag'.
-           # Supported since Solaris 2.6 (maybe 2.5.1?)
-           whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-           ;;
-       esac
-       link_all_deplibs_CXX=yes
 
-       output_verbose_link_cmd='echo'
 
-       # Archives containing C++ object files must be created using
-       # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-       # necessary to make sure instantiated templates are included
-       # in the archive.
-       old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-       ;;
-      gcx*)
-       # Green Hills C++ Compiler
-       archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
-       # The C++ compiler must be used to create the archive.
-       old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-       ;;
-      *)
-       # GNU C++ compiler with Solaris linker
-       if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-         if $CC --version | grep -v '^2\.7' > /dev/null; then
-           archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-           archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-               $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
 
-           # Commands to make compiler produce verbose output that lists
-           # what "hidden" libraries, object files and flags are used when
-           # linking a shared library.
-           output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-         else
-           # g++ 2.7 appears to require `-G' NOT `-shared' on this
-           # platform.
-           archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-           archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-               $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-           # Commands to make compiler produce verbose output that lists
-           # what "hidden" libraries, object files and flags are used when
-           # linking a shared library.
-           output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-         fi
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
 
-         hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-         case $host_os in
-         solaris2.[0-5] | solaris2.[0-5].*) ;;
-         *)
-           whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-           ;;
-         esac
-       fi
-       ;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-    no_undefined_flag_CXX='${wl}-z,text'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-       archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       ;;
-      *)
-       archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       ;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    no_undefined_flag_CXX='${wl}-z,text'
-    allow_undefined_flag_CXX='${wl}-z,nodefs'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-    export_dynamic_flag_spec_CXX='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-       archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       ;;
-      *)
-       archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       ;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-       # NonStop-UX NCC 3.20
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-      *)
-       # FIXME: insert proper C++ library support
-       ld_shlibs_CXX=no
-       ;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
 
-GCC_CXX="$GXX"
-LD_CXX="$LD"
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
 
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
 
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
 
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-         || test $p = "-R"; then
-        prev=$p
-        continue
-       else
-        prev=
-       fi
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:10307: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:10311: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
 
-       if test "$pre_test_object_deps_done" = no; then
-        case $p in
-        -L* | -R*)
-          # Internal compiler library paths should come after those
-          # provided the user.  The postdeps already come after the
-          # user supplied libs so there is no need to process them.
-          if test -z "$compiler_lib_search_path_CXX"; then
-            compiler_lib_search_path_CXX="${prev}${p}"
-          else
-            compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-          fi
-          ;;
-        # The "-l" case would never come before the object being
-        # linked, so don't bother handling this case.
-        esac
-       else
-        if test -z "$postdeps_CXX"; then
-          postdeps_CXX="${prev}${p}"
-        else
-          postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-        fi
-       fi
-       ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-        pre_test_object_deps_done=yes
-        continue
-       fi
 
-       if test "$pre_test_object_deps_done" = no; then
-        if test -z "$predep_objects_CXX"; then
-          predep_objects_CXX="$p"
-        else
-          predep_objects_CXX="$predep_objects_CXX $p"
-        fi
-       else
-        if test -z "$postdep_objects_CXX"; then
-          postdep_objects_CXX="$p"
-        else
-          postdep_objects_CXX="$postdep_objects_CXX $p"
-        fi
-       fi
-       ;;
 
-    *) ;; # Ignore the rest.
 
-    esac
-  done
 
-  # Clean up.
-  rm -f a.out a.exe
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  echo "libtool.m4: error: problem compiling CXX test program"
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:10362: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:10366: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
 
-$rm -f confest.$objext
 
-compiler_lib_search_dirs_CXX=
-if test -n "$compiler_lib_search_path_CXX"; then
-  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
 fi
 
-# PORTME: override above test on systems where it is broken
-case $host_os in
-interix[3-9]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
 
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-    #
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
 
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
 
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
+
+
+  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
   esac
-  ;;
-esac
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
 
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
+  ld_shlibs=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
 
+    # See if GNU ld supports shared libraries.
     case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static_CXX='-Bstatic'
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+       ld_shlibs=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
       fi
       ;;
+
     amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
       ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       allow_undefined_flag=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+       # support --undefined.  This deserves some investigation.  FIXME
+       archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+       ld_shlibs=no
+      fi
       ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname.def;
+       else
+         echo EXPORTS > $output_objdir/$soname.def;
+         cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+       ld_shlibs=no
+      fi
       ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
+
+    gnu* | linux* | tpf* | k*bsd*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+       case $cc_basename in
+         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
+       esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+        && test "$tmp_diet" = no
+      then
+       tmp_addflag=
+       tmp_sharedflag='-shared'
+       case $cc_basename,$host_cpu in
+        pgcc*)                         # Portland Group C compiler
+         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag'
+         ;;
+       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
+         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag -Mnomain' ;;
+       ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
+         tmp_addflag=' -i_dynamic' ;;
+       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
+         tmp_addflag=' -i_dynamic -nofor_main' ;;
+       ifc* | ifort*)                  # Intel Fortran compiler
+         tmp_addflag=' -nofor_main' ;;
+       lf95*)                          # Lahey Fortran 8.1
+         whole_archive_flag_spec=
+         tmp_sharedflag='--shared' ;;
+       xl[cC]*)                        # IBM XL C 8.0 on PPC (deal with xlf below)
+         tmp_sharedflag='-qmkshrobj'
+         tmp_addflag= ;;
+       esac
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+         compiler_needs_object=yes
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       esac
+       archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+           cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+           echo "local: *; };" >> $output_objdir/$libname.ver~
+           $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+       case $cc_basename in
+       xlf*)
+         # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+         whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+         hardcode_libdir_flag_spec=
+         hardcode_libdir_flag_spec_ld='-rpath $libdir'
+         archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+         if test "x$supports_anon_versioning" = xyes; then
+           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+             cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+             echo "local: *; };" >> $output_objdir/$libname.ver~
+             $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+         fi
+         ;;
+       esac
+      else
+        ld_shlibs=no
+      fi
       ;;
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+      else
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
       ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       lt_prog_compiler_pic_CXX=-Kconform_pic
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+       ld_shlibs=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       ld_shlibs=no
       fi
       ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+       ld_shlibs=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
        ;;
-      *)
-       lt_prog_compiler_pic_CXX='-fPIC'
+       *)
+         # For security reasons, it is highly recommended that you always
+         # use absolute paths for naming shared libraries, and exclude the
+         # DT_RUNPATH tag from executables and libraries.  But doing so
+         # requires that you compile everything twice, which is a pain.
+         if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+           hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+           archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+           archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+         else
+           ld_shlibs=no
+         fi
        ;;
       esac
       ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
     *)
-      lt_prog_compiler_pic_CXX='-fPIC'
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       ld_shlibs=no
+      fi
       ;;
     esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
   else
+    # PORTME fill in a description of your system's linker (not GNU ld)
     case $host_os in
-      aix[4-9]*)
-       # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
-         # AIX 5 now supports IA64 processor
-         lt_prog_compiler_static_CXX='-Bstatic'
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+       # Neither direct hardcoding nor static linking is supported with a
+       # broken collect2.
+       hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+       aix_use_runtimelinking=no
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+      else
+       # If we're using GNU nm, then we don't want the "-C" option.
+       # -C means demangle to AIX nm, but means don't demangle with GNU nm
+       if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+         export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
        else
-         lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+         export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
        fi
-       ;;
-      chorus*)
-       case $cc_basename in
-       cxch68*)
-         # Green Hills C++ Compiler
-         # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-         ;;
-       esac
-       ;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           lt_prog_compiler_pic_CXX='-qnocommon'
-           lt_prog_compiler_wl_CXX='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-       case $cc_basename in
-         ec++*)
-           lt_prog_compiler_pic_CXX='-KPIC'
-           ;;
-         ghcx*)
-           # Green Hills C++ Compiler
-           lt_prog_compiler_pic_CXX='-pic'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      freebsd* | dragonfly*)
-       # FreeBSD uses GNU C++
-       ;;
-      hpux9* | hpux10* | hpux11*)
-       case $cc_basename in
-         CC*)
-           lt_prog_compiler_wl_CXX='-Wl,'
-           lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-           if test "$host_cpu" != ia64; then
-             lt_prog_compiler_pic_CXX='+Z'
-           fi
-           ;;
-         aCC*)
-           lt_prog_compiler_wl_CXX='-Wl,'
-           lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-           case $host_cpu in
-           hppa*64*|ia64*)
-             # +Z the default
-             ;;
-           *)
-             lt_prog_compiler_pic_CXX='+Z'
-             ;;
-           esac
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      interix*)
-       # This is c89, which is MS Visual C++ (no shared libs)
-       # Anyone wants to do a port?
-       ;;
-      irix5* | irix6* | nonstopux*)
-       case $cc_basename in
-         CC*)
-           lt_prog_compiler_wl_CXX='-Wl,'
-           lt_prog_compiler_static_CXX='-non_shared'
-           # CC pic flag -KPIC is the default.
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      linux* | k*bsd*-gnu)
-       case $cc_basename in
-         KCC*)
-           # KAI C++ Compiler
-           lt_prog_compiler_wl_CXX='--backend -Wl,'
-           lt_prog_compiler_pic_CXX='-fPIC'
-           ;;
-         icpc* | ecpc*)
-           # Intel C++
-           lt_prog_compiler_wl_CXX='-Wl,'
-           lt_prog_compiler_pic_CXX='-KPIC'
-           lt_prog_compiler_static_CXX='-static'
-           ;;
-         pgCC* | pgcpp*)
-           # Portland Group C++ compiler.
-           lt_prog_compiler_wl_CXX='-Wl,'
-           lt_prog_compiler_pic_CXX='-fpic'
-           lt_prog_compiler_static_CXX='-Bstatic'
-           ;;
-         cxx*)
-           # Compaq C++
-           # Make sure the PIC flag is empty.  It appears that all Alpha
-           # Linux and Compaq Tru64 Unix objects are PIC.
-           lt_prog_compiler_pic_CXX=
-           lt_prog_compiler_static_CXX='-non_shared'
-           ;;
-         *)
-           case `$CC -V 2>&1 | sed 5q` in
-           *Sun\ C*)
-             # Sun C++ 5.9
-             lt_prog_compiler_pic_CXX='-KPIC'
-             lt_prog_compiler_static_CXX='-Bstatic'
-             lt_prog_compiler_wl_CXX='-Qoption ld '
-             ;;
-           esac
-           ;;
-       esac
-       ;;
-      lynxos*)
-       ;;
-      m88k*)
-       ;;
-      mvs*)
-       case $cc_basename in
-         cxx*)
-           lt_prog_compiler_pic_CXX='-W c,exportall'
-           ;;
-         *)
-           ;;
+       aix_use_runtimelinking=no
+
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+         for ld_flag in $LDFLAGS; do
+         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+           aix_use_runtimelinking=yes
+           break
+         fi
+         done
+         ;;
        esac
-       ;;
-      netbsd*)
-       ;;
-      osf3* | osf4* | osf5*)
-       case $cc_basename in
-         KCC*)
-           lt_prog_compiler_wl_CXX='--backend -Wl,'
-           ;;
-         RCC*)
-           # Rational C++ 2.4.1
-           lt_prog_compiler_pic_CXX='-pic'
-           ;;
-         cxx*)
-           # Digital/Compaq C++
-           lt_prog_compiler_wl_CXX='-Wl,'
-           # Make sure the PIC flag is empty.  It appears that all Alpha
-           # Linux and Compaq Tru64 Unix objects are PIC.
-           lt_prog_compiler_pic_CXX=
-           lt_prog_compiler_static_CXX='-non_shared'
-           ;;
-         *)
-           ;;
+
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+       case $host_os in aix4.[012]|aix4.[012].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+         collect2name=`${CC} -print-prog-name=collect2`
+         if test -f "$collect2name" &&
+          strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+         then
+         # We have reworked collect2
+         :
+         else
+         # We have old collect2
+         hardcode_direct=unsupported
+         # It fails to find uninstalled libraries when the uninstalled
+         # path is not listed in the libpath.  Setting hardcode_minus_L
+         # to unsupported forces relinking
+         hardcode_minus_L=yes
+         hardcode_libdir_flag_spec='-L$libdir'
+         hardcode_libdir_separator=
+         fi
+         ;;
        esac
-       ;;
-      psos*)
-       ;;
-      solaris*)
-       case $cc_basename in
-         CC*)
-           # Sun C++ 4.2, 5.x and Centerline C++
-           lt_prog_compiler_pic_CXX='-KPIC'
-           lt_prog_compiler_static_CXX='-Bstatic'
-           lt_prog_compiler_wl_CXX='-Qoption ld '
-           ;;
-         gcx*)
-           # Green Hills C++ Compiler
-           lt_prog_compiler_pic_CXX='-PIC'
-           ;;
-         *)
-           ;;
+       shared_flag='-shared'
+       if test "$aix_use_runtimelinking" = yes; then
+         shared_flag="$shared_flag "'${wl}-G'
+       fi
+      else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+       # chokes on -Wl,-G. The following line is correct:
+         shared_flag='-G'
+       else
+         if test "$aix_use_runtimelinking" = yes; then
+           shared_flag='${wl}-G'
+         else
+           shared_flag='${wl}-bM:SRE'
+         fi
+       fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+       allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+         hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+         allow_undefined_flag="-z nodefs"
+         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+       else
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+         # Warning - without using the other run time loading flags,
+         # -berok will link without error, but may produce a broken library.
+         no_undefined_flag=' ${wl}-bernotok'
+         allow_undefined_flag=' ${wl}-berok'
+         # Exported symbols can be pulled into shared objects from archives
+         whole_archive_flag_spec='$convenience'
+         archive_cmds_need_lc=yes
+         # This is similar to how AIX traditionally builds its shared libraries.
+         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  whole_archive_flag_spec=''
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+       archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+       archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+       hardcode_libdir_flag_spec_ld='+b $libdir'
+       hardcode_libdir_separator=:
+       hardcode_direct=yes
+       hardcode_direct_absolute=yes
+       export_dynamic_flag_spec='${wl}-E'
+       # hardcode_minus_L: Not really in the search PATH,
+       # but as the default location of the library.
+       hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       case $host_cpu in
+       hppa*64*)
+         archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
        esac
-       ;;
-      sunos4*)
-       case $cc_basename in
-         CC*)
-           # Sun C++ 4.x
-           lt_prog_compiler_pic_CXX='-pic'
-           lt_prog_compiler_static_CXX='-Bstatic'
-           ;;
-         lcc*)
-           # Lucid
-           lt_prog_compiler_pic_CXX='-pic'
-           ;;
-         *)
-           ;;
+      else
+       case $host_cpu in
+       hppa*64*)
+         archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
        esac
-       ;;
-      tandem*)
-       case $cc_basename in
-         NCC*)
-           # NonStop-UX NCC 3.20
-           lt_prog_compiler_pic_CXX='-KPIC'
-           ;;
-         *)
-           ;;
+      fi
+      if test "$with_gnu_ld" = no; then
+       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+       hardcode_libdir_separator=:
+
+       case $host_cpu in
+       hppa*64*|ia64*)
+         hardcode_direct=no
+         hardcode_shlibpath_var=no
+         ;;
+       *)
+         hardcode_direct=yes
+         hardcode_direct_absolute=yes
+         export_dynamic_flag_spec='${wl}-E'
+
+         # hardcode_minus_L: Not really in the search PATH,
+         # but as the default location of the library.
+         hardcode_minus_L=yes
+         ;;
        esac
-       ;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-       case $cc_basename in
-         CC*)
-           lt_prog_compiler_wl_CXX='-Wl,'
-           lt_prog_compiler_pic_CXX='-KPIC'
-           lt_prog_compiler_static_CXX='-Bstatic'
-           ;;
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       # Try to use the -exported_symbol ld option, if it does not
+       # work, assume that -exports_file does not work either and
+       # implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS="$save_LDFLAGS"
+      else
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+       archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       hardcode_direct_absolute=yes
+       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+         export_dynamic_flag_spec='${wl}-E'
+       else
+         case $host_os in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+            hardcode_libdir_flag_spec='-R$libdir'
+            ;;
+          *)
+            archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+            ;;
+         esac
+       fi
+      else
+       ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+       allow_undefined_flag=' -expect_unresolved \*'
+       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)     # as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+       allow_undefined_flag=' -expect_unresolved \*'
+       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+       archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+       $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+       # Both c and cxx compiler support -rpath directly
+       hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+       wlarc='${wl}'
+       archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+         $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+       case `$CC -V 2>&1` in
+       *"Compilers 5.0"*)
+         wlarc=''
+         archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+         $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+         ;;
+       *)
+         wlarc='${wl}'
+         archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+         $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+         ;;
        esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+       # The compiler driver will combine and reorder linker options,
+       # but understands `-z linker_flag'.  GCC discards it without `$wl',
+       # but is careful enough not to reorder.
+       # Supported since Solaris 2.6 (maybe 2.5.1?)
+       if test "$GCC" = yes; then
+         whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+       else
+         whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+       fi
        ;;
-      vxworks*)
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+       # Use $CC to link under sequent, because it throws in some extra .o
+       # files that make .init and .fini sections work.
+       archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+       sni)
+         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         hardcode_direct=yes # is this really true???
        ;;
-      *)
-       lt_prog_compiler_can_build_shared_CXX=no
+       siemens)
+         ## LD is ld it makes a PLAMLIB
+         ## CC just makes a GrossModule.
+         archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+         reload_cmds='$CC -r -o $output$reload_objs'
+         hardcode_direct=no
+        ;;
+       motorola)
+         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         hardcode_direct=no #Motorola manual says yes, but my tests say they lie
        ;;
-    esac
-  fi
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
 
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
 
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_shlibpath_var=no
+       runpath_var=LD_RUN_PATH
+       hardcode_runpath_var=yes
+       ld_shlibs=yes
+      fi
+      ;;
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14037: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:14041: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+       archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+       archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+       export_dynamic_flag_spec='${wl}-Blargedynsym'
+       ;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
 
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
 
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
 
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
 
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14141: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:14145: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
 
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[4-9]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
 # Do we need to explicitly link libc?
 #
-case "x$archive_cmds_need_lc_CXX" in
+case "x$archive_cmds_need_lc" in
 x|xyes)
   # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
+  archive_cmds_need_lc=yes
 
   if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
+    case $archive_cmds in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
       ;;
@@ -14239,7 +11531,7 @@ x|xyes)
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $rm conftest*
+      $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -14251,5211 +11543,3992 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         lib=conftest
         libobjs=conftest.$ac_objext
         deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-       pic_flag=$lt_prog_compiler_pic_CXX
+        wl=$lt_prog_compiler_wl
+       pic_flag=$lt_prog_compiler_pic
         compiler_flags=-v
         linker_flags=-v
         verstring=
         output_objdir=.
         libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+        lt_save_allow_undefined_flag=$allow_undefined_flag
+        allow_undefined_flag=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-        then
-         archive_cmds_need_lc_CXX=no
-        else
-         archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-          echo ' yes '
-          echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-       :
-      else
-       can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
+        then
+         archive_cmds_need_lc=no
+        else
+         archive_cmds_need_lc=yes
+        fi
+        allow_undefined_flag=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
+      ;;
+    esac
   fi
   ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
 
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
 
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
 
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
 
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
 
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
 
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
 
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
 
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
 
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
 
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
 
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
 
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-       if test "$lt_cv_prog_gnu_ld" = yes; then
-               version_type=linux
-       else
-               version_type=irix
-       fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
 
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[     ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
 
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
 
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
 
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
 
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
 
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-       shlibpath_overrides_runpath=no
-       ;;
-      *)
-       shlibpath_overrides_runpath=yes
-       ;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
 
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
 
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
 
-rdos*)
-  dynamic_linker=no
-  ;;
 
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
 
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
 
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
 
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
 
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
 
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
 
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
 
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
 
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var_CXX" || \
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
 
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
 
 
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    compiler_lib_search_dirs_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    fix_srcfile_path_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
 
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
 
-cfgfile="$ofile"
 
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
 
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
 
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
 
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
 
-# A C compiler.
-LTCC=$lt_LTCC
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
 
-# A language-specific compiler.
-CC=$lt_compiler_CXX
 
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
 
-# An ERE matcher.
-EGREP=$lt_EGREP
 
-# The linker used to build libraries.
-LD=$lt_LD_CXX
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
 
-# A BSD-compatible nm program.
-NM=$lt_NM
 
-# A symbol stripping program
-STRIP=$lt_STRIP
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
 
-# Used on cygwin: assembler.
-AS="$AS"
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
 
-# Old archive suffix (normally "a").
-libext="$libext"
 
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
 
-# Executable file suffix (normally "").
-exeext="$exeext"
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
 
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
 
-# Do we need a version for libraries?
-need_version=$need_version
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
 
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
 
-# Library versioning type.
-version_type=$version_type
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
 
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
 
-# ### END LIBTOOL TAG CONFIG: $tagname
 
-__EOF__
 
 
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
+
+  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
 
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+          echo ' yes '
+          echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+       :
+      else
+       can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
 
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
 
-       else
-         tagname=""
-       fi
-       ;;
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
 
-      F77)
-       if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
 
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
-      program t
-      end
-"
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
 
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
+freebsd1*)
+  dynamic_linker=no
+  ;;
 
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
 
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
 
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
 
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+       if test "$lt_cv_prog_gnu_ld" = yes; then
+               version_type=linux
+       else
+               version_type=irix
+       fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
   esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix[4-9]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
   ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
 
-GCC_F77="$G77"
-LD_F77="$LD"
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
+int
+main ()
+{
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+  shlibpath_overrides_runpath=yes
+fi
 
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
 
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
+fi
 
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
 
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[      ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
 
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
 
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
 
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic_F77='-fPIC'
-       ;;
-      esac
-      ;;
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
 
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static_F77='-Bstatic'
-      else
-       lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_F77='-qnocommon'
-         lt_prog_compiler_wl_F77='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic_F77='+Z'
+      openbsd2.[89] | openbsd2.[89].*)
+       shlibpath_overrides_runpath=no
        ;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-       lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_pic_F77='-KPIC'
-       lt_prog_compiler_static_F77='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-       # which looks to be a dead project)
-       lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_pic_F77='-fpic'
-       lt_prog_compiler_static_F77='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
       *)
-        case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)
-         # Sun C 5.9
-         lt_prog_compiler_pic_F77='-KPIC'
-         lt_prog_compiler_static_F77='-Bstatic'
-         lt_prog_compiler_wl_F77='-Wl,'
-         ;;
-       *Sun\ F*)
-         # Sun Fortran 8.3 passes all unrecognized flags to the linker
-         lt_prog_compiler_pic_F77='-KPIC'
-         lt_prog_compiler_static_F77='-Bstatic'
-         lt_prog_compiler_wl_F77=''
-         ;;
-       esac
+       shlibpath_overrides_runpath=yes
        ;;
       esac
-      ;;
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
 
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
 
-    rdos*)
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
 
-    solaris*)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-       lt_prog_compiler_wl_F77='-Qoption ld ';;
-      *)
-       lt_prog_compiler_wl_F77='-Wl,';;
-      esac
-      ;;
+rdos*)
+  dynamic_linker=no
+  ;;
 
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-       lt_prog_compiler_pic_F77='-Kconform_pic'
-       lt_prog_compiler_static_F77='-Bstatic'
-      fi
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
       ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
+    siemens)
+      need_lib_prefix=no
       ;;
-
-    unicos*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_can_build_shared_F77=no
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
       ;;
+  esac
+  ;;
 
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
 
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+       ;;
     esac
   fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
 
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-$as_echo "$lt_prog_compiler_pic_F77" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15724: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:15728: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
 
-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
+*)
+  dynamic_linker=no
+  ;;
 esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
 
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_F77=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_F77=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_F77=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
-    :
-else
-    lt_prog_compiler_static_F77=
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15828: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:15832: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
 
-  ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
 
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-       whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-       whole_archive_flag_spec_F77=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
 
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-       ld_shlibs_F77=no
-       cat <<EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
 
-EOF
-      fi
-      ;;
 
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
 
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       allow_undefined_flag_F77=unsupported
-       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-       # support --undefined.  This deserves some investigation.  FIXME
-       archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-       ld_shlibs_F77=no
-      fi
-      ;;
 
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname.def;
-       else
-         echo EXPORTS > $output_objdir/$soname.def;
-         cat $export_symbols >> $output_objdir/$soname.def;
-       fi~
-       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-       ld_shlibs_F77=no
-      fi
-      ;;
 
-    interix[3-9]*)
-      hardcode_direct_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_F77='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
 
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       tmp_addflag=
-       case $cc_basename,$host_cpu in
-       pgcc*)                          # Portland Group C compiler
-         whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag'
-         ;;
-       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
-         whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag -Mnomain' ;;
-       ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
-         tmp_addflag=' -i_dynamic' ;;
-       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-         tmp_addflag=' -i_dynamic -nofor_main' ;;
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
-       esac
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)                       # Sun C 5.9
-         whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_sharedflag='-G' ;;
-       *Sun\ F*)                       # Sun Fortran 8.3
-         tmp_sharedflag='-G' ;;
-       *)
-         tmp_sharedflag='-shared' ;;
-       esac
-       archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
-       if test $supports_anon_versioning = yes; then
-         archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-       fi
-      else
-       ld_shlibs_F77=no
-      fi
-      ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-      else
-       archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
 
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-       ld_shlibs_F77=no
-       cat <<EOF 1>&2
 
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
 
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs_F77=no
-      fi
-      ;;
 
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-       ld_shlibs_F77=no
-       cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
 
-_LT_EOF
-       ;;
-       *)
-         if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-           hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-           archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-           archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-         else
-           ld_shlibs_F77=no
-         fi
-       ;;
-      esac
-      ;;
 
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs_F77=no
-      fi
-      ;;
-    esac
 
-    if test "$ld_shlibs_F77" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_F77=
-      export_dynamic_flag_spec_F77=
-      whole_archive_flag_spec_F77=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-       # Neither direct hardcoding nor static linking is supported with a
-       # broken collect2.
-       hardcode_direct_F77=unsupported
-      fi
-      ;;
 
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-       aix_use_runtimelinking=no
-       exp_sym_flag='-Bexport'
-       no_entry_flag=""
-      else
-       # If we're using GNU nm, then we don't want the "-C" option.
-       # -C means demangle to AIX nm, but means don't demangle with GNU nm
-       if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-         export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-       else
-         export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-       fi
-       aix_use_runtimelinking=no
 
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-         for ld_flag in $LDFLAGS; do
-         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-           aix_use_runtimelinking=yes
-           break
-         fi
-         done
-         ;;
-       esac
 
-       exp_sym_flag='-bexport'
-       no_entry_flag='-bnoentry'
-      fi
 
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
 
-      if test "$GCC" = yes; then
-       case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
-         collect2name=`${CC} -print-prog-name=collect2`
-         if test -f "$collect2name" && \
-          strings "$collect2name" | grep resolve_lib_name >/dev/null
-         then
-         # We have reworked collect2
-         :
-         else
-         # We have old collect2
-         hardcode_direct_F77=unsupported
-         # It fails to find uninstalled libraries when the uninstalled
-         # path is not listed in the libpath.  Setting hardcode_minus_L
-         # to unsupported forces relinking
-         hardcode_minus_L_F77=yes
-         hardcode_libdir_flag_spec_F77='-L$libdir'
-         hardcode_libdir_separator_F77=
-         fi
-         ;;
-       esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
-      else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-       # chokes on -Wl,-G. The following line is correct:
-         shared_flag='-G'
-       else
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag='${wl}-G'
-         else
-           shared_flag='${wl}-bM:SRE'
-         fi
-       fi
-      fi
 
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
-       # Warning - without using the other runtime loading flags (-brtl),
-       # -berok will link without error, but may produce a broken library.
-       allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
 
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_f77_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-       archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-       if test "$host_cpu" = ia64; then
-         hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-         allow_undefined_flag_F77="-z nodefs"
-         archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
-        # Determine the default libpath from the value encoded in an empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
-      program main
 
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_f77_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-         # Warning - without using the other run time loading flags,
-         # -berok will link without error, but may produce a broken library.
-         no_undefined_flag_F77=' ${wl}-bernotok'
-         allow_undefined_flag_F77=' ${wl}-berok'
-         # Exported symbols can be pulled into shared objects from archives
-         whole_archive_flag_spec_F77='$convenience'
-         archive_cmds_need_lc_F77=yes
-         # This is similar to how AIX traditionally builds its shared libraries.
-         archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-      fi
-      ;;
 
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
 
-    bsdi[45]*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
 
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
 
-    darwin* | rhapsody*)
-      allow_undefined_flag_F77="$_lt_dar_allow_undefined"
-      archive_cmds_need_lc_F77=no
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77=''
-      link_all_deplibs_F77=yes
-    if test "$GCC" = yes ; then
-       output_verbose_link_cmd='echo'
-        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_F77=no
-          ;;
-      esac
-    fi
-      ;;
 
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
 
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    hpux9*)
-      if test "$GCC" = yes; then
-       archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-       archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
 
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
 
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator_F77=:
 
-       hardcode_direct_F77=yes
-       export_dynamic_flag_spec_F77='${wl}-E'
 
-       # hardcode_minus_L: Not really in the search PATH,
-       # but as the default location of the library.
-       hardcode_minus_L_F77=yes
-      fi
-      ;;
 
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      else
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator_F77=:
 
-       case $host_cpu in
-       hppa*64*|ia64*)
-         hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-         hardcode_direct_F77=no
-         hardcode_shlibpath_var_F77=no
-         ;;
-       *)
-         hardcode_direct_F77=yes
-         export_dynamic_flag_spec_F77='${wl}-E'
 
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         hardcode_minus_L_F77=yes
-         ;;
-       esac
-      fi
-      ;;
 
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-       archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-       archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-       hardcode_direct_F77=yes
-       hardcode_shlibpath_var_F77=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-         archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-         archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-         hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-         export_dynamic_flag_spec_F77='${wl}-E'
-       else
-         case $host_os in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-            hardcode_libdir_flag_spec_F77='-R$libdir'
-            ;;
-          *)
-            archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-            hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-            ;;
-         esac
-        fi
-      else
-       ld_shlibs_F77=no
-      fi
-      ;;
 
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
 
-    osf3*)
-      if test "$GCC" = yes; then
-       allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       allow_undefined_flag_F77=' -expect_unresolved \*'
-       archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
 
-    osf4* | osf5*)     # as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-       allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-       allow_undefined_flag_F77=' -expect_unresolved \*'
-       archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-       $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
-       # Both c and cxx compiler support -rpath directly
-       hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
 
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-       wlarc='${wl}'
-       archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-         $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-       wlarc=''
-       archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-       $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-       # The compiler driver will combine and reorder linker options,
-       # but understands `-z linker_flag'.  GCC discards it without `$wl',
-       # but is careful enough not to reorder.
-       # Supported since Solaris 2.6 (maybe 2.5.1?)
-       if test "$GCC" = yes; then
-         whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-       else
-         whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
-       fi
-       ;;
-      esac
-      link_all_deplibs_F77=yes
-      ;;
 
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-       # Use $CC to link under sequent, because it throws in some extra .o
-       # files that make .init and .fini sections work.
-       archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    sysv4)
-      case $host_vendor in
-       sni)
-         archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct_F77=yes # is this really true???
-       ;;
-       siemens)
-         ## LD is ld it makes a PLAMLIB
-         ## CC just makes a GrossModule.
-         archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-         reload_cmds_F77='$CC -r -o $output$reload_objs'
-         hardcode_direct_F77=no
-        ;;
-       motorola)
-         archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-       ;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       hardcode_shlibpath_var_F77=no
-       runpath_var=LD_RUN_PATH
-       hardcode_runpath_var=yes
-       ld_shlibs_F77=yes
-      fi
-      ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_F77='${wl}-z,text'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-       archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
 
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_F77='${wl}-z,text'
-      allow_undefined_flag_F77='${wl}-z,nodefs'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-       archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
 
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-$as_echo "$ld_shlibs_F77" >&6; }
-test "$ld_shlibs_F77" = no && can_build_shared=no
 
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-       pic_flag=$lt_prog_compiler_pic_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-         archive_cmds_need_lc_F77=no
-        else
-         archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-$as_echo "$archive_cmds_need_lc_F77" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+       ac_cv_lib_dl_dlopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
+if test "${ac_cv_func_shl_load+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef shl_load
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_shl_load || defined __stub___shl_load
+choke me
+#endif
+
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_shl_load=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-need_lib_prefix=unknown
-hardcode_into_libs=no
+       ac_cv_func_shl_load=no
+fi
 
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
+       ac_cv_lib_dld_shl_load=no
+fi
 
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-          echo ' yes '
-          echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-       :
-      else
-       can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
+if test "${ac_cv_func_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
 
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
+#undef dlopen
 
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_dlopen || defined __stub___dlopen
+choke me
+#endif
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
+       ac_cv_func_dlopen=no
+fi
 
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
+       ac_cv_lib_dl_dlopen=no
+fi
 
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
+       ac_cv_lib_svld_dlopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dld_dld_link=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
+       ac_cv_lib_dld_dld_link=no
+fi
 
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
 
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
 
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-       if test "$lt_cv_prog_gnu_ld" = yes; then
-               version_type=linux
-       else
-               version_type=irix
-       fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
+fi
 
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
+fi
 
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[     ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
 
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
+fi
 
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
 
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
+fi
 
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
 
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+fi
+
+    ;;
   esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-       shlibpath_overrides_runpath=no
-       ;;
-      *)
-       shlibpath_overrides_runpath=yes
-       ;;
-      esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
   else
-    shlibpath_overrides_runpath=yes
+    enable_dlopen=no
   fi
-  ;;
 
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
 
-rdos*)
-  dynamic_linker=no
-  ;;
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+         if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 13162 "configure"
+#include "confdefs.h"
 
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
 
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
+#include <stdio.h>
 
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL          RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL                DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL                0
+#  endif
+#endif
 
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW         DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW       RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW     DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW     0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
   else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
     esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
   fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
+fi
+rm -fr conftest*
 
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self_static+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+         if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 13258 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL          RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL                DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL                0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW         DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW       RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW     DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW     0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
 fi
+rm -fr conftest*
 
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
 
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var_F77" || \
-   test "X$hardcode_automatic_F77" = "Xyes" ; then
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
 
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-$as_echo "$hardcode_action_F77" >&6; }
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
 
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
 fi
 
 
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    compiler_lib_search_dirs_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    fix_srcfile_path_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
 
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
 
-cfgfile="$ofile"
 
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
 
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
 
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
 
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
 
-# A C compiler.
-LTCC=$lt_LTCC
+striplib=
+old_striplib=
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
 
-# A language-specific compiler.
-CC=$lt_compiler_F77
 
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
 
-# An ERE matcher.
-EGREP=$lt_EGREP
 
-# The linker used to build libraries.
-LD=$lt_LD_F77
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
 
-# A BSD-compatible nm program.
-NM=$lt_NM
 
-# A symbol stripping program
-STRIP=$lt_STRIP
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
 
-# Used on cygwin: assembler.
-AS="$AS"
+  # Report which library types will actually be built
+  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
+  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
-# Old archive suffix (normally "a").
-libext="$libext"
 
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
 
-# Executable file suffix (normally "").
-exeext="$exeext"
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
+fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
+CC="$lt_save_CC"
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
 
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
 
-# Do we need a version for libraries?
-need_version=$need_version
+# Source file extension for C++ test sources.
+ac_ext=cpp
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
 
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
 
-# Library versioning type.
-version_type=$version_type
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+# Allow CC to be a program name with arguments.
+compiler=$CC
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  compiler_CXX=$CC
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+       ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+       test "$with_gnu_ld" != no && break
+       ;;
+      *)
+       test "$with_gnu_ld" != yes && break
+       ;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+         $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+           for ld_flag in $LDFLAGS; do
+             case $ld_flag in
+             *-brtl*)
+               aix_use_runtimelinking=yes
+               break
+               ;;
+             esac
+           done
+           ;;
+          esac
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+         collect2name=`${CC} -print-prog-name=collect2`
+         if test -f "$collect2name" &&
+            strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+         then
+           # We have reworked collect2
+           :
+         else
+           # We have old collect2
+           hardcode_direct_CXX=unsupported
+           # It fails to find uninstalled libraries when the uninstalled
+           # path is not listed in the libpath.  Setting hardcode_minus_L
+           # to unsupported forces relinking
+           hardcode_minus_L_CXX=yes
+           hardcode_libdir_flag_spec_CXX='-L$libdir'
+           hardcode_libdir_separator_CXX=
+         fi
+          esac
+          shared_flag='-shared'
+         if test "$aix_use_runtimelinking" = yes; then
+           shared_flag="$shared_flag "'${wl}-G'
+         fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+         # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+         # chokes on -Wl,-G. The following line is correct:
+         shared_flag='-G'
+          else
+           if test "$aix_use_runtimelinking" = yes; then
+             shared_flag='${wl}-G'
+           else
+             shared_flag='${wl}-bM:SRE'
+           fi
+          fi
+        fi
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+       # export.
+        always_export_symbols_CXX=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          allow_undefined_flag_CXX='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+int
+main ()
+{
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
+fi
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+           hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+           allow_undefined_flag_CXX="-z nodefs"
+           archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+           # Determine the default libpath from the value encoded in an
+           # empty executable.
+           cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+int
+main ()
+{
 
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
 
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
+fi
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
+           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+           # Warning - without using the other run time loading flags,
+           # -berok will link without error, but may produce a broken library.
+           no_undefined_flag_CXX=' ${wl}-bernotok'
+           allow_undefined_flag_CXX=' ${wl}-berok'
+           # Exported symbols can be pulled into shared objects from archives
+           whole_archive_flag_spec_CXX='$convenience'
+           archive_cmds_need_lc_CXX=yes
+           # This is similar to how AIX traditionally builds its shared
+           # libraries.
+           archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+      beos*)
+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+         allow_undefined_flag_CXX=unsupported
+         # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+         # support --undefined.  This deserves some investigation.  FIXME
+         archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+         ld_shlibs_CXX=no
+       fi
+       ;;
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+      chorus*)
+        case $cc_basename in
+          *)
+         # FIXME: insert proper C++ library support
+         ld_shlibs_CXX=no
+         ;;
+        esac
+        ;;
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+        # as there is no search path for DLLs.
+        hardcode_libdir_flag_spec_CXX='-L$libdir'
+        allow_undefined_flag_CXX=unsupported
+        always_export_symbols_CXX=no
+        enable_shared_with_static_runtimes_CXX=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+           cp $export_symbols $output_objdir/$soname.def;
+          else
+           echo EXPORTS > $output_objdir/$soname.def;
+           cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          ld_shlibs_CXX=no
+        fi
+        ;;
+      darwin* | rhapsody*)
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  whole_archive_flag_spec_CXX=''
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+  else
+  ld_shlibs_CXX=no
+  fi
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
+       ;;
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
+      dgux*)
+        case $cc_basename in
+          ec++*)
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+          ghcx*)
+           # Green Hills C++ Compiler
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+        esac
+        ;;
 
-# ### END LIBTOOL TAG CONFIG: $tagname
+      freebsd[12]*)
+        # C++ shared libraries reported to be fairly broken before
+       # switch to ELF
+        ld_shlibs_CXX=no
+        ;;
 
-__EOF__
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
 
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
 
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
+      gnu*)
+        ;;
 
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='${wl}-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+                                            # but as the default
+                                            # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+         hardcode_libdir_separator_CXX=:
 
-CC="$lt_save_CC"
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+             export_dynamic_flag_spec_CXX='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+                                                # but as the default
+                                                # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+          aCC*)
+           case $host_cpu in
+             hppa*64*)
+               archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+             ia64*)
+               archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+             *)
+               archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+           esac
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+           ;;
+          *)
+           if test "$GXX" = yes; then
+             if test $with_gnu_ld = no; then
+               case $host_cpu in
+                 hppa*64*)
+                   archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+                 ia64*)
+                   archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+                 *)
+                   archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+               esac
+             fi
+           else
+             # FIXME: insert proper C++ library support
+             ld_shlibs_CXX=no
+           fi
+           ;;
+        esac
+        ;;
 
-       else
-         tagname=""
-       fi
+      interix[3-9]*)
+       hardcode_direct_CXX=no
+       hardcode_shlibpath_var_CXX=no
+       hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+       export_dynamic_flag_spec_CXX='${wl}-E'
+       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+       # Instead, shared libraries are loaded at an image base (0x10000000 by
+       # default) and relocated if they conflict, which is a slow very memory
+       # consuming and fragmenting process.  To avoid this, we pick a random,
+       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+       archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+           # SGI C++
+           archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+           # Archives containing C++ object files must be created using
+           # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+           # necessary to make sure instantiated templates are included
+           # in the archive.
+           old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+           ;;
+          *)
+           if test "$GXX" = yes; then
+             if test "$with_gnu_ld" = no; then
+               archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+             else
+               archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+             fi
+           fi
+           link_all_deplibs_CXX=yes
+           ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
 
-      GCJ)
-       if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
+      linux* | k*bsd*-gnu)
+        case $cc_basename in
+          KCC*)
+           # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+           # KCC will only create a shared library if the output file
+           # ends with ".so" (or ".sl" for HP-UX), so rename the library
+           # to its proper name (with version) after linking.
+           archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+           archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+           hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+           export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+           # Archives containing C++ object files must be created using
+           # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+           old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+           ;;
+         icpc* | ecpc* )
+           # Intel C++
+           with_gnu_ld=yes
+           # version 8.0 and above of icpc choke on multiply defined symbols
+           # if we add $predep_objects and $postdep_objects, however 7.1 and
+           # earlier do not add the objects themselves.
+           case `$CC -V 2>&1` in
+             *"Version 7."*)
+               archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+               archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+               ;;
+             *)  # Version 8.0 or newer
+               tmp_idyn=
+               case $host_cpu in
+                 ia64*) tmp_idyn=' -i_dynamic';;
+               esac
+               archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+               archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+               ;;
+           esac
+           archive_cmds_need_lc_CXX=no
+           hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+           export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+           whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+           ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+           case `$CC -V` in
+           *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+             prelink_cmds_CXX='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+             old_archive_cmds_CXX='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+               $RANLIB $oldlib'
+             archive_cmds_CXX='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+             archive_expsym_cmds_CXX='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+             ;;
+           *) # Version 6 will use weak symbols
+             archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+             archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+             ;;
+           esac
 
-# Source file extension for Java test sources.
-ac_ext=java
+           hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+           export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+           whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+         cxx*)
+           # Compaq C++
+           archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+           archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
+           runpath_var=LD_RUN_PATH
+           hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+           hardcode_libdir_separator_CXX=:
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+           ;;
+         xl*)
+           # IBM XL 8.0 on PPC, with GNU ld
+           hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+           export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+           archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+           if test "x$supports_anon_versioning" = xyes; then
+             archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+               cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+               echo "local: *; };" >> $output_objdir/$libname.ver~
+               $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+           fi
+           ;;
+         *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             no_undefined_flag_CXX=' -zdefs'
+             archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+             archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+             hardcode_libdir_flag_spec_CXX='-R$libdir'
+             whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+             compiler_needs_object_CXX=yes
+
+             # Not sure whether something based on
+             # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+             # would be better.
+             output_verbose_link_cmd='echo'
+
+             # Archives containing C++ object files must be created using
+             # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+             # necessary to make sure instantiated templates are included
+             # in the archive.
+             old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+             ;;
+           esac
+           ;;
+       esac
+       ;;
 
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+      lynxos*)
+        # FIXME: insert proper C++ library support
+       ld_shlibs_CXX=no
+       ;;
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+       ;;
 
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
+      mvs*)
+        case $cc_basename in
+          cxx*)
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+         *)
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+       esac
+       ;;
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+         archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+         wlarc=
+         hardcode_libdir_flag_spec_CXX='-R$libdir'
+         hardcode_direct_CXX=yes
+         hardcode_shlibpath_var_CXX=no
+       fi
+       # Workaround some broken pre-1.5 toolchains
+       output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+       ;;
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+       ;;
 
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+       ld_shlibs_CXX=no
+       ;;
 
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+      openbsd*)
+       if test -f /usr/libexec/ld.so; then
+         hardcode_direct_CXX=yes
+         hardcode_shlibpath_var_CXX=no
+         hardcode_direct_absolute_CXX=yes
+         archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+         hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+         if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+           archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+           export_dynamic_flag_spec_CXX='${wl}-E'
+           whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+         fi
+         output_verbose_link_cmd=echo
+       else
+         ld_shlibs_CXX=no
+       fi
+       ;;
 
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+           # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+           # KCC will only create a shared library if the output file
+           # ends with ".so" (or ".sl" for HP-UX), so rename the library
+           # to its proper name (with version) after linking.
+           archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+           hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+           hardcode_libdir_separator_CXX=:
+
+           # Archives containing C++ object files must be created using
+           # the KAI C++ compiler.
+           case $host in
+             osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+             *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+           esac
+           ;;
+          RCC*)
+           # Rational C++ 2.4.1
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+          cxx*)
+           case $host in
+             osf3*)
+               allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+               archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+               hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+               ;;
+             *)
+               allow_undefined_flag_CXX=' -expect_unresolved \*'
+               archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+               archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                 echo "-hidden">> $lib.exp~
+                 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+                 $RM $lib.exp'
+               hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+               ;;
+           esac
 
+           hardcode_libdir_separator_CXX=:
 
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+           ;;
+         *)
+           if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+             allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+             case $host in
+               osf3*)
+                 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+                 ;;
+               *)
+                 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+                 ;;
+             esac
+
+             hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+             hardcode_libdir_separator_CXX=:
+
+             # Commands to make compiler produce verbose output that lists
+             # what "hidden" libraries, object files and flags are used when
+             # linking a shared library.
+             output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+           else
+             # FIXME: insert proper C++ library support
+             ld_shlibs_CXX=no
+           fi
+           ;;
+        esac
+        ;;
 
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
 
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
+      sunos4*)
+        case $cc_basename in
+          CC*)
+           # Sun C++ 4.x
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+          lcc*)
+           # Lucid
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+        esac
+        ;;
 
-old_archive_cmds_GCJ=$old_archive_cmds
+      solaris*)
+        case $cc_basename in
+          CC*)
+           # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+           no_undefined_flag_CXX=' -zdefs'
+           archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+           archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+             $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+           hardcode_libdir_flag_spec_CXX='-R$libdir'
+           hardcode_shlibpath_var_CXX=no
+           case $host_os in
+             solaris2.[0-5] | solaris2.[0-5].*) ;;
+             *)
+               # The compiler driver will combine and reorder linker options,
+               # but understands `-z linker_flag'.
+               # Supported since Solaris 2.6 (maybe 2.5.1?)
+               whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+               ;;
+           esac
+           link_all_deplibs_CXX=yes
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
+           output_verbose_link_cmd='echo'
 
-lt_prog_compiler_no_builtin_flag_GCJ=
+           # Archives containing C++ object files must be created using
+           # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+           # necessary to make sure instantiated templates are included
+           # in the archive.
+           old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+           ;;
+          gcx*)
+           # Green Hills C++ Compiler
+           archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+           # The C++ compiler must be used to create the archive.
+           old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+           ;;
+          *)
+           # GNU C++ compiler with Solaris linker
+           if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+             no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+             if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+               archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+               archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+               # Commands to make compiler produce verbose output that lists
+               # what "hidden" libraries, object files and flags are used when
+               # linking a shared library.
+               output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+             else
+               # g++ 2.7 appears to require `-G' NOT `-shared' on this
+               # platform.
+               archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+               archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                 $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+               # Commands to make compiler produce verbose output that lists
+               # what "hidden" libraries, object files and flags are used when
+               # linking a shared library.
+               output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+             fi
 
+             hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+             case $host_os in
+               solaris2.[0-5] | solaris2.[0-5].*) ;;
+               *)
+                 whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+                 ;;
+             esac
+           fi
+           ;;
+        esac
+        ;;
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18029: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:18033: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='${wl}-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+      case $cc_basename in
+        CC*)
+         archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+      esac
+      ;;
 
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
+      sysv5* | sco3.2v5* | sco5v6*)
+       # Note: We can NOT use -z defs as we might desire, because we do not
+       # link with -lc, and that would cause any symbols used from libc to
+       # always be unresolved, which means just about no library would
+       # ever link correctly.  If we're not using GNU ld we use -z text
+       # though, which does catch some bad symbols but isn't as heavy-handed
+       # as -z defs.
+       no_undefined_flag_CXX='${wl}-z,text'
+       allow_undefined_flag_CXX='${wl}-z,nodefs'
+       archive_cmds_need_lc_CXX=no
+       hardcode_shlibpath_var_CXX=no
+       hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+       hardcode_libdir_separator_CXX=':'
+       link_all_deplibs_CXX=yes
+       export_dynamic_flag_spec_CXX='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
 
-fi
+       case $cc_basename in
+          CC*)
+           archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           ;;
+         *)
+           archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           ;;
+       esac
+      ;;
 
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
+      tandem*)
+        case $cc_basename in
+          NCC*)
+           # NonStop-UX NCC 3.20
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           ld_shlibs_CXX=no
+           ;;
+        esac
+        ;;
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
 
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
 
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
+    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test "$ld_shlibs_CXX" = no && can_build_shared=no
 
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
+    GCC_CXX="$GXX"
+    LD_CXX="$LD"
 
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
 
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
 
-      ;;
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
 
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
 
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
 
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+        prev=$p
+        continue
+       else
+        prev=
+       fi
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
+       if test "$pre_test_object_deps_done" = no; then
+        case $p in
+        -L* | -R*)
+          # Internal compiler library paths should come after those
+          # provided the user.  The postdeps already come after the
+          # user supplied libs so there is no need to process them.
+          if test -z "$compiler_lib_search_path_CXX"; then
+            compiler_lib_search_path_CXX="${prev}${p}"
+          else
+            compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+          fi
+          ;;
+        # The "-l" case would never come before the object being
+        # linked, so don't bother handling this case.
+        esac
+       else
+        if test -z "$postdeps_CXX"; then
+          postdeps_CXX="${prev}${p}"
+        else
+          postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+        fi
+       fi
+       ;;
 
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic_GCJ='-fPIC'
-       ;;
-      esac
-      ;;
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+        pre_test_object_deps_done=yes
+        continue
+       fi
 
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-       lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_GCJ='-qnocommon'
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         ;;
-       esac
+       if test "$pre_test_object_deps_done" = no; then
+        if test -z "$predep_objects_CXX"; then
+          predep_objects_CXX="$p"
+        else
+          predep_objects_CXX="$predep_objects_CXX $p"
+        fi
+       else
+        if test -z "$postdep_objects_CXX"; then
+          postdep_objects_CXX="$p"
+        else
+          postdep_objects_CXX="$postdep_objects_CXX $p"
+        fi
+       fi
        ;;
 
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
+    *) ;; # Ignore the rest.
 
-      ;;
+    esac
+  done
 
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic_GCJ='+Z'
-       ;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
 
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
+$RM -f confest.$objext
 
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
 
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_pic_GCJ='-KPIC'
-       lt_prog_compiler_static_GCJ='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-       # which looks to be a dead project)
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_pic_GCJ='-fpic'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)
-         # Sun C 5.9
-         lt_prog_compiler_pic_GCJ='-KPIC'
-         lt_prog_compiler_static_GCJ='-Bstatic'
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         ;;
-       *Sun\ F*)
-         # Sun Fortran 8.3 passes all unrecognized flags to the linker
-         lt_prog_compiler_pic_GCJ='-KPIC'
-         lt_prog_compiler_static_GCJ='-Bstatic'
-         lt_prog_compiler_wl_GCJ=''
-         ;;
-       esac
-       ;;
-      esac
-      ;;
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
 
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
       ;;
+    esac
 
-    rdos*)
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
 
-    solaris*)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-       lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-      *)
-       lt_prog_compiler_wl_GCJ='-Wl,';;
-      esac
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
       ;;
+    esac
 
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
 
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-       lt_prog_compiler_pic_GCJ='-Kconform_pic'
-       lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
 
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
 
-    unicos*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
 
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
 
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
 
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
 
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18319: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:18323: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
 
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
 
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_GCJ=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_GCJ=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_GCJ=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
-    :
-else
-    lt_prog_compiler_static_GCJ=
-fi
 
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18423: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:18427: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
 
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
 
-  ld_shlibs_GCJ=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
 
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-       whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-       whole_archive_flag_spec_GCJ=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
 
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-       ld_shlibs_GCJ=no
-       cat <<EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
 
-EOF
-      fi
-      ;;
 
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
 
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       allow_undefined_flag_GCJ=unsupported
-       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-       # support --undefined.  This deserves some investigation.  FIXME
-       archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-       ld_shlibs_GCJ=no
-      fi
-      ;;
 
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname.def;
-       else
-         echo EXPORTS > $output_objdir/$soname.def;
-         cat $export_symbols >> $output_objdir/$soname.def;
-       fi~
-       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-       ld_shlibs_GCJ=no
-      fi
-      ;;
 
-    interix[3-9]*)
-      hardcode_direct_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
 
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       tmp_addflag=
-       case $cc_basename,$host_cpu in
-       pgcc*)                          # Portland Group C compiler
-         whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag'
-         ;;
-       pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
-         whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag -Mnomain' ;;
-       ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
-         tmp_addflag=' -i_dynamic' ;;
-       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-         tmp_addflag=' -i_dynamic -nofor_main' ;;
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
-       esac
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)                       # Sun C 5.9
-         whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_sharedflag='-G' ;;
-       *Sun\ F*)                       # Sun Fortran 8.3
-         tmp_sharedflag='-G' ;;
-       *)
-         tmp_sharedflag='-shared' ;;
-       esac
-       archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
-       if test $supports_anon_versioning = yes; then
-         archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-       fi
-      else
-       ld_shlibs_GCJ=no
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+       # AIX 5 now supports IA64 processor
+       lt_prog_compiler_static_CXX='-Bstatic'
       fi
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-      else
-       archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
       ;;
 
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-       ld_shlibs_GCJ=no
-       cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs_GCJ=no
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       lt_prog_compiler_pic_CXX=-Kconform_pic
       fi
       ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-       ld_shlibs_GCJ=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
        ;;
-       *)
-         if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-           hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-           archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-           archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-         else
-           ld_shlibs_GCJ=no
-         fi
+      *)
+       lt_prog_compiler_pic_CXX='-fPIC'
        ;;
       esac
       ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
       ;;
-
     *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-       archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs_GCJ=no
-      fi
+      lt_prog_compiler_pic_CXX='-fPIC'
       ;;
     esac
-
-    if test "$ld_shlibs_GCJ" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_GCJ=
-      export_dynamic_flag_spec_GCJ=
-      whole_archive_flag_spec_GCJ=
-    fi
   else
-    # PORTME fill in a description of your system's linker (not GNU ld)
     case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-       # Neither direct hardcoding nor static linking is supported with a
-       # broken collect2.
-       hardcode_direct_GCJ=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-       aix_use_runtimelinking=no
-       exp_sym_flag='-Bexport'
-       no_entry_flag=""
-      else
-       # If we're using GNU nm, then we don't want the "-C" option.
-       # -C means demangle to AIX nm, but means don't demangle with GNU nm
-       if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-         export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+      aix[4-9]*)
+       # All AIX code is PIC.
+       if test "$host_cpu" = ia64; then
+         # AIX 5 now supports IA64 processor
+         lt_prog_compiler_static_CXX='-Bstatic'
        else
-         export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+         lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
        fi
-       aix_use_runtimelinking=no
-
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-         for ld_flag in $LDFLAGS; do
-         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-           aix_use_runtimelinking=yes
-           break
-         fi
-         done
+       ;;
+      chorus*)
+       case $cc_basename in
+       cxch68*)
+         # Green Hills C++ Compiler
+         # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
          ;;
        esac
-
-       exp_sym_flag='-bexport'
-       no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      if test "$GCC" = yes; then
-       case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
-         collect2name=`${CC} -print-prog-name=collect2`
-         if test -f "$collect2name" && \
-          strings "$collect2name" | grep resolve_lib_name >/dev/null
-         then
-         # We have reworked collect2
-         :
-         else
-         # We have old collect2
-         hardcode_direct_GCJ=unsupported
-         # It fails to find uninstalled libraries when the uninstalled
-         # path is not listed in the libpath.  Setting hardcode_minus_L
-         # to unsupported forces relinking
-         hardcode_minus_L_GCJ=yes
-         hardcode_libdir_flag_spec_GCJ='-L$libdir'
-         hardcode_libdir_separator_GCJ=
-         fi
-         ;;
+       ;;
+      dgux*)
+       case $cc_basename in
+         ec++*)
+           lt_prog_compiler_pic_CXX='-KPIC'
+           ;;
+         ghcx*)
+           # Green Hills C++ Compiler
+           lt_prog_compiler_pic_CXX='-pic'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      freebsd* | dragonfly*)
+       # FreeBSD uses GNU C++
+       ;;
+      hpux9* | hpux10* | hpux11*)
+       case $cc_basename in
+         CC*)
+           lt_prog_compiler_wl_CXX='-Wl,'
+           lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+           if test "$host_cpu" != ia64; then
+             lt_prog_compiler_pic_CXX='+Z'
+           fi
+           ;;
+         aCC*)
+           lt_prog_compiler_wl_CXX='-Wl,'
+           lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+           case $host_cpu in
+           hppa*64*|ia64*)
+             # +Z the default
+             ;;
+           *)
+             lt_prog_compiler_pic_CXX='+Z'
+             ;;
+           esac
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      interix*)
+       # This is c89, which is MS Visual C++ (no shared libs)
+       # Anyone wants to do a port?
+       ;;
+      irix5* | irix6* | nonstopux*)
+       case $cc_basename in
+         CC*)
+           lt_prog_compiler_wl_CXX='-Wl,'
+           lt_prog_compiler_static_CXX='-non_shared'
+           # CC pic flag -KPIC is the default.
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      linux* | k*bsd*-gnu)
+       case $cc_basename in
+         KCC*)
+           # KAI C++ Compiler
+           lt_prog_compiler_wl_CXX='--backend -Wl,'
+           lt_prog_compiler_pic_CXX='-fPIC'
+           ;;
+         ecpc* )
+           # old Intel C++ for x86_64 which still supported -KPIC.
+           lt_prog_compiler_wl_CXX='-Wl,'
+           lt_prog_compiler_pic_CXX='-KPIC'
+           lt_prog_compiler_static_CXX='-static'
+           ;;
+         icpc* )
+           # Intel C++, used to be incompatible with GCC.
+           # ICC 10 doesn't accept -KPIC any more.
+           lt_prog_compiler_wl_CXX='-Wl,'
+           lt_prog_compiler_pic_CXX='-fPIC'
+           lt_prog_compiler_static_CXX='-static'
+           ;;
+         pgCC* | pgcpp*)
+           # Portland Group C++ compiler
+           lt_prog_compiler_wl_CXX='-Wl,'
+           lt_prog_compiler_pic_CXX='-fpic'
+           lt_prog_compiler_static_CXX='-Bstatic'
+           ;;
+         cxx*)
+           # Compaq C++
+           # Make sure the PIC flag is empty.  It appears that all Alpha
+           # Linux and Compaq Tru64 Unix objects are PIC.
+           lt_prog_compiler_pic_CXX=
+           lt_prog_compiler_static_CXX='-non_shared'
+           ;;
+         xlc* | xlC*)
+           # IBM XL 8.0 on PPC
+           lt_prog_compiler_wl_CXX='-Wl,'
+           lt_prog_compiler_pic_CXX='-qpic'
+           lt_prog_compiler_static_CXX='-qstaticlink'
+           ;;
+         *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             lt_prog_compiler_pic_CXX='-KPIC'
+             lt_prog_compiler_static_CXX='-Bstatic'
+             lt_prog_compiler_wl_CXX='-Qoption ld '
+             ;;
+           esac
+           ;;
+       esac
+       ;;
+      lynxos*)
+       ;;
+      m88k*)
+       ;;
+      mvs*)
+       case $cc_basename in
+         cxx*)
+           lt_prog_compiler_pic_CXX='-W c,exportall'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      netbsd*)
+       ;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+       case $cc_basename in
+         KCC*)
+           lt_prog_compiler_wl_CXX='--backend -Wl,'
+           ;;
+         RCC*)
+           # Rational C++ 2.4.1
+           lt_prog_compiler_pic_CXX='-pic'
+           ;;
+         cxx*)
+           # Digital/Compaq C++
+           lt_prog_compiler_wl_CXX='-Wl,'
+           # Make sure the PIC flag is empty.  It appears that all Alpha
+           # Linux and Compaq Tru64 Unix objects are PIC.
+           lt_prog_compiler_pic_CXX=
+           lt_prog_compiler_static_CXX='-non_shared'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      psos*)
+       ;;
+      solaris*)
+       case $cc_basename in
+         CC*)
+           # Sun C++ 4.2, 5.x and Centerline C++
+           lt_prog_compiler_pic_CXX='-KPIC'
+           lt_prog_compiler_static_CXX='-Bstatic'
+           lt_prog_compiler_wl_CXX='-Qoption ld '
+           ;;
+         gcx*)
+           # Green Hills C++ Compiler
+           lt_prog_compiler_pic_CXX='-PIC'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      sunos4*)
+       case $cc_basename in
+         CC*)
+           # Sun C++ 4.x
+           lt_prog_compiler_pic_CXX='-pic'
+           lt_prog_compiler_static_CXX='-Bstatic'
+           ;;
+         lcc*)
+           # Lucid
+           lt_prog_compiler_pic_CXX='-pic'
+           ;;
+         *)
+           ;;
        esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
-      else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-       # chokes on -Wl,-G. The following line is correct:
-         shared_flag='-G'
-       else
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag='${wl}-G'
-         else
-           shared_flag='${wl}-bM:SRE'
-         fi
-       fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=yes
-      if test "$aix_use_runtimelinking" = yes; then
-       # Warning - without using the other runtime loading flags (-brtl),
-       # -berok will link without error, but may produce a broken library.
-       allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-       archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-       if test "$host_cpu" = ia64; then
-         hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-         allow_undefined_flag_GCJ="-z nodefs"
-         archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
-        # Determine the default libpath from the value encoded in an empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
+       ;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+       case $cc_basename in
+         CC*)
+           lt_prog_compiler_wl_CXX='-Wl,'
+           lt_prog_compiler_pic_CXX='-KPIC'
+           lt_prog_compiler_static_CXX='-Bstatic'
+           ;;
+       esac
+       ;;
+      tandem*)
+       case $cc_basename in
+         NCC*)
+           # NonStop-UX NCC 3.20
+           lt_prog_compiler_pic_CXX='-KPIC'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      vxworks*)
+       ;;
+      *)
+       lt_prog_compiler_can_build_shared_CXX=no
+       ;;
+    esac
+  fi
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-       /^0/ {
-           s/^0  *\(.*\)$/\1/
-           p
-       }
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-        hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-         # Warning - without using the other run time loading flags,
-         # -berok will link without error, but may produce a broken library.
-         no_undefined_flag_GCJ=' ${wl}-bernotok'
-         allow_undefined_flag_GCJ=' ${wl}-berok'
-         # Exported symbols can be pulled into shared objects from archives
-         whole_archive_flag_spec_GCJ='$convenience'
-         archive_cmds_need_lc_GCJ=yes
-         # This is similar to how AIX traditionally builds its shared libraries.
-         archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-      fi
-      ;;
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
 
-    bsdi[45]*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
 
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15278: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:15282: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
 
-    darwin* | rhapsody*)
-      allow_undefined_flag_GCJ="$_lt_dar_allow_undefined"
-      archive_cmds_need_lc_GCJ=no
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ=''
-      link_all_deplibs_GCJ=yes
-    if test "$GCC" = yes ; then
-       output_verbose_link_cmd='echo'
-        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_GCJ=no
-          ;;
-      esac
-    fi
-      ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
 
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
+fi
 
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
 
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
 
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
 
-    hpux9*)
-      if test "$GCC" = yes; then
-       archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-       archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
 
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator_GCJ=:
 
-       hardcode_direct_GCJ=yes
-       export_dynamic_flag_spec_GCJ='${wl}-E'
 
-       # hardcode_minus_L: Not really in the search PATH,
-       # but as the default location of the library.
-       hardcode_minus_L_GCJ=yes
-      fi
-      ;;
 
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      else
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator_GCJ=:
+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-       case $host_cpu in
-       hppa*64*|ia64*)
-         hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-         hardcode_direct_GCJ=no
-         hardcode_shlibpath_var_GCJ=no
-         ;;
-       *)
-         hardcode_direct_GCJ=yes
-         export_dynamic_flag_spec_GCJ='${wl}-E'
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15377: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:15381: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
 
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         hardcode_minus_L_GCJ=yes
-         ;;
-       esac
-      fi
-      ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-       archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-       archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
 
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-       hardcode_direct_GCJ=yes
-       hardcode_shlibpath_var_GCJ=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-         archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-         archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-         hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-         export_dynamic_flag_spec_GCJ='${wl}-E'
-       else
-         case $host_os in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-            hardcode_libdir_flag_spec_GCJ='-R$libdir'
-            ;;
-          *)
-            archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-            hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-            ;;
-         esac
-        fi
-      else
-       ld_shlibs_GCJ=no
-      fi
-      ;;
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:15429: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:15433: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
 
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
-    osf3*)
-      if test "$GCC" = yes; then
-       allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       allow_undefined_flag_GCJ=' -expect_unresolved \*'
-       archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
 
-    osf4* | osf5*)     # as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-       allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-       allow_undefined_flag_GCJ=' -expect_unresolved \*'
-       archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-       $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
-       # Both c and cxx compiler support -rpath directly
-       hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
 
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-       wlarc='${wl}'
-       archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-         $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-       wlarc=''
-       archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-       $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-       # The compiler driver will combine and reorder linker options,
-       # but understands `-z linker_flag'.  GCC discards it without `$wl',
-       # but is careful enough not to reorder.
-       # Supported since Solaris 2.6 (maybe 2.5.1?)
-       if test "$GCC" = yes; then
-         whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-       else
-         whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-       fi
-       ;;
-      esac
-      link_all_deplibs_GCJ=yes
-      ;;
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
 
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-       # Use $CC to link under sequent, because it throws in some extra .o
-       # files that make .init and .fini sections work.
-       archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
 
-    sysv4)
-      case $host_vendor in
-       sni)
-         archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct_GCJ=yes # is this really true???
-       ;;
-       siemens)
-         ## LD is ld it makes a PLAMLIB
-         ## CC just makes a GrossModule.
-         archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-         reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-         hardcode_direct_GCJ=no
-        ;;
-       motorola)
-         archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-       ;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
 
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       hardcode_shlibpath_var_GCJ=no
-       runpath_var=LD_RUN_PATH
-       hardcode_runpath_var=yes
-       ld_shlibs_GCJ=yes
-      fi
-      ;;
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_GCJ='${wl}-z,text'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
 
-      if test "$GCC" = yes; then
-       archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
+with_gnu_ld_CXX=$with_gnu_ld
 
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_GCJ='${wl}-z,text'
-      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-       archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
 
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
 
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-$as_echo "$ld_shlibs_GCJ" >&6; }
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
 #
 # Do we need to explicitly link libc?
 #
-case "x$archive_cmds_need_lc_GCJ" in
+case "x$archive_cmds_need_lc_CXX" in
 x|xyes)
   # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
+  archive_cmds_need_lc_CXX=yes
 
   if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ in
+    case $archive_cmds_CXX in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
       ;;
@@ -19465,7 +15538,7 @@ x|xyes)
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $rm conftest*
+      $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -19477,40 +15550,104 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         lib=conftest
         libobjs=conftest.$ac_objext
         deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-       pic_flag=$lt_prog_compiler_pic_GCJ
+        wl=$lt_prog_compiler_wl_CXX
+       pic_flag=$lt_prog_compiler_pic_CXX
         compiler_flags=-v
         linker_flags=-v
         verstring=
         output_objdir=.
         libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+        allow_undefined_flag_CXX=
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
-         archive_cmds_need_lc_GCJ=no
+         archive_cmds_need_lc_CXX=no
         else
-         archive_cmds_need_lc_GCJ=yes
+         archive_cmds_need_lc_CXX=yes
         fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
       else
         cat conftest.err 1>&5
       fi
-      $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
+      $RM conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
+
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -19524,7 +15661,6 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -19561,7 +15697,7 @@ aix[4-9]*)
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
           echo ' yes '
-          echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+          echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
        :
       else
        can_build_shared=no
@@ -19587,9 +15723,18 @@ aix[4-9]*)
   ;;
 
 amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
   ;;
 
 beos*)
@@ -19612,25 +15757,28 @@ bsdi[45]*)
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
-       $rm \$dlpath'
+       $RM \$dlpath'
     shlibpath_overrides_runpath=yes
 
     case $host_os in
@@ -19639,20 +15787,20 @@ cygwin* | mingw* | pw32*)
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
-    mingw*)
+    mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH printed by
         # mingw gcc, but we are running on Cygwin. Gcc prints its search
         # path with ; separators, and with drive letters. We can handle the
         # drive letters (cygwin fileutils understands them), so leave them,
         # especially as we might pass files found there to a mingw objdump,
         # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
       ;;
     pw32*)
@@ -19676,7 +15824,7 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
@@ -19774,18 +15922,18 @@ hpux9* | hpux10* | hpux11*)
     fi
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
     shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
@@ -19847,21 +15995,79 @@ irix5* | irix6* | nonstopux*)
   hardcode_into_libs=yes
   ;;
 
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+  shlibpath_overrides_runpath=yes
+fi
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
@@ -19869,7 +16075,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[     ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[      ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -19886,7 +16092,7 @@ netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
@@ -19907,14 +16113,16 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx*)
-  version_type=linux
+*nto* | *qnx*)
+  version_type=qnx
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
   ;;
 
 openbsd*)
@@ -19923,13 +16131,13 @@ openbsd*)
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case $host_os in
       openbsd2.[89] | openbsd2.[89].*)
        shlibpath_overrides_runpath=no
@@ -19989,551 +16197,192 @@ sunos4*)
   if test "$with_gnu_ld" = yes; then
     need_lib_prefix=no
   fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var_GCJ" || \
-   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-$as_echo "$hardcode_action_GCJ" >&6; }
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    compiler_lib_search_dirs_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    fix_srcfile_path_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
+  need_version=yes
+  ;;
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
 
-# Library versioning type.
-version_type=$version_type
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+       ;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
 
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
 
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
 
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
+    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
+if test "$hardcode_action_CXX" = relink ||
+   test "$inherit_rpath_CXX" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
 
-# ### END LIBTOOL TAG CONFIG: $tagname
 
-__EOF__
 
 
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
+  fi # test -n "$compiler"
 
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -20541,796 +16390,1087 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-CC="$lt_save_CC"
-
-       else
-         tagname=""
-       fi
-       ;;
-
-      RC)
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
 
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
 
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
 
 
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
 
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
 
 
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    compiler_lib_search_dirs_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    fix_srcfile_path_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
 
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
+        ac_config_commands="$ac_config_commands libtool"
 
-cfgfile="$ofile"
 
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# Only expand once:
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
 
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
 
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+######################################################################
+# the following interpret 'with' and 'enable' switches.
+# some of these switches trigger checks that can be found further
+# below in this configure script
 
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
+# does the user want aggressive optimization?
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval=$enable_debug; enable_debug=$enableval
+else
+  enable_debug=no
+fi
 
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
 
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
+# does the user want to have automatic guess of suitable optimization options
+# Check whether --enable-optimization was given.
+if test "${enable_optimization+set}" = set; then
+  enableval=$enable_optimization; enable_optimization=$enableval
+else
+  enable_optimization=yes
+fi
 
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
 
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
+# does the user want to have SSE / SSE2 / SSE3 specified?
+# Check whether --enable-sse was given.
+if test "${enable_sse+set}" = set; then
+  enableval=$enable_sse; enable_sse=$enableval
+else
+  enable_sse=yes
+fi
 
-# A C compiler.
-LTCC=$lt_LTCC
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
+# does the user want to build demo applications?
+# Check whether --enable-apps was given.
+if test "${enable_apps+set}" = set; then
+  enableval=$enable_apps; enable_apps=$enableval
+else
+  enable_apps="yes"
+fi
 
-# A language-specific compiler.
-CC=$lt_compiler_RC
+ if test x"$enable_apps" = x"yes"; then
+  BUILD_APPS_TRUE=
+  BUILD_APPS_FALSE='#'
+else
+  BUILD_APPS_TRUE='#'
+  BUILD_APPS_FALSE=
+fi
 
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
 
-# An ERE matcher.
-EGREP=$lt_EGREP
 
-# The linker used to build libraries.
-LD=$lt_LD_RC
+# the following checks reflect the dependencies of OpenCV on other
+# libraries that do the actual work for video I/O or windowing
+# subsystem. On some platforms there are ambiguities that a user
+# can influence. There is also additional logic to be found in code
+# later code lines that tries to do sensible decisions on what to use
 
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
+# does the user want to compile python modules as well?
 
-# A BSD-compatible nm program.
-NM=$lt_NM
+# Check whether --with-native-lapack was given.
+if test "${with_native_lapack+set}" = set; then
+  withval=$with_native_lapack; with_native_lapack=$withval
+else
+  with_native_lapack=no
+fi
 
-# A symbol stripping program
-STRIP=$lt_STRIP
 
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
+# compile and link against OpenMP
+# because of this: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28482
+# we disable OpenMP by default. But one may enable it explicitly with --with-openmp
+#AC_ARG_WITH([openmp],
+#            [AS_HELP_STRING([--with-openmp],[use OpenMP threading [no]])],
+#            [with_openmp=$withval],
+#            [with_openmp=no])
 
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
+# does the user want to compile python modules as well?
 
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
+# Check whether --with-swig was given.
+if test "${with_swig+set}" = set; then
+  withval=$with_swig; with_swig=$withval
+else
+  with_swig=no
+fi
 
-# Used on cygwin: assembler.
-AS="$AS"
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# does the user want to compile python modules as well?
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# Check whether --with-python was given.
+if test "${with_python+set}" = set; then
+  withval=$with_python; with_python=$withval
+else
+  with_python=yes
+fi
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
 
-# Object file suffix (normally "o").
-objext="$ac_objext"
+# does the user want to compile octave modules as well?
 
-# Old archive suffix (normally "a").
-libext="$libext"
+# Check whether --with-octave was given.
+if test "${with_octave+set}" = set; then
+  withval=$with_octave; with_octave=$withval
+else
+  with_octave=no
+fi
 
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
 
-# Executable file suffix (normally "").
-exeext="$exeext"
+# does the user want OpenCV to use xine video libraries?
 
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
+# Check whether --with-xine was given.
+if test "${with_xine+set}" = set; then
+  withval=$with_xine; with_xine=$withval
+else
+  with_xine=no
+fi
 
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
 
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+# does the user want OpenCV to use the gstreamer multimedia framework?
 
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
+# Check whether --with-gstreamer was given.
+if test "${with_gstreamer+set}" = set; then
+  withval=$with_gstreamer; with_gstreamer=$withval
+else
+  with_gstreamer=no
+fi
 
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
 
-# Do we need a version for libraries?
-need_version=$need_version
+# does the user want OpenCV to use ffmpeg video libraries?
 
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
+# Check whether --with-ffmpeg was given.
+if test "${with_ffmpeg+set}" = set; then
+  withval=$with_ffmpeg; with_ffmpeg=$withval
+else
+  with_ffmpeg=auto
+fi
 
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
 
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
+# does the user want OpenCV to use libraw1394/libdc1394 for video input?
 
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
+# Check whether --with-1394libs was given.
+if test "${with_1394libs+set}" = set; then
+  withval=$with_1394libs; with_1394libs=$withval
+else
+  with_1394libs=auto
+fi
 
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
 
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+# does the user want OpenCV to use the video4linux kernel module?
 
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+# Check whether --with-v4l was given.
+if test "${with_v4l+set}" = set; then
+  withval=$with_v4l; with_v4l=$withval
+else
+  with_v4l=auto
+fi
 
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
 
-# Library versioning type.
-version_type=$version_type
+# does the user want OpenCV to use the unicap library?
 
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
+# Check whether --with-unicap was given.
+if test "${with_unicap+set}" = set; then
+  withval=$with_unicap; with_unicap=$withval
+else
+  with_unicap=no
+fi
 
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
 
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
+# does the user want OpenCV to use image libraries from OS X 10.4?
 
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Check whether --with-imageio was given.
+if test "${with_imageio+set}" = set; then
+  withval=$with_imageio; with_imageio=$withval
+else
+  with_imageio=yes
+fi
 
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
 
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+# does the user want OpenCV to use QuickTime video libraries?
 
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
+# Check whether --with-quicktime was given.
+if test "${with_quicktime+set}" = set; then
+  withval=$with_quicktime; with_quicktime=$withval
+else
+  with_quicktime=yes
+fi
 
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
 
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
+# does the user want OpenCV to use the Carbon GUI of Mac OS X?
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
+# Check whether --with-carbon was given.
+if test "${with_carbon+set}" = set; then
+  withval=$with_carbon; with_carbon=$withval
+else
+  with_carbon=yes
+fi
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
 
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
+# does the user want OpenCV to use GTK+ 2.0 for the GUI?
 
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
+# Check whether --with-gtk was given.
+if test "${with_gtk+set}" = set; then
+  withval=$with_gtk; with_gtk=$withval
+else
+  with_gtk=auto
+fi
 
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
 
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+# does the user want OpenCV to use gthread for GTK+ threaded HighGUI?
 
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+# Check whether --with-gthread was given.
+if test "${with_gthread+set}" = set; then
+  withval=$with_gthread; with_gthread=$withval
+else
+  with_gthread=auto
+fi
 
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
 
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
 
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
+######################################################################
+# Compiler options
 
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
+# OpenMP support
+# macro calls AC_SUBST(OPENMP_CXXFLAGS)
+# and brings its own enable/disable switch ("--disable-openmp")
 
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
+  OPENMP_CXXFLAGS=
+  # Check whether --enable-openmp was given.
+if test "${enable_openmp+set}" = set; then
+  enableval=$enable_openmp;
+fi
 
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+  if test "$enable_openmp" != no; then
+    { $as_echo "$as_me:$LINENO: checking for $CC option to support OpenMP" >&5
+$as_echo_n "checking for $CC option to support OpenMP... " >&6; }
+if test "${ac_cv_prog_cxx_openmp+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+#ifndef _OPENMP
+ choke me
+#endif
+#include <omp.h>
+int main () { return omp_get_num_threads (); }
 
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_prog_cxx_openmp='none needed'
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
+       ac_cv_prog_cxx_openmp='unsupported'
+                                                                                                         for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
+           ac_save_CXXFLAGS=$CXXFLAGS
+           CXXFLAGS="$CXXFLAGS $ac_option"
+           cat >conftest.$ac_ext <<_ACEOF
 
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
+#ifndef _OPENMP
+ choke me
+#endif
+#include <omp.h>
+int main () { return omp_get_num_threads (); }
 
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_prog_cxx_openmp=$ac_option
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
 
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
+fi
 
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+           CXXFLAGS=$ac_save_CXXFLAGS
+           if test "$ac_cv_prog_cxx_openmp" != unsupported; then
+             break
+           fi
+         done
+fi
 
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_openmp" >&5
+$as_echo "$ac_cv_prog_cxx_openmp" >&6; }
+    case $ac_cv_prog_cxx_openmp in #(
+      "none needed" | unsupported)
+        ;; #(
+      *)
+        OPENMP_CXXFLAGS=$ac_cv_prog_cxx_openmp ;;
+    esac
+  fi
 
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
 
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
 
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
+# SSE/SSE2/SSE3 support
+if test x"$enable_sse" = "xyes"; then
+  # This macro calls:
+  #   AC_SUBST(SIMD_FLAGS)
+  # And defines:
+  #   HAVE_MMX / HAVE_SSE / HAVE_SSE2 / HAVE_SSE3 / HAVE_SSSE3
 
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
+{ $as_echo "$as_me:$LINENO: checking for x86 cpuid  output" >&5
+$as_echo_n "checking for x86 cpuid  output... " >&6; }
+if test "${ax_cv_gcc_x86_cpuid_+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ax_cv_gcc_x86_cpuid_=unknown
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
 
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
+     int op = , eax, ebx, ecx, edx;
+     FILE *f;
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
+     __asm__("push %%rbx\n\t"
+             "cpuid\n\t"
+             "pop %%rbx"
+             : "=a" (eax), "=c" (ecx), "=d" (edx)
+             : "a" (op));
+     __asm__("push %%rbx\n\t"
+             "cpuid\n\t"
+             "mov %%rbx, %%rax\n\t"
+             "pop %%rbx"
+             : "=a" (ebx), "=c" (ecx), "=d" (edx)
+             : "a" (op));
+#else
+     __asm__("push %%ebx\n\t"
+             "cpuid\n\t"
+             "pop %%ebx"
+             : "=a" (eax), "=c" (ecx), "=d" (edx)
+             : "a" (op));
+     __asm__("push %%ebx\n\t"
+             "cpuid\n\t"
+             "mov %%ebx, %%eax\n\t"
+             "pop %%ebx"
+             : "=a" (ebx), "=c" (ecx), "=d" (edx)
+             : "a" (op));
+#endif
+     f = fopen("conftest_cpuid", "w"); if (!f) return 1;
+     fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
+     fclose(f);
+     return 0;
 
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ax_cv_gcc_x86_cpuid_=`cat conftest_cpuid`; rm -f conftest_cpuid
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+( exit $ac_status )
+ax_cv_gcc_x86_cpuid_=unknown; rm -f conftest_cpuid
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
 
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
+fi
+{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_" >&5
+$as_echo "$ax_cv_gcc_x86_cpuid_" >&6; }
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
 
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
 
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
 
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
 
-# ### END LIBTOOL TAG CONFIG: $tagname
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-__EOF__
+{ $as_echo "$as_me:$LINENO: checking for x86 cpuid 0x00000001 output" >&5
+$as_echo_n "checking for x86 cpuid 0x00000001 output... " >&6; }
+if test "${ax_cv_gcc_x86_cpuid_0x00000001+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ax_cv_gcc_x86_cpuid_0x00000001=unknown
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
 
+     int op = 0x00000001, eax, ebx, ecx, edx;
+     FILE *f;
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
+     __asm__("push %%rbx\n\t"
+             "cpuid\n\t"
+             "pop %%rbx"
+             : "=a" (eax), "=c" (ecx), "=d" (edx)
+             : "a" (op));
+     __asm__("push %%rbx\n\t"
+             "cpuid\n\t"
+             "mov %%rbx, %%rax\n\t"
+             "pop %%rbx"
+             : "=a" (ebx), "=c" (ecx), "=d" (edx)
+             : "a" (op));
+#else
+     __asm__("push %%ebx\n\t"
+             "cpuid\n\t"
+             "pop %%ebx"
+             : "=a" (eax), "=c" (ecx), "=d" (edx)
+             : "a" (op));
+     __asm__("push %%ebx\n\t"
+             "cpuid\n\t"
+             "mov %%ebx, %%eax\n\t"
+             "pop %%ebx"
+             : "=a" (ebx), "=c" (ecx), "=d" (edx)
+             : "a" (op));
+#endif
+     f = fopen("conftest_cpuid", "w"); if (!f) return 1;
+     fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
+     fclose(f);
+     return 0;
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ax_cv_gcc_x86_cpuid_0x00000001=`cat conftest_cpuid`; rm -f conftest_cpuid
 else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ax_cv_gcc_x86_cpuid_0x00000001=unknown; rm -f conftest_cpuid
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0x00000001" >&5
+$as_echo "$ax_cv_gcc_x86_cpuid_0x00000001" >&6; }
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-CC="$lt_save_CC"
 
-       ;;
+  ecx=`echo $ax_cv_gcc_x86_cpuid_0x00000001 | cut -d ":" -f 3`
+  edx=`echo $ax_cv_gcc_x86_cpuid_0x00000001 | cut -d ":" -f 4`
 
-      *)
-       { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-       ;;
-      esac
+ { $as_echo "$as_me:$LINENO: checking whether mmx is supported" >&5
+$as_echo_n "checking whether mmx is supported... " >&6; }
+if test "${ax_cv_have_mmx_ext+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
 
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
+    ax_cv_have_mmx_ext=no
+    if test "$((0x$edx>>23&0x01))" = 1; then
+      ax_cv_have_mmx_ext=yes
     fi
-  done
-  IFS="$lt_save_ifs"
 
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
 fi
+{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_mmx_ext" >&5
+$as_echo "$ax_cv_have_mmx_ext" >&6; }
 
+ { $as_echo "$as_me:$LINENO: checking whether sse is supported" >&5
+$as_echo_n "checking whether sse is supported... " >&6; }
+if test "${ax_cv_have_sse_ext+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
 
+    ax_cv_have_sse_ext=no
+    if test "$((0x$edx>>25&0x01))" = 1; then
+      ax_cv_have_sse_ext=yes
+    fi
 
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
+fi
+{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_sse_ext" >&5
+$as_echo "$ax_cv_have_sse_ext" >&6; }
 
+ { $as_echo "$as_me:$LINENO: checking whether sse2 is supported" >&5
+$as_echo_n "checking whether sse2 is supported... " >&6; }
+if test "${ax_cv_have_sse2_ext+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
 
+    ax_cv_have_sse2_ext=no
+    if test "$((0x$edx>>26&0x01))" = 1; then
+      ax_cv_have_sse2_ext=yes
+    fi
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_sse2_ext" >&5
+$as_echo "$ax_cv_have_sse2_ext" >&6; }
 
+ { $as_echo "$as_me:$LINENO: checking whether sse3 is supported" >&5
+$as_echo_n "checking whether sse3 is supported... " >&6; }
+if test "${ax_cv_have_sse3_ext+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
 
+    ax_cv_have_sse3_ext=no
+    if test "$((0x$ecx&0x01))" = 1; then
+      ax_cv_have_sse3_ext=yes
+    fi
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_sse3_ext" >&5
+$as_echo "$ax_cv_have_sse3_ext" >&6; }
 
+ { $as_echo "$as_me:$LINENO: checking whether ssse3 is supported" >&5
+$as_echo_n "checking whether ssse3 is supported... " >&6; }
+if test "${ax_cv_have_ssse3_ext+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
 
+    ax_cv_have_ssse3_ext=no
+    if test "$((0x$ecx>>9&0x01))" = 1; then
+      ax_cv_have_ssse3_ext=yes
+    fi
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_ssse3_ext" >&5
+$as_echo "$ax_cv_have_ssse3_ext" >&6; }
 
+  if test "$ax_cv_have_mmx_ext" = yes; then
 
-######################################################################
-# the following interpret 'with' and 'enable' switches.
-# some of these switches trigger checks that can be found further
-# below in this configure script
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MMX /**/
+_ACEOF
 
-# does the user want aggressive optimization?
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug; enable_debug=$enableval
+     { $as_echo "$as_me:$LINENO: checking whether C++ compiler accepts -mmmx" >&5
+$as_echo_n "checking whether C++ compiler accepts -mmmx... " >&6; }
+if test "${ax_cv_cxx_flags__mmmx+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  enable_debug=no
-fi
-
 
-# does the user want to have automatic guess of suitable optimization options
-# Check whether --enable-optimization was given.
-if test "${enable_optimization+set}" = set; then
-  enableval=$enable_optimization; enable_optimization=$enableval
-else
-  enable_optimization=yes
-fi
+      ax_save_FLAGS=$CXXFLAGS
+      CXXFLAGS="-mmmx"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+int
+main ()
+{
 
-# does the user want to have SSE / SSE2 / SSE3 specified?
-# Check whether --enable-sse was given.
-if test "${enable_sse+set}" = set; then
-  enableval=$enable_sse; enable_sse=$enableval
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ax_cv_cxx_flags__mmmx=yes
 else
-  enable_sse=yes
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+       ax_cv_cxx_flags__mmmx=no
+fi
 
-# does the user want to build demo applications?
-# Check whether --enable-apps was given.
-if test "${enable_apps+set}" = set; then
-  enableval=$enable_apps; enable_apps=$enableval
-else
-  enable_apps="yes"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      CXXFLAGS=$ax_save_FLAGS
 fi
 
- if test x"$enable_apps" = x"yes"; then
-  BUILD_APPS_TRUE=
-  BUILD_APPS_FALSE='#'
+eval ax_check_compiler_flags=$ax_cv_cxx_flags__mmmx
+{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+       SIMD_FLAGS="$SIMD_FLAGS -mmmx"
 else
-  BUILD_APPS_TRUE='#'
-  BUILD_APPS_FALSE=
+       :
 fi
 
+  fi
 
+  if test "$ax_cv_have_sse_ext" = yes; then
 
-# the following checks reflect the dependencies of OpenCV on other
-# libraries that do the actual work for video I/O or windowing
-# subsystem. On some platforms there are ambiguities that a user
-# can influence. There is also additional logic to be found in code
-# later code lines that tries to do sensible decisions on what to use
-
-# does the user want to compile python modules as well?
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SSE /**/
+_ACEOF
 
-# Check whether --with-native-lapack was given.
-if test "${with_native_lapack+set}" = set; then
-  withval=$with_native_lapack; with_native_lapack=$withval
+     { $as_echo "$as_me:$LINENO: checking whether C++ compiler accepts -msse" >&5
+$as_echo_n "checking whether C++ compiler accepts -msse... " >&6; }
+if test "${ax_cv_cxx_flags__msse+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  with_native_lapack=no
-fi
-
 
-# compile and link against OpenMP
-# because of this: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28482
-# we disable OpenMP by default. But one may enable it explicitly with --with-openmp
-#AC_ARG_WITH([openmp],
-#            [AS_HELP_STRING([--with-openmp],[use OpenMP threading [no]])],
-#            [with_openmp=$withval],
-#            [with_openmp=no])
+      ax_save_FLAGS=$CXXFLAGS
+      CXXFLAGS="-msse"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# does the user want to compile python modules as well?
+int
+main ()
+{
 
-# Check whether --with-swig was given.
-if test "${with_swig+set}" = set; then
-  withval=$with_swig; with_swig=$withval
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ax_cv_cxx_flags__msse=yes
 else
-  with_swig=no
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+       ax_cv_cxx_flags__msse=no
+fi
 
-# does the user want to compile python modules as well?
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      CXXFLAGS=$ax_save_FLAGS
+fi
 
-# Check whether --with-python was given.
-if test "${with_python+set}" = set; then
-  withval=$with_python; with_python=$withval
+eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse
+{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+       SIMD_FLAGS="$SIMD_FLAGS -msse"
 else
-  with_python=yes
+       :
 fi
 
+  fi
 
-# does the user want to compile octave modules as well?
+  if test "$ax_cv_have_sse2_ext" = yes; then
 
-# Check whether --with-octave was given.
-if test "${with_octave+set}" = set; then
-  withval=$with_octave; with_octave=$withval
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SSE2 /**/
+_ACEOF
+
+     { $as_echo "$as_me:$LINENO: checking whether C++ compiler accepts -msse2" >&5
+$as_echo_n "checking whether C++ compiler accepts -msse2... " >&6; }
+if test "${ax_cv_cxx_flags__msse2+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  with_octave=no
-fi
 
+      ax_save_FLAGS=$CXXFLAGS
+      CXXFLAGS="-msse2"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# does the user want OpenCV to use xine video libraries?
+int
+main ()
+{
 
-# Check whether --with-xine was given.
-if test "${with_xine+set}" = set; then
-  withval=$with_xine; with_xine=$withval
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ax_cv_cxx_flags__msse2=yes
 else
-  with_xine=no
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+       ax_cv_cxx_flags__msse2=no
+fi
 
-# does the user want OpenCV to use the gstreamer multimedia framework?
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      CXXFLAGS=$ax_save_FLAGS
+fi
 
-# Check whether --with-gstreamer was given.
-if test "${with_gstreamer+set}" = set; then
-  withval=$with_gstreamer; with_gstreamer=$withval
+eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse2
+{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+       SIMD_FLAGS="$SIMD_FLAGS -msse2"
 else
-  with_gstreamer=no
+       :
 fi
 
+  fi
 
-# does the user want OpenCV to use ffmpeg video libraries?
+  if test "$ax_cv_have_sse3_ext" = yes; then
 
-# Check whether --with-ffmpeg was given.
-if test "${with_ffmpeg+set}" = set; then
-  withval=$with_ffmpeg; with_ffmpeg=$withval
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SSE3 /**/
+_ACEOF
+
+     { $as_echo "$as_me:$LINENO: checking whether C++ compiler accepts -msse3" >&5
+$as_echo_n "checking whether C++ compiler accepts -msse3... " >&6; }
+if test "${ax_cv_cxx_flags__msse3+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  with_ffmpeg=auto
-fi
 
+      ax_save_FLAGS=$CXXFLAGS
+      CXXFLAGS="-msse3"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-# does the user want OpenCV to use libraw1394/libdc1394 for video input?
+int
+main ()
+{
 
-# Check whether --with-1394libs was given.
-if test "${with_1394libs+set}" = set; then
-  withval=$with_1394libs; with_1394libs=$withval
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ax_cv_cxx_flags__msse3=yes
 else
-  with_1394libs=auto
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+       ax_cv_cxx_flags__msse3=no
+fi
 
-# does the user want OpenCV to use the video4linux kernel module?
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      CXXFLAGS=$ax_save_FLAGS
+fi
 
-# Check whether --with-v4l was given.
-if test "${with_v4l+set}" = set; then
-  withval=$with_v4l; with_v4l=$withval
+eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse3
+{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+       SIMD_FLAGS="$SIMD_FLAGS -msse3"
 else
-  with_v4l=auto
+       :
 fi
 
+  fi
 
-# does the user want OpenCV to use the unicap library?
+  if test "$ax_cv_have_ssse3_ext" = yes; then
 
-# Check whether --with-unicap was given.
-if test "${with_unicap+set}" = set; then
-  withval=$with_unicap; with_unicap=$withval
-else
-  with_unicap=no
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SSSE3 /**/
+_ACEOF
+
+  fi
 
 
-# does the user want OpenCV to use image libraries from OS X 10.4?
 
-# Check whether --with-imageio was given.
-if test "${with_imageio+set}" = set; then
-  withval=$with_imageio; with_imageio=$withval
-else
-  with_imageio=yes
 fi
 
 
-# does the user want OpenCV to use QuickTime video libraries?
+## check whether to include debugging compiler flags
+{ $as_echo "$as_me:$LINENO: checking whether to build debug version" >&5
+$as_echo_n "checking whether to build debug version... " >&6; }
+DEBUG_CPPFLAGS=""
+DEBUG_CXXFLAGS=""
+if test x"$enable_debug" = "xyes"; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-# Check whether --with-quicktime was given.
-if test "${with_quicktime+set}" = set; then
-  withval=$with_quicktime; with_quicktime=$withval
+  if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+    DEBUG_CXXFLAGS="-ggdb"
+  fi
+
+  DEBUG_CPPFLAGS="-DDEBUG -D_DEBUG"
 else
-  with_quicktime=yes
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-# does the user want OpenCV to use the Carbon GUI of Mac OS X?
 
-# Check whether --with-carbon was given.
-if test "${with_carbon+set}" = set; then
-  withval=$with_carbon; with_carbon=$withval
-else
-  with_carbon=yes
-fi
 
+## see if the user wants aggressive optimizations of the code
+{ $as_echo "$as_me:$LINENO: checking whether to enable aggressive optimization flags" >&5
+$as_echo_n "checking whether to enable aggressive optimization flags... " >&6; }
+OPTIMIZATION_CPPFLAGS=""
+OPTIMIZATION_CXXFLAGS=""
+FLOAT_STORE_CFLAGS=""
+if test x"$enable_optimization" = "xyes"; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-# does the user want OpenCV to use GTK+ 2.0 for the GUI?
+  # cure annoying default arguments for CFLAGS and CXXFLAGS
+  # that autoconf automatically sets in GNU environments if
+  # no CFLAGS or CXXFLAGS were manually given
+  #
+  # this is a more or less a hack ...
+  if test x"$CFLAGS" = x"-g -O2" ; then
+    CFLAGS=""
+  fi
+  if test x"$CXXFLAGS" = x"-g -O2" ; then
+    CXXFLAGS=""
+  fi
 
-# Check whether --with-gtk was given.
-if test "${with_gtk+set}" = set; then
-  withval=$with_gtk; with_gtk=$withval
-else
-  with_gtk=auto
-fi
+  if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
 
+    # special flag for gcc to work around excess precision bug in cLapack
+    FLOAT_STORE_CFLAGS="-ffloat-store"
 
-# does the user want OpenCV to use gthread for GTK+ threaded HighGUI?
+    # Due to a misconception, until SVN revision r1713, the case statement
+    # used the value of '--target', not of '--host'
+    case $host in
+    i386-apple-*)
+      # all intel macs have at least prescott instruction set
+      OPTIMIZATION_CXXFLAGS="-fast -g -march=prescott"
+      ;;
+    x86_64-apple-*)
+      # all 64bit intel macs have at least nocona instruction set
+      OPTIMIZATION_CXXFLAGS="-fast -g -march=nocona"
+      ;;
+       i?86-*-*)
+      # okay, we use this default together with the specification of the target architecture
+      # let us just assume, a Pentium 4 would be the minimum platform for OpenCV,
+      # then SSE2 instruction set is available also
+         OPTIMIZATION_CXXFLAGS="-O3 -g -march=pentium4 -ffast-math -fomit-frame-pointer"
+         ;;
+       amd64-*-* | x86_64-*-*)
+         OPTIMIZATION_CXXFLAGS="-O3 -g -march=x86-64 -ffast-math -fomit-frame-pointer"
+      ;;
+    powerpc-apple-*)
+      # Mac OS X 10.4 runs on CPUs >= G4 only
+      OPTIMIZATION_CXXFLAGS="-O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ffast-math -fstrict-aliasing -funroll-loops -ftree-loop-linear -ftree-loop-memset -mcpu=G4 -mpowerpc-gpopt -mtune=G5 -fsched-interblock -fgcse-sm -g"
+      ;;
+    powerpc64-apple-*)
+      # There are no 64bit Macs with a CPU that's not a G5
+      OPTIMIZATION_CXXFLAGS="-O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ffast-math -fstrict-aliasing -funroll-loops -ftree-loop-linear -ftree-loop-memset -mcpu=G5 -mpowerpc-gpopt -fsched-interblock -fgcse-sm -m64 -g"
+      ;;
+    powerpc-*-*)
+      # generic PowerPCs don't have Apple's 'fast' or 'fastf' switch
+      OPTIMIZATION_CXXFLAGS="-O3 -g -mcpu=G3 -mtune=G4 -fomit-frame-pointer"
+      ;;
+    *-*-*)
+      OPTIMIZATION_CXXFLAGS="-O2 -fomit-frame-pointer"
+      ;;
+    esac
+  fi
 
-# Check whether --with-gthread was given.
-if test "${with_gthread+set}" = set; then
-  withval=$with_gthread; with_gthread=$withval
+  OPTIMIZATION_CPPFLAGS="-DNDEBUG"
 else
-  with_gthread=auto
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
-######################################################################
-# Compiler options
-
-# OpenMP support
-# macro calls AC_SUBST(OPENMP_CXXFLAGS)
-# and brings its own enable/disable switch ("--disable-openmp")
 
-  OPENMP_CXXFLAGS=
-  # Check whether --enable-openmp was given.
-if test "${enable_openmp+set}" = set; then
-  enableval=$enable_openmp;
-fi
+# basic libraries needed by OpenCV
 
-  if test "$enable_openmp" != no; then
-    { $as_echo "$as_me:$LINENO: checking for $CC option to support OpenMP" >&5
-$as_echo_n "checking for $CC option to support OpenMP... " >&6; }
-if test "${ac_cv_prog_cxx_openmp+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
+if test "${ac_cv_lib_m_pow+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-#ifndef _OPENMP
- choke me
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
 #endif
-#include <omp.h>
-int main () { return omp_get_num_threads (); }
-
+char pow ();
+int
+main ()
+{
+return pow ();
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
@@ -21353,23 +17493,59 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_prog_cxx_openmp='none needed'
+  ac_cv_lib_m_pow=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_prog_cxx_openmp='unsupported'
-                                                                                                         for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
-           ac_save_CXXFLAGS=$CXXFLAGS
-           CXXFLAGS="$CXXFLAGS $ac_option"
-           cat >conftest.$ac_ext <<_ACEOF
+       ac_cv_lib_m_pow=no
+fi
 
-#ifndef _OPENMP
- choke me
-#endif
-#include <omp.h>
-int main () { return omp_get_num_threads (); }
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
@@ -21392,109 +17568,61 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_prog_cxx_openmp=$ac_option
+  ac_cv_lib_dl_dlopen=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-           CXXFLAGS=$ac_save_CXXFLAGS
-           if test "$ac_cv_prog_cxx_openmp" != unsupported; then
-             break
-           fi
-         done
+       ac_cv_lib_dl_dlopen=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_openmp" >&5
-$as_echo "$ac_cv_prog_cxx_openmp" >&6; }
-    case $ac_cv_prog_cxx_openmp in #(
-      "none needed" | unsupported)
-        ;; #(
-      *)
-        OPENMP_CXXFLAGS=$ac_cv_prog_cxx_openmp ;;
-    esac
-  fi
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
 
+  LIBS="-ldl $LIBS"
 
-# SSE/SSE2/SSE3 support
-if test x"$enable_sse" = "xyes"; then
-  # This macro calls:
-  #   AC_SUBST(SIMD_FLAGS)
-  # And defines:
-  #   HAVE_MMX / HAVE_SSE / HAVE_SSE2 / HAVE_SSE3 / HAVE_SSSE3
+fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:$LINENO: checking for x86 cpuid  output" >&5
-$as_echo_n "checking for x86 cpuid  output... " >&6; }
-if test "${ax_cv_gcc_x86_cpuid_+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  ax_cv_gcc_x86_cpuid_=unknown
-else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
 int
 main ()
 {
-
-     int op = , eax, ebx, ecx, edx;
-     FILE *f;
-#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
-     __asm__("push %%rbx\n\t"
-             "cpuid\n\t"
-             "pop %%rbx"
-             : "=a" (eax), "=c" (ecx), "=d" (edx)
-             : "a" (op));
-     __asm__("push %%rbx\n\t"
-             "cpuid\n\t"
-             "mov %%rbx, %%rax\n\t"
-             "pop %%rbx"
-             : "=a" (ebx), "=c" (ecx), "=d" (edx)
-             : "a" (op));
-#else
-     __asm__("push %%ebx\n\t"
-             "cpuid\n\t"
-             "pop %%ebx"
-             : "=a" (eax), "=c" (ecx), "=d" (edx)
-             : "a" (op));
-     __asm__("push %%ebx\n\t"
-             "cpuid\n\t"
-             "mov %%ebx, %%eax\n\t"
-             "pop %%ebx"
-             : "=a" (ebx), "=c" (ecx), "=d" (edx)
-             : "a" (op));
-#endif
-     f = fopen("conftest_cpuid", "w"); if (!f) return 1;
-     fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
-     fclose(f);
-     return 0;
-
+return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21502,110 +17630,74 @@ case "(($ac_try" in
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ax_cv_gcc_x86_cpuid_=`cat conftest_cpuid`; rm -f conftest_cpuid
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_pthread_pthread_create=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-ax_cv_gcc_x86_cpuid_=unknown; rm -f conftest_cpuid
+       ac_cv_lib_pthread_pthread_create=no
 fi
+
 rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPTHREAD 1
+_ACEOF
 
+  LIBS="-lpthread $LIBS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_" >&5
-$as_echo "$ax_cv_gcc_x86_cpuid_" >&6; }
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
 
 
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-{ $as_echo "$as_me:$LINENO: checking for x86 cpuid 0x00000001 output" >&5
-$as_echo_n "checking for x86 cpuid 0x00000001 output... " >&6; }
-if test "${ax_cv_gcc_x86_cpuid_0x00000001+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for gzputs in -lz" >&5
+$as_echo_n "checking for gzputs in -lz... " >&6; }
+if test "${ac_cv_lib_z_gzputs+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  ax_cv_gcc_x86_cpuid_0x00000001=unknown
-else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gzputs ();
 int
 main ()
 {
-
-     int op = 0x00000001, eax, ebx, ecx, edx;
-     FILE *f;
-#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
-     __asm__("push %%rbx\n\t"
-             "cpuid\n\t"
-             "pop %%rbx"
-             : "=a" (eax), "=c" (ecx), "=d" (edx)
-             : "a" (op));
-     __asm__("push %%rbx\n\t"
-             "cpuid\n\t"
-             "mov %%rbx, %%rax\n\t"
-             "pop %%rbx"
-             : "=a" (ebx), "=c" (ecx), "=d" (edx)
-             : "a" (op));
-#else
-     __asm__("push %%ebx\n\t"
-             "cpuid\n\t"
-             "pop %%ebx"
-             : "=a" (eax), "=c" (ecx), "=d" (edx)
-             : "a" (op));
-     __asm__("push %%ebx\n\t"
-             "cpuid\n\t"
-             "mov %%ebx, %%eax\n\t"
-             "pop %%ebx"
-             : "=a" (ebx), "=c" (ecx), "=d" (edx)
-             : "a" (op));
-#endif
-     f = fopen("conftest_cpuid", "w"); if (!f) return 1;
-     fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
-     fclose(f);
-     return 0;
-
+return gzputs ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -21613,146 +17705,251 @@ case "(($ac_try" in
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ax_cv_gcc_x86_cpuid_0x00000001=`cat conftest_cpuid`; rm -f conftest_cpuid
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_z_gzputs=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-ax_cv_gcc_x86_cpuid_0x00000001=unknown; rm -f conftest_cpuid
+       ac_cv_lib_z_gzputs=no
 fi
+
 rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzputs" >&5
+$as_echo "$ac_cv_lib_z_gzputs" >&6; }
+if test "x$ac_cv_lib_z_gzputs" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
 
+  LIBS="-lz $LIBS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0x00000001" >&5
-$as_echo "$ax_cv_gcc_x86_cpuid_0x00000001" >&6; }
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-  ecx=`echo $ax_cv_gcc_x86_cpuid_0x00000001 | cut -d ":" -f 3`
-  edx=`echo $ax_cv_gcc_x86_cpuid_0x00000001 | cut -d ":" -f 4`
+# check endianness
 
- { $as_echo "$as_me:$LINENO: checking whether mmx is supported" >&5
-$as_echo_n "checking whether mmx is supported... " >&6; }
-if test "${ax_cv_have_mmx_ext+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+              not a universal capable compiler
+            #endif
+            typedef int dummy;
 
-    ax_cv_have_mmx_ext=no
-    if test "$((0x$edx>>23&0x01))" = 1; then
-      ax_cv_have_mmx_ext=yes
-    fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_mmx_ext" >&5
-$as_echo "$ax_cv_have_mmx_ext" >&6; }
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
- { $as_echo "$as_me:$LINENO: checking whether sse is supported" >&5
-$as_echo_n "checking whether sse is supported... " >&6; }
-if test "${ax_cv_have_sse_ext+set}" = set; then
-  $as_echo_n "(cached) " >&6
+       # Check for potential -arch flags.  It is not universal unless
+       # there are some -arch flags.  Note that *ppc* also matches
+       # ppc64.  This check is also rather less than ideal.
+       case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+         *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+       esac
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    ax_cv_have_sse_ext=no
-    if test "$((0x$edx>>25&0x01))" = 1; then
-      ax_cv_have_sse_ext=yes
-    fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_sse_ext" >&5
-$as_echo "$ax_cv_have_sse_ext" >&6; }
 
- { $as_echo "$as_me:$LINENO: checking whether sse2 is supported" >&5
-$as_echo_n "checking whether sse2 is supported... " >&6; }
-if test "${ax_cv_have_sse2_ext+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+            #include <sys/param.h>
 
-    ax_cv_have_sse2_ext=no
-    if test "$((0x$edx>>26&0x01))" = 1; then
-      ax_cv_have_sse2_ext=yes
-    fi
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+                    && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+                    && LITTLE_ENDIAN)
+             bogus endian macros
+            #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+               #include <sys/param.h>
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_sse2_ext" >&5
-$as_echo "$ax_cv_have_sse2_ext" >&6; }
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+                not big endian
+               #endif
 
- { $as_echo "$as_me:$LINENO: checking whether sse3 is supported" >&5
-$as_echo_n "checking whether sse3 is supported... " >&6; }
-if test "${ax_cv_have_sse3_ext+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    ax_cv_have_sse3_ext=no
-    if test "$((0x$ecx&0x01))" = 1; then
-      ax_cv_have_sse3_ext=yes
-    fi
-
+       ac_cv_c_bigendian=no
 fi
-{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_sse3_ext" >&5
-$as_echo "$ax_cv_have_sse3_ext" >&6; }
 
- { $as_echo "$as_me:$LINENO: checking whether ssse3 is supported" >&5
-$as_echo_n "checking whether ssse3 is supported... " >&6; }
-if test "${ax_cv_have_ssse3_ext+set}" = set; then
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    ax_cv_have_ssse3_ext=no
-    if test "$((0x$ecx>>9&0x01))" = 1; then
-      ax_cv_have_ssse3_ext=yes
-    fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_ssse3_ext" >&5
-$as_echo "$ax_cv_have_ssse3_ext" >&6; }
-
-  if test "$ax_cv_have_mmx_ext" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMX /**/
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
 
-     { $as_echo "$as_me:$LINENO: checking whether C++ compiler accepts -mmmx" >&5
-$as_echo_n "checking whether C++ compiler accepts -mmmx... " >&6; }
-if test "${ax_cv_cxx_flags__mmmx+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+             bogus endian macros
+            #endif
 
-      ax_save_FLAGS=$CXXFLAGS
-      CXXFLAGS="-mmmx"
-      cat >conftest.$ac_ext <<_ACEOF
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <limits.h>
 
 int
 main ()
 {
+#ifndef _BIG_ENDIAN
+                not big endian
+               #endif
 
   ;
   return 0;
@@ -21776,54 +17973,54 @@ $as_echo "$ac_try_echo") >&5
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ax_cv_cxx_flags__mmmx=yes
+  ac_cv_c_bigendian=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ax_cv_cxx_flags__mmmx=no
+       ac_cv_c_bigendian=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      CXXFLAGS=$ax_save_FLAGS
-fi
-
-eval ax_check_compiler_flags=$ax_cv_cxx_flags__mmmx
-{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-$as_echo "$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
-       SIMD_FLAGS="$SIMD_FLAGS -mmmx"
 else
-       :
-fi
-
-  fi
-
-  if test "$ax_cv_have_sse_ext" = yes; then
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SSE /**/
-_ACEOF
 
-     { $as_echo "$as_me:$LINENO: checking whether C++ compiler accepts -msse" >&5
-$as_echo_n "checking whether C++ compiler accepts -msse... " >&6; }
-if test "${ax_cv_cxx_flags__msse+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
+fi
 
-      ax_save_FLAGS=$CXXFLAGS
-      CXXFLAGS="-msse"
-      cat >conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+short int ascii_mm[] =
+                 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+               short int ascii_ii[] =
+                 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+               int use_ascii (int i) {
+                 return ascii_mm[i] + ascii_ii[i];
+               }
+               short int ebcdic_ii[] =
+                 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+               short int ebcdic_mm[] =
+                 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+               int use_ebcdic (int i) {
+                 return ebcdic_mm[i] + ebcdic_ii[i];
+               }
+               extern int foo;
 
 int
 main ()
 {
-
+return use_ascii (foo) == use_ebcdic (foo);
   ;
   return 0;
 }
@@ -21846,67 +18043,149 @@ $as_echo "$ac_try_echo") >&5
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ax_cv_cxx_flags__msse=yes
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+             ac_cv_c_bigendian=yes
+           fi
+           if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+             if test "$ac_cv_c_bigendian" = unknown; then
+               ac_cv_c_bigendian=no
+             else
+               # finding both strings is unlikely to happen, but who knows?
+               ac_cv_c_bigendian=unknown
+             fi
+           fi
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ax_cv_cxx_flags__msse=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      CXXFLAGS=$ax_save_FLAGS
-fi
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
 
-eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse
-{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-$as_echo "$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
-       SIMD_FLAGS="$SIMD_FLAGS -msse"
+            /* Are we little or big endian?  From Harbison&Steele.  */
+            union
+            {
+              long int l;
+              char c[sizeof (long int)];
+            } u;
+            u.l = 1;
+            return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=no
 else
-       :
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-  fi
 
-  if test "$ax_cv_have_sse2_ext" = yes; then
+    fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_SSE2 /**/
+#define AC_APPLE_UNIVERSAL_BUILD 1
 _ACEOF
 
-     { $as_echo "$as_me:$LINENO: checking whether C++ compiler accepts -msse2" >&5
-$as_echo_n "checking whether C++ compiler accepts -msse2... " >&6; }
-if test "${ax_cv_cxx_flags__msse2+set}" = set; then
+     ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+   { (exit 1); exit 1; }; } ;;
+ esac
+
+
+# check for specific functions that might be missing from
+# certain standard library implementations
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-
-      ax_save_FLAGS=$CXXFLAGS
-      CXXFLAGS="-msse2"
-      cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+#include <alloca.h>
 int
 main ()
 {
-
+char *p = (char *) alloca (2 * sizeof (int));
+                         if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -21915,222 +18194,187 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ax_cv_cxx_flags__msse2=yes
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_working_alloca_h=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ax_cv_cxx_flags__msse2=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      CXXFLAGS=$ax_save_FLAGS
+       ac_cv_working_alloca_h=no
 fi
 
-eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse2
-{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-$as_echo "$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
-       SIMD_FLAGS="$SIMD_FLAGS -msse2"
-else
-       :
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-
-  fi
-
-  if test "$ax_cv_have_sse3_ext" = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_SSE3 /**/
+#define HAVE_ALLOCA_H 1
 _ACEOF
 
-     { $as_echo "$as_me:$LINENO: checking whether C++ compiler accepts -msse3" >&5
-$as_echo_n "checking whether C++ compiler accepts -msse3... " >&6; }
-if test "${ax_cv_cxx_flags__msse3+set}" = set; then
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-
-      ax_save_FLAGS=$CXXFLAGS
-      CXXFLAGS="-msse3"
-      cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
 
 int
 main ()
 {
-
+char *p = (char *) alloca (1);
+                                   if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ax_cv_cxx_flags__msse3=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ax_cv_cxx_flags__msse3=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      CXXFLAGS=$ax_save_FLAGS
-fi
-
-eval ax_check_compiler_flags=$ax_cv_cxx_flags__msse3
-{ $as_echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5
-$as_echo "$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
-       SIMD_FLAGS="$SIMD_FLAGS -msse3"
-else
-       :
-fi
-
-  fi
-
-  if test "$ax_cv_have_ssse3_ext" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SSSE3 /**/
-_ACEOF
-
-  fi
-
-
-
-fi
-
-
-## check whether to include debugging compiler flags
-{ $as_echo "$as_me:$LINENO: checking whether to build debug version" >&5
-$as_echo_n "checking whether to build debug version... " >&6; }
-DEBUG_CPPFLAGS=""
-DEBUG_CXXFLAGS=""
-if test x"$enable_debug" = "xyes"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
-    DEBUG_CXXFLAGS="-ggdb"
-  fi
-
-  DEBUG_CPPFLAGS="-DDEBUG -D_DEBUG"
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-## see if the user wants aggressive optimizations of the code
-{ $as_echo "$as_me:$LINENO: checking whether to enable aggressive optimization flags" >&5
-$as_echo_n "checking whether to enable aggressive optimization flags... " >&6; }
-OPTIMIZATION_CPPFLAGS=""
-OPTIMIZATION_CXXFLAGS=""
-FLOAT_STORE_CFLAGS=""
-if test x"$enable_optimization" = "xyes"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  # cure annoying default arguments for CFLAGS and CXXFLAGS
-  # that autoconf automatically sets in GNU environments if
-  # no CFLAGS or CXXFLAGS were manually given
-  #
-  # this is a more or less a hack ...
-  if test x"$CFLAGS" = x"-g -O2" ; then
-    CFLAGS=""
-  fi
-  if test x"$CXXFLAGS" = x"-g -O2" ; then
-    CXXFLAGS=""
-  fi
-
-  if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
-
-    # special flag for gcc to work around excess precision bug in cLapack
-    FLOAT_STORE_CFLAGS="-ffloat-store"
-
-    # Due to a misconception, until SVN revision r1713, the case statement
-    # used the value of '--target', not of '--host'
-    case $host in
-    i386-apple-*)
-      # all intel macs have at least prescott instruction set
-      OPTIMIZATION_CXXFLAGS="-fast -g -march=prescott"
-      ;;
-    x86_64-apple-*)
-      # all 64bit intel macs have at least nocona instruction set
-      OPTIMIZATION_CXXFLAGS="-fast -g -march=nocona"
-      ;;
-    amd64-*-* | x86_64-*-* | i?86-*-*)
-      # okay, we use this default together with the specification of the target architecture
-      # let us just assume, a Pentium 4 would be the minimum platform for OpenCV,
-      # then SSE2 instruction set is available also
-      OPTIMIZATION_CXXFLAGS="-O3 -g -march=pentium4 -ffast-math -fomit-frame-pointer"
-      ;;
-    powerpc-apple-*)
-      # Mac OS X 10.4 runs on CPUs >= G4 only
-      OPTIMIZATION_CXXFLAGS="-O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ffast-math -fstrict-aliasing -funroll-loops -ftree-loop-linear -ftree-loop-memset -mcpu=G4 -mpowerpc-gpopt -mtune=G5 -fsched-interblock -fgcse-sm -g"
-      ;;
-    powerpc64-apple-*)
-      # There are no 64bit Macs with a CPU that's not a G5
-      OPTIMIZATION_CXXFLAGS="-O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ffast-math -fstrict-aliasing -funroll-loops -ftree-loop-linear -ftree-loop-memset -mcpu=G5 -mpowerpc-gpopt -fsched-interblock -fgcse-sm -m64 -g"
-      ;;
-    powerpc-*-*)
-      # generic PowerPCs don't have Apple's 'fast' or 'fastf' switch
-      OPTIMIZATION_CXXFLAGS="-O3 -g -mcpu=G3 -mtune=G4 -fomit-frame-pointer"
-      ;;
-    *-*-*)
-      OPTIMIZATION_CXXFLAGS="-O2 -fomit-frame-pointer"
-      ;;
-    esac
-  fi
-
-  OPTIMIZATION_CPPFLAGS="-DNDEBUG"
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_alloca_works=yes
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_func_alloca_works=no
 fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
+
+if test $ac_cv_func_alloca_works = yes; then
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
+_ACEOF
+
+else
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
 
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
+cat >>confdefs.h <<\_ACEOF
+#define C_ALLOCA 1
+_ACEOF
 
-# add libm because it is used by several libraries and OpenCV itself
 
-{ $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
-$as_echo_n "checking for pow in -lm... " >&6; }
-if test "${ac_cv_lib_m_pow+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -22138,11 +18382,18 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char pow ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
 int
 main ()
 {
-return pow ();
+return $ac_func ();
   ;
   return 0;
 }
@@ -22168,61 +18419,72 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_m_pow=yes
+  eval "$as_ac_var=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_m_pow=no
+       eval "$as_ac_var=no"
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-$as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+ac_res=`eval 'as_val=${'$as_ac_var'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
 
-  LIBS="-lm $LIBS"
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
 
+    break
 fi
 
+  done
+fi
 
-{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
 int
 main ()
 {
-return dlopen ();
-  ;
-  return 0;
+  return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -22230,139 +18492,222 @@ case "(($ac_try" in
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_stack_direction=1
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_stack_direction=-1
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+fi
+
+
+for ac_header in malloc.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dl_dlopen=yes
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_dl_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
+       ac_header_compiler=no
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_create ();
-int
-main ()
-{
-return pthread_create ();
-  ;
-  return 0;
-}
+#include <$ac_header>
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_pthread_pthread_create=yes
+  ac_header_preproc=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_pthread_pthread_create=no
+  ac_header_preproc=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-  LIBS="-lpthread $LIBS"
-
 fi
 
+done
 
-# check endianness
 
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
+for ac_header in assert.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat >conftest.$ac_ext <<_ACEOF
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifndef __APPLE_CC__
-              not a universal capable compiler
-            #endif
-            typedef int dummy;
-
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -22382,93 +18727,175 @@ $as_echo "$ac_try_echo") >&5
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-
-       # Check for potential -arch flags.  It is not universal unless
-       # there are some -arch flags.  Note that *ppc* also matches
-       # ppc64.  This check is also rather less than ideal.
-       case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
-         *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-       esac
+  ac_header_compiler=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+       ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat >conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-            #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-                    && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-                    && LITTLE_ENDIAN)
-             bogus endian macros
-            #endif
-
-  ;
-  return 0;
-}
+#include <$ac_header>
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-        cat >conftest.$ac_ext <<_ACEOF
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_func in lrint
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-               #include <sys/param.h>
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
 
 int
 main ()
 {
-#if BYTE_ORDER != BIG_ENDIAN
-                not big endian
-               #endif
-
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -22477,93 +18904,80 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_bigendian=yes
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_c_bigendian=no
+       eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+ac_res=`eval 'as_val=${'$as_ac_var'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <limits.h>
 
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-             bogus endian macros
-            #endif
+fi
+done
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-        cat >conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5
+$as_echo_n "checking for library containing clock_gettime... " >&6; }
+if test "${ac_cv_search_clock_gettime+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <limits.h>
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clock_gettime ();
 int
 main ()
 {
-#ifndef _BIG_ENDIAN
-                not big endian
-               #endif
-
+return clock_gettime ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+for ac_lib in '' rt; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -22572,58 +18986,74 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_bigendian=yes
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_clock_gettime=$ac_res
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_c_bigendian=no
+
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_clock_gettime+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_clock_gettime+set}" = set; then
+  :
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  ac_cv_search_clock_gettime=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5
+$as_echo "$ac_cv_search_clock_gettime" >&6; }
+ac_res=$ac_cv_search_clock_gettime
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then
-  # Try to guess by grepping values from an object file.
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short int ascii_mm[] =
-                 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-               short int ascii_ii[] =
-                 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-               int use_ascii (int i) {
-                 return ascii_mm[i] + ascii_ii[i];
-               }
-               short int ebcdic_ii[] =
-                 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-               short int ebcdic_mm[] =
-                 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-               int use_ebcdic (int i) {
-                 return ebcdic_mm[i] + ebcdic_ii[i];
-               }
-               extern int foo;
 
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
+######################################################################
+# BLAS and LAPACK
+
+LAPACK_LIBS=""
+have_native_lapack=no
+if test x"$with_native_lapack" = "xyes"; then
+  # check for Accellerate framework on Mac OS X
+  #
+  # As of Mac OS X 10.5 blas and lapack exist as standard shared
+  # libraries, so this check could be replaced by separate checks for
+  # those two libraries as it may be helpful for Linux/Unix variants
+  # as well.
+  if test "${ac_cv_header_vecLib_clapack_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for vecLib/clapack.h" >&5
+$as_echo_n "checking for vecLib/clapack.h... " >&6; }
+if test "${ac_cv_header_vecLib_clapack_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vecLib_clapack_h" >&5
+$as_echo "$ac_cv_header_vecLib_clapack_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking vecLib/clapack.h usability" >&5
+$as_echo_n "checking vecLib/clapack.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <vecLib/clapack.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -22643,149 +19073,169 @@ $as_echo "$ac_try_echo") >&5
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-             ac_cv_c_bigendian=yes
-           fi
-           if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-             if test "$ac_cv_c_bigendian" = unknown; then
-               ac_cv_c_bigendian=no
-             else
-               # finding both strings is unlikely to happen, but who knows?
-               ac_cv_c_bigendian=unknown
-             fi
-           fi
+  ac_header_compiler=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+       ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking vecLib/clapack.h presence" >&5
+$as_echo_n "checking vecLib/clapack.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-            /* Are we little or big endian?  From Harbison&Steele.  */
-            union
-            {
-              long int l;
-              char c[sizeof (long int)];
-            } u;
-            u.l = 1;
-            return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
+#include <vecLib/clapack.h>
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+  ac_header_preproc=no
 fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-    fi
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: vecLib/clapack.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: vecLib/clapack.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: vecLib/clapack.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: vecLib/clapack.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: vecLib/clapack.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: vecLib/clapack.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: vecLib/clapack.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: vecLib/clapack.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for vecLib/clapack.h" >&5
+$as_echo_n "checking for vecLib/clapack.h... " >&6; }
+if test "${ac_cv_header_vecLib_clapack_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_vecLib_clapack_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
-;; #(
-   no)
-      ;; #(
-   universal)
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vecLib_clapack_h" >&5
+$as_echo "$ac_cv_header_vecLib_clapack_h" >&6; }
+
+fi
+if test "x$ac_cv_header_vecLib_clapack_h" = x""yes; then
+
 
 cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
+#define HAVE_VECLIB /**/
 _ACEOF
 
-     ;; #(
-   *)
-     { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
- esac
+                  LAPACK_LIBS="-Xlinker -framework -Xlinker vecLib"
+                  have_native_lapack=yes
 
+else
 
-# check for specific functions that might be missing from
-# certain standard library implementations
+                  have_native_lapack=no
 
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
+fi
+
+
+fi
+
+
+ if test x"$have_native_lapack" = "xyes"; then
+  NATIVE_LAPACK_TRUE=
+  NATIVE_LAPACK_FALSE='#'
+else
+  NATIVE_LAPACK_TRUE='#'
+  NATIVE_LAPACK_FALSE=
+fi
+
+
+
+######################################################################
+# HighGUI dependencies for windowing system
+
+# honor user selection,
+# if no selection given check for Carbon first
+CARBON_CFLAGS=""
+CARBON_LIBS=""
+if test x"$with_carbon" = "xyes"; then
+
+    # header presence and usability seem to be enough
+    if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
+$as_echo_n "checking for Carbon/Carbon.h... " >&6; }
+if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
   $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
+$as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
+$as_echo_n "checking Carbon/Carbon.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-                         if (p) return 0;
-  ;
-  return 0;
-}
+$ac_includes_default
+#include <Carbon/Carbon.h>
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -22794,512 +19244,506 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_working_alloca_h=yes
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_working_alloca_h=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
-
+       ac_header_compiler=no
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5
+$as_echo_n "checking Carbon/Carbon.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-                                   if (p) return 0;
-  ;
-  return 0;
-}
+#include <Carbon/Carbon.h>
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_func_alloca_works=yes
+  ac_header_preproc=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_func_alloca_works=no
+  ac_header_preproc=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: Carbon/Carbon.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: Carbon/Carbon.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
+$as_echo_n "checking for Carbon/Carbon.h... " >&6; }
+if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_Carbon_Carbon_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
+$as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
+
+fi
+if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CARBON /**/
+_ACEOF
+
+                      CARBON_LIBS="-Xlinker -framework -Xlinker Carbon"
+                      have_carbon=yes
+
+else
+
+                      have_carbon=no
+                      with_carbon=no
+
+fi
+
+
+
+    # sanity checks
+    if test x"$have_carbon" = "xyes"; then
+
+        # if we asked for gtk, this is not ok
+        if test x"$with_gtk" = "xyes"; then
+            { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-carbon and --with-gtk at the same time" >&5
+$as_echo "$as_me: error: You cannot specify --with-carbon and --with-gtk at the same time" >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+
+        # don't check alternatives if carbon was found
+        if test x"$with_gtk" = "xauto"; then
+            with_gtk=no
+        fi
+    fi
+else
+    have_carbon=no
+    if test ! x"$with_carbon" = "xno"; then
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-carbon, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-carbon, continuing assuming 'no'" >&2;}
+    fi
+fi
+
+
+ if test x"$have_carbon" = "xyes"; then
+  BUILD_CARBON_TRUE=
+  BUILD_CARBON_FALSE='#'
+else
+  BUILD_CARBON_TRUE='#'
+  BUILD_CARBON_FALSE=
+fi
+
+
+# use GTK+ 2.x (or later) for windowing
+# if carbon not present or not wanted (--without-carbon)
+GTK_CFLAGS=""
+GTK_LIBS=""
+GTHREAD_CFLAGS=""
+GTHREAD_LIBS=""
+if test x"$with_gtk" = "xno"; then
+    have_gtk=no
+else
+
+    # check if ./configure arguments are valid
+    if test x"$with_gtk" = "xauto"; then
+       with_gtk=yes
+    fi
+    if test x"$with_gtk" = "xyes"; then
+
+        # pkg-config is needed for GTK+
+        # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test x"$PKG_CONFIG" = x"no"; then
+            { $as_echo "$as_me:$LINENO: WARNING: You have to install pkg-config to compile OpenCV with GTK+" >&5
+$as_echo "$as_me: WARNING: You have to install pkg-config to compile OpenCV with GTK+" >&2;}
+        else
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
 
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
+  fi
 
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { $as_echo "$as_me:$LINENO: checking for \"gtk+-2.0 gdk-pixbuf-2.0\"" >&5
+$as_echo_n "checking for \"gtk+-2.0 gdk-pixbuf-2.0\"... " >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+        if $PKG_CONFIG --exists ""gtk+-2.0 gdk-pixbuf-2.0"" ; then
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
 
+            { $as_echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
+$as_echo_n "checking GTK_CFLAGS... " >&6; }
+            GTK_CFLAGS=`$PKG_CONFIG --cflags ""gtk+-2.0 gdk-pixbuf-2.0""`
+            { $as_echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
+$as_echo "$GTK_CFLAGS" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
+            { $as_echo "$as_me:$LINENO: checking GTK_LIBS" >&5
+$as_echo_n "checking GTK_LIBS... " >&6; }
+            GTK_LIBS=`$PKG_CONFIG --libs ""gtk+-2.0 gdk-pixbuf-2.0""`
+            { $as_echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
+$as_echo "$GTK_LIBS" >&6; }
+        else
+            GTK_CFLAGS=""
+            GTK_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""gtk+-2.0 gdk-pixbuf-2.0""`
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
+        fi
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
 
-#undef $ac_func
+  if test $succeeded = yes; then
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
+                                have_gtk=yes
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GTK /**/
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-                $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
+  else
+      have_gtk=no
+  fi
 
-    break
+        fi
+    else
+        # if we get here then --with-gtk was not called with 'yes','no' or 'auto'
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-gtk, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-gtk, continuing assuming 'no'" >&2;}
+        have_gtk=no
+    fi
 fi
+if test x"$with_gthread" = "xno"; then
+    have_gthread=no
+else
+    if test x"$have_gtk" = "xyes"; then
+        if test x"$with_gthread" = "xauto"; then
+            with_gthread=yes
+        fi
 
-  done
-fi
+        if test x"$with_gthread" = "xyes"; then
 
-{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
+  succeeded=no
 
-int
-main ()
-{
-  return find_stack_direction () < 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_stack_direction=1
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
+  fi
 
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { $as_echo "$as_me:$LINENO: checking for \"gthread-2.0\"" >&5
+$as_echo_n "checking for \"gthread-2.0\"... " >&6; }
 
+        if $PKG_CONFIG --exists ""gthread-2.0"" ; then
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
 
-fi
+            { $as_echo "$as_me:$LINENO: checking GTHREAD_CFLAGS" >&5
+$as_echo_n "checking GTHREAD_CFLAGS... " >&6; }
+            GTHREAD_CFLAGS=`$PKG_CONFIG --cflags ""gthread-2.0""`
+            { $as_echo "$as_me:$LINENO: result: $GTHREAD_CFLAGS" >&5
+$as_echo "$GTHREAD_CFLAGS" >&6; }
 
+            { $as_echo "$as_me:$LINENO: checking GTHREAD_LIBS" >&5
+$as_echo_n "checking GTHREAD_LIBS... " >&6; }
+            GTHREAD_LIBS=`$PKG_CONFIG --libs ""gthread-2.0""`
+            { $as_echo "$as_me:$LINENO: result: $GTHREAD_LIBS" >&5
+$as_echo "$GTHREAD_LIBS" >&6; }
+        else
+            GTHREAD_CFLAGS=""
+            GTHREAD_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""gthread-2.0""`
 
-for ac_header in malloc.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+        fi
 
-       ac_header_compiler=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+
+                                have_gthread=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GTHREAD /**/
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
+
+  else
+      have_gthread=no
+  fi
+
+        else
+            # if we get here then --with-gthread was not called with 'yes','no' or 'auto'
+            { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-gthread, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-gthread, continuing assuming 'no'" >&2;}
+            have_gthread=no
+        fi
+    else
+        # if no gtk+ was detected, looking for gthread does not make any sense
+        have_gthread=no
+    fi
 fi
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+
+
+ if test x"$have_gtk" = "xyes"; then
+  BUILD_GTK_TRUE=
+  BUILD_GTK_FALSE='#'
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  BUILD_GTK_TRUE='#'
+  BUILD_GTK_FALSE=
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
 
-done
+######################################################################
+# HighGUI dependencies for video I/O
+
+# if QuickTime is present, it will override everything else,
+# (unless '--without-quicktime' was given)
+if test x"$with_quicktime" = "xyes"; then
 
+    # check other ./configure flags
+    if test x"$with_ffmpeg" = "xyes"; then
+        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-quicktime and --with-ffmpeg at the same time" >&5
+$as_echo "$as_me: error: You cannot specify --with-quicktime and --with-ffmpeg at the same time" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    if test x"$with_xine" = "xyes"; then
+        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-quicktime and --with-xine at the same time" >&5
+$as_echo "$as_me: error: You cannot specify --with-quicktime and --with-xine at the same time" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    if test x"$with_1394libs" = "xyes"; then
+        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-quicktime and --with-1394libs at the same time" >&5
+$as_echo "$as_me: error: You cannot specify --with-quicktime and --with-1394libs at the same time" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    if test x"$with_v4l" = "xyes"; then
+        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-quicktime and --with-v4l at the same time" >&5
+$as_echo "$as_me: error: You cannot specify --with-quicktime and --with-v4l at the same time" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
 
-for ac_header in assert.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+    # header presence and usability seem to be enough
+    if test "${ac_cv_header_QuickTime_QuickTime_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for QuickTime/QuickTime.h" >&5
+$as_echo_n "checking for QuickTime/QuickTime.h... " >&6; }
+if test "${ac_cv_header_QuickTime_QuickTime_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_QuickTime_QuickTime_h" >&5
+$as_echo "$ac_cv_header_QuickTime_QuickTime_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking QuickTime/QuickTime.h usability" >&5
+$as_echo_n "checking QuickTime/QuickTime.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23307,7 +19751,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <$ac_header>
+#include <QuickTime/QuickTime.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -23340,15 +19784,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking QuickTime/QuickTime.h presence" >&5
+$as_echo_n "checking QuickTime/QuickTime.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <$ac_header>
+#include <QuickTime/QuickTime.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -23382,25 +19826,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: QuickTime/QuickTime.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: QuickTime/QuickTime.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -23409,417 +19853,514 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+{ $as_echo "$as_me:$LINENO: checking for QuickTime/QuickTime.h" >&5
+$as_echo_n "checking for QuickTime/QuickTime.h... " >&6; }
+if test "${ac_cv_header_QuickTime_QuickTime_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  ac_cv_header_QuickTime_QuickTime_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_QuickTime_QuickTime_h" >&5
+$as_echo "$ac_cv_header_QuickTime_QuickTime_h" >&6; }
+
+fi
+if test "x$ac_cv_header_QuickTime_QuickTime_h" = x""yes; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_QUICKTIME /**/
+_ACEOF
+
+                      have_quicktime=yes
+
+else
+   have_quicktime=no
+fi
+
+
+
+    # specify quicktime libraries
+    if test x"$have_quicktime" = "xyes"; then
+        QUICKTIME_LIBS="-Xlinker -framework -Xlinker QuickTime -Xlinker -framework -Xlinker QuartzCore"
+
+        # don't check alternatives if quicktime was found
+        if test x"$with_ffmpeg" = "xauto"; then
+            with_ffmpeg=no
+        fi
+        if test x"$with_xine" = "xauto"; then
+            with_xine=no
+        fi
+        if test x"$with_1394libs" = "xauto"; then
+            with_1394libs=no
+        fi
+        if test x"$with_v4l" = "xauto"; then
+            with_v4l=no
+        fi
+    fi
+else
+    # check if ./configure arguments are valid
+    have_quicktime=no
+    if test ! x"$with_quicktime" = "xno"; then
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-quicktime, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-quicktime, continuing assuming 'no'" >&2;}
+    fi
+fi
+
+
+ if test x"$have_quicktime" = "xyes"; then
+  BUILD_QUICKTIME_TRUE=
+  BUILD_QUICKTIME_FALSE='#'
+else
+  BUILD_QUICKTIME_TRUE='#'
+  BUILD_QUICKTIME_FALSE=
+fi
+
+
+# GStreamer seems to be a nice solution for both reading and writing
+# and even supports some cameras
+GSTREAMER_CFLAGS=""
+GSTREAMER_LIBS=""
+if test x"$with_gstreamer" = "xno"; then
+    have_gstreamer=no
+else
+
+    if test x"$with_ffmpeg" = "xyes"; then
+        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-gstreamer and --with-ffmpeg at the same time" >&5
+$as_echo "$as_me: error: You cannot specify --with-gstreamer and --with-ffmpeg at the same time" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+    # check if ./configure arguments are valid
+    if test x"$with_gstreamer" = "xauto"; then
+       with_gstreamer=yes
+    fi
+    if test x"$with_gstreamer" = "xyes"; then
+
+        # pkg-config is needed for GTK+
+        # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test x"$PKG_CONFIG" == "xno"; then
+            { { $as_echo "$as_me:$LINENO: error: You have to install pkg-config to compile OpenCV with GStreamer" >&5
+$as_echo "$as_me: error: You have to install pkg-config to compile OpenCV with GStreamer" >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-                $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
+  fi
 
-done
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { $as_echo "$as_me:$LINENO: checking for \"gstreamer-0.10\"" >&5
+$as_echo_n "checking for \"gstreamer-0.10\"... " >&6; }
 
+        if $PKG_CONFIG --exists ""gstreamer-0.10"" ; then
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
 
-for ac_func in lrint
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
+            { $as_echo "$as_me:$LINENO: checking GSTREAMER_CFLAGS" >&5
+$as_echo_n "checking GSTREAMER_CFLAGS... " >&6; }
+            GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags ""gstreamer-0.10""`
+            { $as_echo "$as_me:$LINENO: result: $GSTREAMER_CFLAGS" >&5
+$as_echo "$GSTREAMER_CFLAGS" >&6; }
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+            { $as_echo "$as_me:$LINENO: checking GSTREAMER_LIBS" >&5
+$as_echo_n "checking GSTREAMER_LIBS... " >&6; }
+            GSTREAMER_LIBS=`$PKG_CONFIG --libs ""gstreamer-0.10""`
+            { $as_echo "$as_me:$LINENO: result: $GSTREAMER_LIBS" >&5
+$as_echo "$GSTREAMER_LIBS" >&6; }
+        else
+            GSTREAMER_CFLAGS=""
+            GSTREAMER_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""gstreamer-0.10""`
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+        fi
 
-#undef $ac_func
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
 
-       eval "$as_ac_var=no"
-fi
+  if test $succeeded = yes; then
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-                $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+                            have_gstreamer=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GSTREAMER /**/
 _ACEOF
 
+
+  else
+      have_gstreamer=no
+  fi
+
+
+        if test x"$have_gstreamer" = "xyes"; then
+            GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstbase-0.10"
+            with_ffmpeg=no
+        fi
+    else
+        # if we get here then --with-gstreamer was not called with 'yes','no' or 'auto'
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-gstreamer, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-gstreamer, continuing assuming 'no'" >&2;}
+        have_gstreamer=no
+    fi
 fi
-done
 
-#AC_CHECK_FUNC(clock_gettime,, [AC_CHECK_LIB(rt, clock_gettime, [LIBRT="-lrt"])])
-#AC_SUBST(LIBRT)
-{ $as_echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5
-$as_echo_n "checking for library containing clock_gettime... " >&6; }
-if test "${ac_cv_search_clock_gettime+set}" = set; then
-  $as_echo_n "(cached) " >&6
+
+ if test x"$have_gstreamer" = "xyes"; then
+  BUILD_GSTREAMER_TRUE=
+  BUILD_GSTREAMER_FALSE='#'
 else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  BUILD_GSTREAMER_TRUE='#'
+  BUILD_GSTREAMER_FALSE=
+fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_clock_gettime=$ac_res
+
+# Check for the unicap library
+UNICAP_PACKAGE_LIBS=""
+UNICAP_PACKAGE_CFLAGS=""
+UCIL_PACKAGE_LIBS=""
+UCIL_PACKAGE_CFLAGS=""
+if test x"$with_unicap" = "xno"; then
+    have_unicap=no
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+  succeeded=no
 
-fi
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_clock_gettime+set}" = set; then
-  break
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
 fi
-done
-if test "${ac_cv_search_clock_gettime+set}" = set; then
-  :
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  ac_cv_search_clock_gettime=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5
-$as_echo "$ac_cv_search_clock_gettime" >&6; }
-ac_res=$ac_cv_search_clock_gettime
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-fi
 
+  fi
 
-######################################################################
-# BLAS and LAPACK
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { $as_echo "$as_me:$LINENO: checking for libunicap" >&5
+$as_echo_n "checking for libunicap... " >&6; }
 
-LAPACK_LIBS=""
-have_native_lapack=no
-if test x"$with_native_lapack" = "xyes"; then
-  # check for Accellerate framework on Mac OS X
-  #
-  # As of Mac OS X 10.5 blas and lapack exist as standard shared
-  # libraries, so this check could be replaced by separate checks for
-  # those two libraries as it may be helpful for Linux/Unix variants
-  # as well.
-  if test "${ac_cv_header_vecLib_clapack_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for vecLib/clapack.h" >&5
-$as_echo_n "checking for vecLib/clapack.h... " >&6; }
-if test "${ac_cv_header_vecLib_clapack_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vecLib_clapack_h" >&5
-$as_echo "$ac_cv_header_vecLib_clapack_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking vecLib/clapack.h usability" >&5
-$as_echo_n "checking vecLib/clapack.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <vecLib/clapack.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+        if $PKG_CONFIG --exists "libunicap" ; then
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
 
-       ac_header_compiler=no
-fi
+            { $as_echo "$as_me:$LINENO: checking UNICAP_PACKAGE_CFLAGS" >&5
+$as_echo_n "checking UNICAP_PACKAGE_CFLAGS... " >&6; }
+            UNICAP_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "libunicap"`
+            { $as_echo "$as_me:$LINENO: result: $UNICAP_PACKAGE_CFLAGS" >&5
+$as_echo "$UNICAP_PACKAGE_CFLAGS" >&6; }
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+            { $as_echo "$as_me:$LINENO: checking UNICAP_PACKAGE_LIBS" >&5
+$as_echo_n "checking UNICAP_PACKAGE_LIBS... " >&6; }
+            UNICAP_PACKAGE_LIBS=`$PKG_CONFIG --libs "libunicap"`
+            { $as_echo "$as_me:$LINENO: result: $UNICAP_PACKAGE_LIBS" >&5
+$as_echo "$UNICAP_PACKAGE_LIBS" >&6; }
+        else
+            UNICAP_PACKAGE_CFLAGS=""
+            UNICAP_PACKAGE_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            UNICAP_PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libunicap"`
+            echo $UNICAP_PACKAGE_PKG_ERRORS
+        fi
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking vecLib/clapack.h presence" >&5
-$as_echo_n "checking vecLib/clapack.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <vecLib/clapack.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: vecLib/clapack.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: vecLib/clapack.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: vecLib/clapack.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: vecLib/clapack.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: vecLib/clapack.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: vecLib/clapack.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: vecLib/clapack.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: vecLib/clapack.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: vecLib/clapack.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for vecLib/clapack.h" >&5
-$as_echo_n "checking for vecLib/clapack.h... " >&6; }
-if test "${ac_cv_header_vecLib_clapack_h+set}" = set; then
+  if test $succeeded = yes; then
+     :
+  else
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (libunicap) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (libunicap) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_vecLib_clapack_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vecLib_clapack_h" >&5
-$as_echo "$ac_cv_header_vecLib_clapack_h" >&6; }
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
 fi
-if test "x$ac_cv_header_vecLib_clapack_h" = x""yes; then
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { $as_echo "$as_me:$LINENO: checking for libucil" >&5
+$as_echo_n "checking for libucil... " >&6; }
 
+        if $PKG_CONFIG --exists "libucil" ; then
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_VECLIB /**/
-_ACEOF
+            { $as_echo "$as_me:$LINENO: checking UCIL_PACKAGE_CFLAGS" >&5
+$as_echo_n "checking UCIL_PACKAGE_CFLAGS... " >&6; }
+            UCIL_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "libucil"`
+            { $as_echo "$as_me:$LINENO: result: $UCIL_PACKAGE_CFLAGS" >&5
+$as_echo "$UCIL_PACKAGE_CFLAGS" >&6; }
 
-                  LAPACK_LIBS="-Xlinker -framework -Xlinker vecLib"
-                  have_native_lapack=yes
+            { $as_echo "$as_me:$LINENO: checking UCIL_PACKAGE_LIBS" >&5
+$as_echo_n "checking UCIL_PACKAGE_LIBS... " >&6; }
+            UCIL_PACKAGE_LIBS=`$PKG_CONFIG --libs "libucil"`
+            { $as_echo "$as_me:$LINENO: result: $UCIL_PACKAGE_LIBS" >&5
+$as_echo "$UCIL_PACKAGE_LIBS" >&6; }
+        else
+            UCIL_PACKAGE_CFLAGS=""
+            UCIL_PACKAGE_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            UCIL_PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libucil"`
+            echo $UCIL_PACKAGE_PKG_ERRORS
+        fi
 
-else
 
-                  have_native_lapack=no
 
-fi
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
 
+  if test $succeeded = yes; then
+     :
+  else
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (libucil) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (libucil) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 
-fi
+       have_unicap=yes
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UNICAP /**/
+_ACEOF
 
- if test x"$have_native_lapack" = "xyes"; then
-  NATIVE_LAPACK_TRUE=
-  NATIVE_LAPACK_FALSE='#'
+fi
+ if test x"$have_unicap" = "xyes"; then
+  BUILD_UNICAP_TRUE=
+  BUILD_UNICAP_FALSE='#'
 else
-  NATIVE_LAPACK_TRUE='#'
-  NATIVE_LAPACK_FALSE=
+  BUILD_UNICAP_TRUE='#'
+  BUILD_UNICAP_FALSE=
 fi
 
 
 
-######################################################################
-# HighGUI dependencies for windowing system
 
-# honor user selection,
-# if no selection given check for Carbon first
-CARBON_CFLAGS=""
-CARBON_LIBS=""
-if test x"$with_carbon" = "xyes"; then
 
-    # header presence and usability seem to be enough
-    if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
-$as_echo_n "checking for Carbon/Carbon.h... " >&6; }
-if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
+
+# prefer XINE over FFMPEG for video reading because it is quick, has a cleaner API
+# and allows for easy seeking with some formats
+if test x"$with_xine" = "xno"; then
+    have_xine=no
+    # XINE_LIBS=""
+else
+
+    # check if ./configure arguments are valid
+    if test x"$with_xine" = "xauto"; then
+       with_xine=yes
+    fi
+    if test x"$with_xine" = "xyes"; then
+        if test "${ac_cv_header_xine_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for xine.h" >&5
+$as_echo_n "checking for xine.h... " >&6; }
+if test "${ac_cv_header_xine_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
-$as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xine_h" >&5
+$as_echo "$ac_cv_header_xine_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
-$as_echo_n "checking Carbon/Carbon.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking xine.h usability" >&5
+$as_echo_n "checking xine.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23827,7 +20368,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <Carbon/Carbon.h>
+#include <xine.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -23860,15 +20401,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5
-$as_echo_n "checking Carbon/Carbon.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking xine.h presence" >&5
+$as_echo_n "checking xine.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <Carbon/Carbon.h>
+#include <xine.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -23902,450 +20443,666 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: xine.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: xine.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: xine.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: xine.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: Carbon/Carbon.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: Carbon/Carbon.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: xine.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: xine.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: xine.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: xine.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: xine.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: xine.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: xine.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: xine.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: xine.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: xine.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: xine.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: xine.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
 ## -------------------------------------------------------- ##
 _ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
-$as_echo_n "checking for Carbon/Carbon.h... " >&6; }
-if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_Carbon_Carbon_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
-$as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
-
-fi
-if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CARBON /**/
-_ACEOF
-
-                      CARBON_LIBS="-Xlinker -framework -Xlinker Carbon"
-                      have_carbon=yes
-
-else
-
-                      have_carbon=no
-                      with_carbon=no
-
-fi
-
-
-
-    # sanity checks
-    if test x"$have_carbon" = "xyes"; then
-
-        # if we asked for gtk, this is not ok
-        if test x"$with_gtk" = "xyes"; then
-            { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-carbon and --with-gtk at the same time" >&5
-$as_echo "$as_me: error: You cannot specify --with-carbon and --with-gtk at the same time" >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-
-        # don't check alternatives if carbon was found
-        if test x"$with_gtk" = "xauto"; then
-            with_gtk=no
-        fi
-    fi
-else
-    have_carbon=no
-    if test ! x"$with_carbon" = "xno"; then
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-carbon, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-carbon, continuing assuming 'no'" >&2;}
-    fi
-fi
-
-
- if test x"$have_carbon" = "xyes"; then
-  BUILD_CARBON_TRUE=
-  BUILD_CARBON_FALSE='#'
-else
-  BUILD_CARBON_TRUE='#'
-  BUILD_CARBON_FALSE=
-fi
-
-
-# use GTK+ 2.x (or later) for windowing
-# if carbon not present or not wanted (--without-carbon)
-GTK_CFLAGS=""
-GTK_LIBS=""
-GTHREAD_CFLAGS=""
-GTHREAD_LIBS=""
-if test x"$with_gtk" = "xno"; then
-    have_gtk=no
-else
-
-    # check if ./configure arguments are valid
-    if test x"$with_gtk" = "xauto"; then
-       with_gtk=yes
-    fi
-    if test x"$with_gtk" = "xyes"; then
-
-        # pkg-config is needed for GTK+
-        # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
 esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for xine.h" >&5
+$as_echo_n "checking for xine.h... " >&6; }
+if test "${ac_cv_header_xine_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_header_xine_h=$ac_header_preproc
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xine_h" >&5
+$as_echo "$ac_cv_header_xine_h" >&6; }
 
-
-        if test x"$PKG_CONFIG" = x"no"; then
-            { $as_echo "$as_me:$LINENO: WARNING: You have to install pkg-config to compile OpenCV with GTK+" >&5
-$as_echo "$as_me: WARNING: You have to install pkg-config to compile OpenCV with GTK+" >&2;}
-        else
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+fi
+if test "x$ac_cv_header_xine_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for xine_init in -lxine" >&5
+$as_echo_n "checking for xine_init in -lxine... " >&6; }
+if test "${ac_cv_lib_xine_xine_init+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxine  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xine_init ();
+int
+main ()
+{
+return xine_init ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_xine_xine_init=yes
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_lib_xine_xine_init=no
 fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xine_xine_init" >&5
+$as_echo "$ac_cv_lib_xine_xine_init" >&6; }
+if test "x$ac_cv_lib_xine_xine_init" = x""yes; then
 
-  fi
+                                      have_xine=yes
 
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for \"gtk+-2.0 gdk-pixbuf-2.0\"" >&5
-$as_echo_n "checking for \"gtk+-2.0 gdk-pixbuf-2.0\"... " >&6; }
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XINE /**/
+_ACEOF
 
-        if $PKG_CONFIG --exists ""gtk+-2.0 gdk-pixbuf-2.0"" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
+                                      XINE_LIBS="-lxine"
 
-            { $as_echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
-$as_echo_n "checking GTK_CFLAGS... " >&6; }
-            GTK_CFLAGS=`$PKG_CONFIG --cflags ""gtk+-2.0 gdk-pixbuf-2.0""`
-            { $as_echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
-$as_echo "$GTK_CFLAGS" >&6; }
+else
+   have_xine=no
+fi
 
-            { $as_echo "$as_me:$LINENO: checking GTK_LIBS" >&5
-$as_echo_n "checking GTK_LIBS... " >&6; }
-            GTK_LIBS=`$PKG_CONFIG --libs ""gtk+-2.0 gdk-pixbuf-2.0""`
-            { $as_echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
-$as_echo "$GTK_LIBS" >&6; }
-        else
-            GTK_CFLAGS=""
-            GTK_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""gtk+-2.0 gdk-pixbuf-2.0""`
+else
+   have_xine=no
+fi
 
-        fi
 
+    else
+        # if we get here then --with-xine was not called with 'yes','no' or 'auto'
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-xine, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-xine, continuing assuming 'no'" >&2;}
+        have_xine=no
+    fi
+fi
 
+ if test x"$have_xine" = "xyes"; then
+  BUILD_XINE_TRUE=
+  BUILD_XINE_FALSE='#'
+else
+  BUILD_XINE_TRUE='#'
+  BUILD_XINE_FALSE=
+fi
 
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
 
-  if test $succeeded = yes; then
+# unfortunately, xine does not feature video writing,
+# so we have to resort to FFMPEG here
+if test x"$with_ffmpeg" = "xno"; then
+    have_ffmpeg=no
+    # FFMPEGLIBS=""
+else
 
-                                have_gtk=yes
+    have_ffmpeg=no
+    have_avcodec=no
+    have_avformat=no
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GTK /**/
-_ACEOF
+    # check if ./configure arguments are valid
+    if test x"$with_ffmpeg" = "xauto"; then
+       with_ffmpeg=yes
+    fi
 
+    if test x"$with_ffmpeg" = "xyes"; then
 
-  else
-      have_gtk=no
-  fi
 
-        fi
-    else
-        # if we get here then --with-gtk was not called with 'yes','no' or 'auto'
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-gtk, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-gtk, continuing assuming 'no'" >&2;}
-        have_gtk=no
-    fi
+for ac_header in ffmpeg/avcodec.h libavcodec/avcodec.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_header_compiler=no
 fi
-if test x"$with_gthread" = "xno"; then
-    have_gthread=no
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-    if test x"$have_gtk" = "xyes"; then
-        if test x"$with_gthread" = "xauto"; then
-            with_gthread=yes
-        fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-        if test x"$with_gthread" = "xyes"; then
+  ac_header_preproc=no
+fi
 
-  succeeded=no
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ have_avcodec=yes
 fi
 
+done
 
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for \"gthread-2.0\"" >&5
-$as_echo_n "checking for \"gthread-2.0\"... " >&6; }
-
-        if $PKG_CONFIG --exists ""gthread-2.0"" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking GTHREAD_CFLAGS" >&5
-$as_echo_n "checking GTHREAD_CFLAGS... " >&6; }
-            GTHREAD_CFLAGS=`$PKG_CONFIG --cflags ""gthread-2.0""`
-            { $as_echo "$as_me:$LINENO: result: $GTHREAD_CFLAGS" >&5
-$as_echo "$GTHREAD_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:$LINENO: checking GTHREAD_LIBS" >&5
-$as_echo_n "checking GTHREAD_LIBS... " >&6; }
-            GTHREAD_LIBS=`$PKG_CONFIG --libs ""gthread-2.0""`
-            { $as_echo "$as_me:$LINENO: result: $GTHREAD_LIBS" >&5
-$as_echo "$GTHREAD_LIBS" >&6; }
-        else
-            GTHREAD_CFLAGS=""
-            GTHREAD_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""gthread-2.0""`
+for ac_header in ffmpeg/avformat.h libavformat/avformat.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-        fi
+       ac_header_compiler=no
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+  ac_header_preproc=no
+fi
 
-  if test $succeeded = yes; then
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-                                have_gthread=yes
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GTHREAD /**/
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
+ have_avformat=yes
+fi
 
+done
 
-  else
-      have_gthread=no
-  fi
 
-        else
-            # if we get here then --with-gthread was not called with 'yes','no' or 'auto'
-            { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-gthread, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-gthread, continuing assuming 'no'" >&2;}
-            have_gthread=no
-        fi
-    else
-        # if no gtk+ was detected, looking for gthread does not make any sense
-        have_gthread=no
-    fi
-fi
+        if test x"$have_avcodec"x"$have_avformat" = "xyesxyes" ; then
+            { $as_echo "$as_me:$LINENO: checking for library containing avcodec_decode_video" >&5
+$as_echo_n "checking for library containing avcodec_decode_video... " >&6; }
+if test "${ac_cv_search_avcodec_decode_video+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char avcodec_decode_video ();
+int
+main ()
+{
+return avcodec_decode_video ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' avcodec_pic avcodec; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_avcodec_decode_video=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
+fi
 
- if test x"$have_gtk" = "xyes"; then
-  BUILD_GTK_TRUE=
-  BUILD_GTK_FALSE='#'
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_avcodec_decode_video+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_avcodec_decode_video+set}" = set; then
+  :
 else
-  BUILD_GTK_TRUE='#'
-  BUILD_GTK_FALSE=
+  ac_cv_search_avcodec_decode_video=no
 fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_avcodec_decode_video" >&5
+$as_echo "$ac_cv_search_avcodec_decode_video" >&6; }
+ac_res=$ac_cv_search_avcodec_decode_video
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+                { $as_echo "$as_me:$LINENO: checking for library containing av_open_input_file" >&5
+$as_echo_n "checking for library containing av_open_input_file... " >&6; }
+if test "${ac_cv_search_av_open_input_file+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char av_open_input_file ();
+int
+main ()
+{
+return av_open_input_file ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' avformat_pic avformat; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib -lavcodec $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_av_open_input_file=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-######################################################################
-# HighGUI dependencies for video I/O
 
-# if QuickTime is present, it will override everything else,
-# (unless '--without-quicktime' was given)
-if test x"$with_quicktime" = "xyes"; then
+fi
 
-    # check other ./configure flags
-    if test x"$with_ffmpeg" = "xyes"; then
-        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-quicktime and --with-ffmpeg at the same time" >&5
-$as_echo "$as_me: error: You cannot specify --with-quicktime and --with-ffmpeg at the same time" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    if test x"$with_xine" = "xyes"; then
-        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-quicktime and --with-xine at the same time" >&5
-$as_echo "$as_me: error: You cannot specify --with-quicktime and --with-xine at the same time" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    if test x"$with_1394libs" = "xyes"; then
-        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-quicktime and --with-1394libs at the same time" >&5
-$as_echo "$as_me: error: You cannot specify --with-quicktime and --with-1394libs at the same time" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    if test x"$with_v4l" = "xyes"; then
-        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-quicktime and --with-v4l at the same time" >&5
-$as_echo "$as_me: error: You cannot specify --with-quicktime and --with-v4l at the same time" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_av_open_input_file+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_av_open_input_file+set}" = set; then
+  :
+else
+  ac_cv_search_av_open_input_file=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_av_open_input_file" >&5
+$as_echo "$ac_cv_search_av_open_input_file" >&6; }
+ac_res=$ac_cv_search_av_open_input_file
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  have_ffmpeg=yes
+fi
 
-    # header presence and usability seem to be enough
-    if test "${ac_cv_header_QuickTime_QuickTime_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for QuickTime/QuickTime.h" >&5
-$as_echo_n "checking for QuickTime/QuickTime.h... " >&6; }
-if test "${ac_cv_header_QuickTime_QuickTime_h+set}" = set; then
+fi
+
+        fi
+
+        if test x"$have_ffmpeg" = "xyes" ; then
+            # libswscale is not always necessary, but if it is there, we want to use it
+
+
+for ac_header in ffmpeg/swscale.h libswscale/swscale.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_QuickTime_QuickTime_h" >&5
-$as_echo "$ac_cv_header_QuickTime_QuickTime_h" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking QuickTime/QuickTime.h usability" >&5
-$as_echo_n "checking QuickTime/QuickTime.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24353,7 +21110,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <QuickTime/QuickTime.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -24386,15 +21143,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking QuickTime/QuickTime.h presence" >&5
-$as_echo_n "checking QuickTime/QuickTime.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <QuickTime/QuickTime.h>
+#include <$ac_header>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -24428,25 +21185,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: QuickTime/QuickTime.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: QuickTime/QuickTime.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: QuickTime/QuickTime.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: QuickTime/QuickTime.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -24455,514 +21212,586 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for QuickTime/QuickTime.h" >&5
-$as_echo_n "checking for QuickTime/QuickTime.h... " >&6; }
-if test "${ac_cv_header_QuickTime_QuickTime_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_QuickTime_QuickTime_h=$ac_header_preproc
+  eval "$as_ac_Header=\$ac_header_preproc"
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_QuickTime_QuickTime_h" >&5
-$as_echo "$ac_cv_header_QuickTime_QuickTime_h" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test "x$ac_cv_header_QuickTime_QuickTime_h" = x""yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_QUICKTIME /**/
+as_val=`eval 'as_val=${'$as_ac_Header'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-                      have_quicktime=yes
-
-else
-   have_quicktime=no
-fi
-
-
-
-    # specify quicktime libraries
-    if test x"$have_quicktime" = "xyes"; then
-        QUICKTIME_LIBS="-Xlinker -framework -Xlinker QuickTime -Xlinker -framework -Xlinker QuartzCore"
-
-        # don't check alternatives if quicktime was found
-        if test x"$with_ffmpeg" = "xauto"; then
-            with_ffmpeg=no
-        fi
-        if test x"$with_xine" = "xauto"; then
-            with_xine=no
-        fi
-        if test x"$with_1394libs" = "xauto"; then
-            with_1394libs=no
-        fi
-        if test x"$with_v4l" = "xauto"; then
-            with_v4l=no
-        fi
-    fi
-else
-    # check if ./configure arguments are valid
-    have_quicktime=no
-    if test ! x"$with_quicktime" = "xno"; then
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-quicktime, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-quicktime, continuing assuming 'no'" >&2;}
-    fi
-fi
-
-
- if test x"$have_quicktime" = "xyes"; then
-  BUILD_QUICKTIME_TRUE=
-  BUILD_QUICKTIME_FALSE='#'
-else
-  BUILD_QUICKTIME_TRUE='#'
-  BUILD_QUICKTIME_FALSE=
-fi
-
-
-# GStreamer seems to be a nice solution for both reading and writing
-# and even supports some cameras
-GSTREAMER_CFLAGS=""
-GSTREAMER_LIBS=""
-if test x"$with_gstreamer" = "xno"; then
-    have_gstreamer=no
-else
-
-    if test x"$with_ffmpeg" = "xyes"; then
-        { { $as_echo "$as_me:$LINENO: error: You cannot specify --with-gstreamer and --with-ffmpeg at the same time" >&5
-$as_echo "$as_me: error: You cannot specify --with-gstreamer and --with-ffmpeg at the same time" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # check if ./configure arguments are valid
-    if test x"$with_gstreamer" = "xauto"; then
-       with_gstreamer=yes
-    fi
-    if test x"$with_gstreamer" = "xyes"; then
-
-        # pkg-config is needed for GTK+
-        # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+                { $as_echo "$as_me:$LINENO: checking for sws_getContext in -lswscale" >&5
+$as_echo_n "checking for sws_getContext in -lswscale... " >&6; }
+if test "${ac_cv_lib_swscale_sws_getContext+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lswscale  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sws_getContext ();
+int
+main ()
+{
+return sws_getContext ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-        if test x"$PKG_CONFIG" == "xno"; then
-            { { $as_echo "$as_me:$LINENO: error: You have to install pkg-config to compile OpenCV with GStreamer" >&5
-$as_echo "$as_me: error: You have to install pkg-config to compile OpenCV with GStreamer" >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_swscale_sws_getContext=yes
 else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
+       ac_cv_lib_swscale_sws_getContext=no
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_swscale_sws_getContext" >&5
+$as_echo "$ac_cv_lib_swscale_sws_getContext" >&6; }
+if test "x$ac_cv_lib_swscale_sws_getContext" = x""yes; then
+  FFMPEG_SWSCALE_LIBS="-lswscale"
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FFMPEG_SWSCALE /**/
+_ACEOF
 
-  fi
+fi
 
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for \"gstreamer-0.10\"" >&5
-$as_echo_n "checking for \"gstreamer-0.10\"... " >&6; }
+fi
 
-        if $PKG_CONFIG --exists ""gstreamer-0.10"" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
+done
 
-            { $as_echo "$as_me:$LINENO: checking GSTREAMER_CFLAGS" >&5
-$as_echo_n "checking GSTREAMER_CFLAGS... " >&6; }
-            GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags ""gstreamer-0.10""`
-            { $as_echo "$as_me:$LINENO: result: $GSTREAMER_CFLAGS" >&5
-$as_echo "$GSTREAMER_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:$LINENO: checking GSTREAMER_LIBS" >&5
-$as_echo_n "checking GSTREAMER_LIBS... " >&6; }
-            GSTREAMER_LIBS=`$PKG_CONFIG --libs ""gstreamer-0.10""`
-            { $as_echo "$as_me:$LINENO: result: $GSTREAMER_LIBS" >&5
-$as_echo "$GSTREAMER_LIBS" >&6; }
-        else
-            GSTREAMER_CFLAGS=""
-            GSTREAMER_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""gstreamer-0.10""`
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FFMPEG /**/
+_ACEOF
+
+            FFMPEGLIBS="-lavcodec -lavformat $FFMPEG_SWSCALE_LIBS"
         fi
+    else
+        # if we get here then --with-ffmpeg was not called with 'yes','no' or 'auto'
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-ffmpeg, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-ffmpeg, continuing assuming 'no'" >&2;}
+        have_ffmpeg=no
+    fi
+fi
 
+ if test x"$have_ffmpeg" = "xyes"; then
+  BUILD_FFMPEG_TRUE=
+  BUILD_FFMPEG_FALSE='#'
+else
+  BUILD_FFMPEG_TRUE='#'
+  BUILD_FFMPEG_FALSE=
+fi
 
 
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+# IEEE1394 / FireWire video video i/o with libdc1394, libraw1394
+# (can be managed by QuickTime as well)
+if test x"$with_1394libs" = "xno"; then
+    have_raw1394=no
+    have_dc1394=no
+    have_dc1394_2=no
+    # IEEE1394LIBS=""
+else
 
-  if test $succeeded = yes; then
+    # check if ./configure arguments are valid
+    if test x"$with_1394libs" = "xauto"; then
+       with_1394libs=yes
+    fi
+    if test x"$with_1394libs" = "xyes"; then
 
-                            have_gstreamer=yes
+        SAVELIBS="$LIBS"
+        have_raw1394=no
+        have_dc1394=no
+        have_dc1394_2=no
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GSTREAMER /**/
+        if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
+$as_echo_n "checking for libraw1394/raw1394.h... " >&6; }
+if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
+$as_echo "$ac_cv_header_libraw1394_raw1394_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking libraw1394/raw1394.h usability" >&5
+$as_echo_n "checking libraw1394/raw1394.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <libraw1394/raw1394.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-
-  else
-      have_gstreamer=no
-  fi
-
-
-        if test x"$have_gstreamer" = "xyes"; then
-            GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstbase-0.10"
-            with_ffmpeg=no
-        fi
-    else
-        # if we get here then --with-gstreamer was not called with 'yes','no' or 'auto'
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-gstreamer, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-gstreamer, continuing assuming 'no'" >&2;}
-        have_gstreamer=no
-    fi
+       ac_header_compiler=no
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
- if test x"$have_gstreamer" = "xyes"; then
-  BUILD_GSTREAMER_TRUE=
-  BUILD_GSTREAMER_FALSE='#'
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking libraw1394/raw1394.h presence" >&5
+$as_echo_n "checking libraw1394/raw1394.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libraw1394/raw1394.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-  BUILD_GSTREAMER_TRUE='#'
-  BUILD_GSTREAMER_FALSE=
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-# Check for the unicap library
-UNICAP_PACKAGE_LIBS=""
-UNICAP_PACKAGE_CFLAGS=""
-UCIL_PACKAGE_LIBS=""
-UCIL_PACKAGE_CFLAGS=""
-if test x"$with_unicap" = "xno"; then
-    have_unicap=no
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: libraw1394/raw1394.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: libraw1394/raw1394.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: libraw1394/raw1394.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: libraw1394/raw1394.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: libraw1394/raw1394.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
+$as_echo_n "checking for libraw1394/raw1394.h... " >&6; }
+if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
+  ac_cv_header_libraw1394_raw1394_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
+$as_echo "$ac_cv_header_libraw1394_raw1394_h" >&6; }
 
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+fi
+if test "x$ac_cv_header_libraw1394_raw1394_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for raw1394_new_handle in -lraw1394" >&5
+$as_echo_n "checking for raw1394_new_handle in -lraw1394... " >&6; }
+if test "${ac_cv_lib_raw1394_raw1394_new_handle+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lraw1394  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char raw1394_new_handle ();
+int
+main ()
+{
+return raw1394_new_handle ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_raw1394_raw1394_new_handle=yes
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libunicap" >&5
-$as_echo_n "checking for libunicap... " >&6; }
-
-        if $PKG_CONFIG --exists "libunicap" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:$LINENO: checking UNICAP_PACKAGE_CFLAGS" >&5
-$as_echo_n "checking UNICAP_PACKAGE_CFLAGS... " >&6; }
-            UNICAP_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "libunicap"`
-            { $as_echo "$as_me:$LINENO: result: $UNICAP_PACKAGE_CFLAGS" >&5
-$as_echo "$UNICAP_PACKAGE_CFLAGS" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-            { $as_echo "$as_me:$LINENO: checking UNICAP_PACKAGE_LIBS" >&5
-$as_echo_n "checking UNICAP_PACKAGE_LIBS... " >&6; }
-            UNICAP_PACKAGE_LIBS=`$PKG_CONFIG --libs "libunicap"`
-            { $as_echo "$as_me:$LINENO: result: $UNICAP_PACKAGE_LIBS" >&5
-$as_echo "$UNICAP_PACKAGE_LIBS" >&6; }
-        else
-            UNICAP_PACKAGE_CFLAGS=""
-            UNICAP_PACKAGE_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            UNICAP_PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libunicap"`
-            echo $UNICAP_PACKAGE_PKG_ERRORS
-        fi
+       ac_cv_lib_raw1394_raw1394_new_handle=no
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_raw1394_raw1394_new_handle" >&5
+$as_echo "$ac_cv_lib_raw1394_raw1394_new_handle" >&6; }
+if test "x$ac_cv_lib_raw1394_raw1394_new_handle" = x""yes; then
 
+                                       have_raw1394=yes
+                                       LIBS="-lraw1394 $LIBS"
 
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+fi
 
-  if test $succeeded = yes; then
-     :
-  else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (libunicap) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (libunicap) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+fi
 
 
-  succeeded=no
 
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+        if test x"$have_raw1394" = "xyes"; then
+            if test "${ac_cv_header_dc1394_dc1394_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for dc1394/dc1394.h" >&5
+$as_echo_n "checking for dc1394/dc1394.h... " >&6; }
+if test "${ac_cv_header_dc1394_dc1394_h+set}" = set; then
   $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dc1394_dc1394_h" >&5
+$as_echo "$ac_cv_header_dc1394_dc1394_h" >&6; }
 else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking dc1394/dc1394.h usability" >&5
+$as_echo_n "checking dc1394/dc1394.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <dc1394/dc1394.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libucil" >&5
-$as_echo_n "checking for libucil... " >&6; }
-
-        if $PKG_CONFIG --exists "libucil" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-            succeeded=yes
-
-            { $as_echo "$as_me:$LINENO: checking UCIL_PACKAGE_CFLAGS" >&5
-$as_echo_n "checking UCIL_PACKAGE_CFLAGS... " >&6; }
-            UCIL_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "libucil"`
-            { $as_echo "$as_me:$LINENO: result: $UCIL_PACKAGE_CFLAGS" >&5
-$as_echo "$UCIL_PACKAGE_CFLAGS" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-            { $as_echo "$as_me:$LINENO: checking UCIL_PACKAGE_LIBS" >&5
-$as_echo_n "checking UCIL_PACKAGE_LIBS... " >&6; }
-            UCIL_PACKAGE_LIBS=`$PKG_CONFIG --libs "libucil"`
-            { $as_echo "$as_me:$LINENO: result: $UCIL_PACKAGE_LIBS" >&5
-$as_echo "$UCIL_PACKAGE_LIBS" >&6; }
-        else
-            UCIL_PACKAGE_CFLAGS=""
-            UCIL_PACKAGE_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            UCIL_PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libucil"`
-            echo $UCIL_PACKAGE_PKG_ERRORS
-        fi
+       ac_header_compiler=no
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking dc1394/dc1394.h presence" >&5
+$as_echo_n "checking dc1394/dc1394.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <dc1394/dc1394.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+  ac_header_preproc=no
+fi
 
-  if test $succeeded = yes; then
-     :
-  else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (libucil) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (libucil) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-       have_unicap=yes
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: dc1394/dc1394.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: dc1394/dc1394.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dc1394/dc1394.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: dc1394/dc1394.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: dc1394/dc1394.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: dc1394/dc1394.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dc1394/dc1394.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: dc1394/dc1394.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dc1394/dc1394.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: dc1394/dc1394.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dc1394/dc1394.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: dc1394/dc1394.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dc1394/dc1394.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: dc1394/dc1394.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: dc1394/dc1394.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: dc1394/dc1394.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for dc1394/dc1394.h" >&5
+$as_echo_n "checking for dc1394/dc1394.h... " >&6; }
+if test "${ac_cv_header_dc1394_dc1394_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_dc1394_dc1394_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dc1394_dc1394_h" >&5
+$as_echo "$ac_cv_header_dc1394_dc1394_h" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNICAP /**/
+fi
+if test "x$ac_cv_header_dc1394_dc1394_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for dc1394_camera_enumerate in -ldc1394" >&5
+$as_echo_n "checking for dc1394_camera_enumerate in -ldc1394... " >&6; }
+if test "${ac_cv_lib_dc1394_dc1394_camera_enumerate+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldc1394  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
- if test x"$have_unicap" = "xyes"; then
-  BUILD_UNICAP_TRUE=
-  BUILD_UNICAP_FALSE='#'
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dc1394_camera_enumerate ();
+int
+main ()
+{
+return dc1394_camera_enumerate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dc1394_dc1394_camera_enumerate=yes
 else
-  BUILD_UNICAP_TRUE='#'
-  BUILD_UNICAP_FALSE=
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_lib_dc1394_dc1394_camera_enumerate=no
 fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dc1394_dc1394_camera_enumerate" >&5
+$as_echo "$ac_cv_lib_dc1394_dc1394_camera_enumerate" >&6; }
+if test "x$ac_cv_lib_dc1394_dc1394_camera_enumerate" = x""yes; then
 
+                                           have_dc1394_2=yes
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DC1394_2 /**/
+_ACEOF
 
+                                           IEEE1394LIBS="-lraw1394 -ldc1394"
 
+fi
 
-# prefer XINE over FFMPEG for video reading because it is quick, has a cleaner API
-# and allows for easy seeking with some formats
-if test x"$with_xine" = "xno"; then
-    have_xine=no
-    # XINE_LIBS=""
-else
+fi
 
-    # check if ./configure arguments are valid
-    if test x"$with_xine" = "xauto"; then
-       with_xine=yes
-    fi
-    if test x"$with_xine" = "xyes"; then
-        if test "${ac_cv_header_xine_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for xine.h" >&5
-$as_echo_n "checking for xine.h... " >&6; }
-if test "${ac_cv_header_xine_h+set}" = set; then
+
+
+            if test x"$have_dc1394_2" = "xno"; then
+                if test "${ac_cv_header_libdc1394_dc1394_control_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for libdc1394/dc1394_control.h" >&5
+$as_echo_n "checking for libdc1394/dc1394_control.h... " >&6; }
+if test "${ac_cv_header_libdc1394_dc1394_control_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xine_h" >&5
-$as_echo "$ac_cv_header_xine_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libdc1394_dc1394_control_h" >&5
+$as_echo "$ac_cv_header_libdc1394_dc1394_control_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking xine.h usability" >&5
-$as_echo_n "checking xine.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking libdc1394/dc1394_control.h usability" >&5
+$as_echo_n "checking libdc1394/dc1394_control.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24970,7 +21799,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <xine.h>
+#include <libdc1394/dc1394_control.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -25003,15 +21832,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking xine.h presence" >&5
-$as_echo_n "checking xine.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking libdc1394/dc1394_control.h presence" >&5
+$as_echo_n "checking libdc1394/dc1394_control.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <xine.h>
+#include <libdc1394/dc1394_control.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -25045,25 +21874,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: xine.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: xine.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xine.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: xine.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: xine.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: xine.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xine.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: xine.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xine.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: xine.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xine.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: xine.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xine.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: xine.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xine.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: xine.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -25072,25 +21901,25 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for xine.h" >&5
-$as_echo_n "checking for xine.h... " >&6; }
-if test "${ac_cv_header_xine_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for libdc1394/dc1394_control.h" >&5
+$as_echo_n "checking for libdc1394/dc1394_control.h... " >&6; }
+if test "${ac_cv_header_libdc1394_dc1394_control_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_xine_h=$ac_header_preproc
+  ac_cv_header_libdc1394_dc1394_control_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xine_h" >&5
-$as_echo "$ac_cv_header_xine_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libdc1394_dc1394_control_h" >&5
+$as_echo "$ac_cv_header_libdc1394_dc1394_control_h" >&6; }
 
 fi
-if test "x$ac_cv_header_xine_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for xine_init in -lxine" >&5
-$as_echo_n "checking for xine_init in -lxine... " >&6; }
-if test "${ac_cv_lib_xine_xine_init+set}" = set; then
+if test "x$ac_cv_header_libdc1394_dc1394_control_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for dc1394_camera_on in -ldc1394_control" >&5
+$as_echo_n "checking for dc1394_camera_on in -ldc1394_control... " >&6; }
+if test "${ac_cv_lib_dc1394_control_dc1394_camera_on+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxine  $LIBS"
+LIBS="-ldc1394_control  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25104,11 +21933,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char xine_init ();
+char dc1394_camera_on ();
 int
 main ()
 {
-return xine_init ();
+return dc1394_camera_on ();
   ;
   return 0;
 }
@@ -25134,81 +21963,108 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_xine_xine_init=yes
+  ac_cv_lib_dc1394_control_dc1394_camera_on=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_xine_xine_init=no
+       ac_cv_lib_dc1394_control_dc1394_camera_on=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dc1394_control_dc1394_camera_on" >&5
+$as_echo "$ac_cv_lib_dc1394_control_dc1394_camera_on" >&6; }
+if test "x$ac_cv_lib_dc1394_control_dc1394_camera_on" = x""yes; then
+
+                                               have_dc1394=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DC1394 /**/
+_ACEOF
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xine_xine_init" >&5
-$as_echo "$ac_cv_lib_xine_xine_init" >&6; }
-if test "x$ac_cv_lib_xine_xine_init" = x""yes; then
+                                               cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libdc1394/dc1394_control.h>
 
-                                      have_xine=yes
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "do_extra_buffering" >/dev/null 2>&1; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_XINE /**/
+#define HAVE_DC1394_095 /**/
 _ACEOF
 
-                                      XINE_LIBS="-lxine"
+fi
+rm -f conftest*
+
+                                               IEEE1394LIBS="-lraw1394 -ldc1394_control"
 
-else
-   have_xine=no
 fi
 
-else
-   have_xine=no
 fi
 
 
+            fi
+        fi
+
+        LIBS="$SAVELIBS"
     else
-        # if we get here then --with-xine was not called with 'yes','no' or 'auto'
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-xine, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-xine, continuing assuming 'no'" >&2;}
-        have_xine=no
+        # if we get here then --with-1394libs was not called with 'yes','no' or 'auto'
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-1394libs, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-1394libs, continuing assuming 'no'" >&2;}
+        have_dc1394=no
     fi
 fi
 
- if test x"$have_xine" = "xyes"; then
-  BUILD_XINE_TRUE=
-  BUILD_XINE_FALSE='#'
+ if test x"$have_dc1394" = "xyes"; then
+  BUILD_DC1394_TRUE=
+  BUILD_DC1394_FALSE='#'
 else
-  BUILD_XINE_TRUE='#'
-  BUILD_XINE_FALSE=
+  BUILD_DC1394_TRUE='#'
+  BUILD_DC1394_FALSE=
 fi
 
-
-# unfortunately, xine does not feature video writing,
-# so we have to resort to FFMPEG here
-if test x"$with_ffmpeg" = "xno"; then
-    have_ffmpeg=no
-    # FFMPEGLIBS=""
+ if test x"$have_dc1394_2" = "xyes"; then
+  BUILD_DC1394_2_TRUE=
+  BUILD_DC1394_2_FALSE='#'
 else
+  BUILD_DC1394_2_TRUE='#'
+  BUILD_DC1394_2_FALSE=
+fi
 
+
+# Video for Linux (V4L)
+# we support version 1 and 2 currently
+if test x"$with_v4l" = "xno"; then
+    have_v4l=no
+    have_v4l2=no
+    have_v4l1or2=no
+else
     # check if ./configure arguments are valid
-    if test x"$with_ffmpeg" = "xauto"; then
-       with_ffmpeg=yes
+    if test x"$with_v4l" = "xauto"; then
+       with_v4l=yes
     fi
-    if test x"$with_ffmpeg" = "xyes"; then
-        if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
-$as_echo_n "checking for ffmpeg/avcodec.h... " >&6; }
-if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
+    if test x"$with_v4l" = "xyes"; then
+        if test "${ac_cv_header_linux_videodev_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for linux/videodev.h" >&5
+$as_echo_n "checking for linux/videodev.h... " >&6; }
+if test "${ac_cv_header_linux_videodev_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ffmpeg_avcodec_h" >&5
-$as_echo "$ac_cv_header_ffmpeg_avcodec_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev_h" >&5
+$as_echo "$ac_cv_header_linux_videodev_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking ffmpeg/avcodec.h usability" >&5
-$as_echo_n "checking ffmpeg/avcodec.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking linux/videodev.h usability" >&5
+$as_echo_n "checking linux/videodev.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25216,7 +22072,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <ffmpeg/avcodec.h>
+#include <linux/videodev.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -25249,15 +22105,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking ffmpeg/avcodec.h presence" >&5
-$as_echo_n "checking ffmpeg/avcodec.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking linux/videodev.h presence" >&5
+$as_echo_n "checking linux/videodev.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <ffmpeg/avcodec.h>
+#include <linux/videodev.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -25291,25 +22147,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: linux/videodev.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: ffmpeg/avcodec.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: ffmpeg/avcodec.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: linux/videodev.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: linux/videodev.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: linux/videodev.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: linux/videodev.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -25318,222 +22174,143 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
-$as_echo_n "checking for ffmpeg/avcodec.h... " >&6; }
-if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for linux/videodev.h" >&5
+$as_echo_n "checking for linux/videodev.h... " >&6; }
+if test "${ac_cv_header_linux_videodev_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_ffmpeg_avcodec_h=$ac_header_preproc
+  ac_cv_header_linux_videodev_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ffmpeg_avcodec_h" >&5
-$as_echo "$ac_cv_header_ffmpeg_avcodec_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev_h" >&5
+$as_echo "$ac_cv_header_linux_videodev_h" >&6; }
 
 fi
-if test "x$ac_cv_header_ffmpeg_avcodec_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for library containing avcodec_decode_video" >&5
-$as_echo_n "checking for library containing avcodec_decode_video... " >&6; }
-if test "${ac_cv_search_avcodec_decode_video+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+if test "x$ac_cv_header_linux_videodev_h" = x""yes; then
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char avcodec_decode_video ();
-int
-main ()
-{
-return avcodec_decode_video ();
-  ;
-  return 0;
-}
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CAMV4L /**/
 _ACEOF
-for ac_lib in '' avcodec_pic avcodec; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_avcodec_decode_video=$ac_res
+
+                          have_v4l=yes
+                          have_v4l1or2=yes
+
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+                          have_v4l=no
+                          have_v4l1or2=no
 
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_avcodec_decode_video+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_avcodec_decode_video+set}" = set; then
-  :
-else
-  ac_cv_search_avcodec_decode_video=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_avcodec_decode_video" >&5
-$as_echo "$ac_cv_search_avcodec_decode_video" >&6; }
-ac_res=$ac_cv_search_avcodec_decode_video
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-                                       { $as_echo "$as_me:$LINENO: checking for library containing av_open_input_file" >&5
-$as_echo_n "checking for library containing av_open_input_file... " >&6; }
-if test "${ac_cv_search_av_open_input_file+set}" = set; then
+        { $as_echo "$as_me:$LINENO: checking for linux/videodev2.h" >&5
+$as_echo_n "checking for linux/videodev2.h... " >&6; }
+if test "${ac_cv_header_linux_videodev2_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char av_open_input_file ();
-int
-main ()
-{
-return av_open_input_file ();
-  ;
-  return 0;
-}
+                #include <asm/types.h>
+                #include <sys/time.h>
+
+
+#include <linux/videodev2.h>
 _ACEOF
-for ac_lib in '' avformat_pic avformat; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib -lavcodec $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_av_open_input_file=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_av_open_input_file+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_av_open_input_file+set}" = set; then
-  :
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_linux_videodev2_h=yes
 else
-  ac_cv_search_av_open_input_file=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_header_linux_videodev2_h=no
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_av_open_input_file" >&5
-$as_echo "$ac_cv_search_av_open_input_file" >&6; }
-ac_res=$ac_cv_search_av_open_input_file
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev2_h" >&5
+$as_echo "$ac_cv_header_linux_videodev2_h" >&6; }
+if test "x$ac_cv_header_linux_videodev2_h" = x""yes; then
 
-                                                      have_ffmpeg=yes
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_FFMPEG /**/
+#define HAVE_CAMV4L2 /**/
 _ACEOF
 
-                                                      FFMPEGLIBS="-lavcodec -lavformat"
+                          have_v4l2=yes
+                          have_v4l1or2=yes
 
 else
-   have_ffmpeg=no
+   have_v4l2=no
 fi
 
 
-else
-   have_ffmpeg=no
-fi
+    else
+        # if we get here then --with-v4l was not called with 'yes','no' or 'auto'
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-v4l, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-v4l, continuing assuming 'no'" >&2;}
+        have_v4l=no
+        have_v4l2=no
+        have_v4l1or2=no
+    fi
 
+fi
+ if test x"$have_v4l1or2" = "xyes"; then
+  BUILD_V4L_TRUE=
+  BUILD_V4L_FALSE='#'
 else
-   have_ffmpeg=no
+  BUILD_V4L_TRUE='#'
+  BUILD_V4L_FALSE=
 fi
 
 
-        if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for ffmpeg/swscale.h" >&5
-$as_echo_n "checking for ffmpeg/swscale.h... " >&6; }
-if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
+
+######################################################################
+# HighGUI dependencies for image I/O
+
+SAVELIBS="$LIBS"
+IMAGELIBS=""
+
+
+
+have_imageio=no
+if test x"$with_imageio" = "xauto"; then
+    with_imageio=yes
+fi
+if test x"$with_imageio" = "xyes"; then
+    if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5
+$as_echo_n "checking for ApplicationServices/ApplicationServices.h... " >&6; }
+if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ffmpeg_swscale_h" >&5
-$as_echo "$ac_cv_header_ffmpeg_swscale_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ApplicationServices_ApplicationServices_h" >&5
+$as_echo "$ac_cv_header_ApplicationServices_ApplicationServices_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking ffmpeg/swscale.h usability" >&5
-$as_echo_n "checking ffmpeg/swscale.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking ApplicationServices/ApplicationServices.h usability" >&5
+$as_echo_n "checking ApplicationServices/ApplicationServices.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25541,7 +22318,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <ffmpeg/swscale.h>
+#include <ApplicationServices/ApplicationServices.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -25574,15 +22351,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking ffmpeg/swscale.h presence" >&5
-$as_echo_n "checking ffmpeg/swscale.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking ApplicationServices/ApplicationServices.h presence" >&5
+$as_echo_n "checking ApplicationServices/ApplicationServices.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <ffmpeg/swscale.h>
+#include <ApplicationServices/ApplicationServices.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -25616,25 +22393,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: ffmpeg/swscale.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: ffmpeg/swscale.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: ffmpeg/swscale.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: ffmpeg/swscale.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: ffmpeg/swscale.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: ffmpeg/swscale.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: ffmpeg/swscale.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/swscale.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: ffmpeg/swscale.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -25643,145 +22420,65 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for ffmpeg/swscale.h" >&5
-$as_echo_n "checking for ffmpeg/swscale.h... " >&6; }
-if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_ffmpeg_swscale_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ffmpeg_swscale_h" >&5
-$as_echo "$ac_cv_header_ffmpeg_swscale_h" >&6; }
-
-fi
-if test "x$ac_cv_header_ffmpeg_swscale_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for sws_getContext in -lswscale" >&5
-$as_echo_n "checking for sws_getContext in -lswscale... " >&6; }
-if test "${ac_cv_lib_swscale_sws_getContext+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5
+$as_echo_n "checking for ApplicationServices/ApplicationServices.h... " >&6; }
+if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lswscale  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sws_getContext ();
-int
-main ()
-{
-return sws_getContext ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_swscale_sws_getContext=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_swscale_sws_getContext=no
+  ac_cv_header_ApplicationServices_ApplicationServices_h=$ac_header_preproc
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ApplicationServices_ApplicationServices_h" >&5
+$as_echo "$ac_cv_header_ApplicationServices_ApplicationServices_h" >&6; }
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_swscale_sws_getContext" >&5
-$as_echo "$ac_cv_lib_swscale_sws_getContext" >&6; }
-if test "x$ac_cv_lib_swscale_sws_getContext" = x""yes; then
+if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = x""yes; then
 
+                      have_imageio=yes
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_FFMPEG_SWSCALE /**/
+#define HAVE_IMAGEIO /**/
 _ACEOF
 
-                                           FFMPEG_SWSCALE_LIBS="-lswscale"
-
-fi
+                      IMAGELIBS="$IMAGELIBS -framework ApplicationServices"
+                      LIBS="$LIBS -framework ApplicationServices"
 
+else
+   have_imageio=no
 fi
 
 
-        FFMPEGLIBS="$FFMPEGLIBS $FFMPEG_SWSCALE_LIBS"
-    else
-        # if we get here then --with-ffmpeg was not called with 'yes','no' or 'auto'
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-ffmpeg, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-ffmpeg, continuing assuming 'no'" >&2;}
-        have_ffmpeg=no
-    fi
 fi
-
- if test x"$have_ffmpeg" = "xyes"; then
-  BUILD_FFMPEG_TRUE=
-  BUILD_FFMPEG_FALSE='#'
+ if test x"$have_imageio" = "xyes"; then
+  BUILD_IMAGEIO_TRUE=
+  BUILD_IMAGEIO_FALSE='#'
 else
-  BUILD_FFMPEG_TRUE='#'
-  BUILD_FFMPEG_FALSE=
+  BUILD_IMAGEIO_TRUE='#'
+  BUILD_IMAGEIO_FALSE=
 fi
 
 
-# IEEE1394 / FireWire video video i/o with libdc1394, libraw1394
-# (can be managed by QuickTime as well)
-if test x"$with_1394libs" = "xno"; then
-    have_raw1394=no
-    have_dc1394=no
-    # IEEE1394LIBS=""
-else
 
-    # check if ./configure arguments are valid
-    if test x"$with_1394libs" = "xauto"; then
-       with_1394libs=yes
-    fi
-    if test x"$with_1394libs" = "xyes"; then
+have_jpeg=no
+have_zlib=no
+have_png=no
+have_tiff=no
 
-        SAVELIBS="$LIBS"
-        have_raw1394=no
-        have_dc1394=no
+# there are problems with dependencies of ImageIO to libtiff, etc.
+# that we avoid by not linking them ourselves
+if test x"$have_imageio" = "xno" ; then
 
-        if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
-$as_echo_n "checking for libraw1394/raw1394.h... " >&6; }
-if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+  if test "${ac_cv_header_jpeglib_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+$as_echo_n "checking for jpeglib.h... " >&6; }
+if test "${ac_cv_header_jpeglib_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
-$as_echo "$ac_cv_header_libraw1394_raw1394_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+$as_echo "$ac_cv_header_jpeglib_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking libraw1394/raw1394.h usability" >&5
-$as_echo_n "checking libraw1394/raw1394.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
+$as_echo_n "checking jpeglib.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25789,7 +22486,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <libraw1394/raw1394.h>
+#include <jpeglib.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -25822,15 +22519,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking libraw1394/raw1394.h presence" >&5
-$as_echo_n "checking libraw1394/raw1394.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
+$as_echo_n "checking jpeglib.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <libraw1394/raw1394.h>
+#include <jpeglib.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -25864,25 +22561,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: libraw1394/raw1394.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: libraw1394/raw1394.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: libraw1394/raw1394.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: libraw1394/raw1394.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: libraw1394/raw1394.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -25891,25 +22588,25 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
-$as_echo_n "checking for libraw1394/raw1394.h... " >&6; }
-if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+$as_echo_n "checking for jpeglib.h... " >&6; }
+if test "${ac_cv_header_jpeglib_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_libraw1394_raw1394_h=$ac_header_preproc
+  ac_cv_header_jpeglib_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
-$as_echo "$ac_cv_header_libraw1394_raw1394_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+$as_echo "$ac_cv_header_jpeglib_h" >&6; }
 
 fi
-if test "x$ac_cv_header_libraw1394_raw1394_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for raw1394_new_handle in -lraw1394" >&5
-$as_echo_n "checking for raw1394_new_handle in -lraw1394... " >&6; }
-if test "${ac_cv_lib_raw1394_raw1394_new_handle+set}" = set; then
+if test "x$ac_cv_header_jpeglib_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
+if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lraw1394  $LIBS"
+LIBS="-ljpeg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25923,11 +22620,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char raw1394_new_handle ();
+char jpeg_destroy_decompress ();
 int
 main ()
 {
-return raw1394_new_handle ();
+return jpeg_destroy_decompress ();
   ;
   return 0;
 }
@@ -25953,12 +22650,12 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_raw1394_raw1394_new_handle=yes
+  ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_raw1394_raw1394_new_handle=no
+       ac_cv_lib_jpeg_jpeg_destroy_decompress=no
 fi
 
 rm -rf conftest.dSYM
@@ -25966,12 +22663,17 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_raw1394_raw1394_new_handle" >&5
-$as_echo "$ac_cv_lib_raw1394_raw1394_new_handle" >&6; }
-if test "x$ac_cv_lib_raw1394_raw1394_new_handle" = x""yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then
 
-                                       have_raw1394=yes
-                                       LIBS="-lm -lraw1394 $LIBS"
+                                 have_jpeg=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_JPEG /**/
+_ACEOF
+
+                                 IMAGELIBS="$IMAGELIBS -ljpeg"
 
 fi
 
 
 
 
-        if test x"$have_raw1394" = "xyes"; then
-            if test "${ac_cv_header_libdc1394_dc1394_control_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for libdc1394/dc1394_control.h" >&5
-$as_echo_n "checking for libdc1394/dc1394_control.h... " >&6; }
-if test "${ac_cv_header_libdc1394_dc1394_control_h+set}" = set; then
+  if test "${ac_cv_header_zlib_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+$as_echo_n "checking for zlib.h... " >&6; }
+if test "${ac_cv_header_zlib_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libdc1394_dc1394_control_h" >&5
-$as_echo "$ac_cv_header_libdc1394_dc1394_control_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking libdc1394/dc1394_control.h usability" >&5
-$as_echo_n "checking libdc1394/dc1394_control.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
+$as_echo_n "checking zlib.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25999,7 +22700,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <libdc1394/dc1394_control.h>
+#include <zlib.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -26032,15 +22733,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking libdc1394/dc1394_control.h presence" >&5
-$as_echo_n "checking libdc1394/dc1394_control.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
+$as_echo_n "checking zlib.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <libdc1394/dc1394_control.h>
+#include <zlib.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -26074,25 +22775,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libdc1394/dc1394_control.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: libdc1394/dc1394_control.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -26101,25 +22802,25 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for libdc1394/dc1394_control.h" >&5
-$as_echo_n "checking for libdc1394/dc1394_control.h... " >&6; }
-if test "${ac_cv_header_libdc1394_dc1394_control_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+$as_echo_n "checking for zlib.h... " >&6; }
+if test "${ac_cv_header_zlib_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_libdc1394_dc1394_control_h=$ac_header_preproc
+  ac_cv_header_zlib_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libdc1394_dc1394_control_h" >&5
-$as_echo "$ac_cv_header_libdc1394_dc1394_control_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
 
 fi
-if test "x$ac_cv_header_libdc1394_dc1394_control_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for dc1394_camera_on in -ldc1394_control" >&5
-$as_echo_n "checking for dc1394_camera_on in -ldc1394_control... " >&6; }
-if test "${ac_cv_lib_dc1394_control_dc1394_camera_on+set}" = set; then
+if test "x$ac_cv_header_zlib_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
+$as_echo_n "checking for gzopen in -lz... " >&6; }
+if test "${ac_cv_lib_z_gzopen+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldc1394_control  $LIBS"
+LIBS="-lz  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26133,11 +22834,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char dc1394_camera_on ();
+char gzopen ();
 int
 main ()
 {
-return dc1394_camera_on ();
+return gzopen ();
   ;
   return 0;
 }
@@ -26163,12 +22864,12 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_dc1394_control_dc1394_camera_on=yes
+  ac_cv_lib_z_gzopen=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_dc1394_control_dc1394_camera_on=no
+       ac_cv_lib_z_gzopen=no
 fi
 
 rm -rf conftest.dSYM
@@ -26176,86 +22877,181 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dc1394_control_dc1394_camera_on" >&5
-$as_echo "$ac_cv_lib_dc1394_control_dc1394_camera_on" >&6; }
-if test "x$ac_cv_lib_dc1394_control_dc1394_camera_on" = x""yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
+$as_echo "$ac_cv_lib_z_gzopen" >&6; }
+if test "x$ac_cv_lib_z_gzopen" = x""yes; then
 
-                                           have_dc1394=yes
+                                 have_zlib=yes
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_DC1394 /**/
+#define HAVE_ZLIB /**/
 _ACEOF
 
-                                           cat >conftest.$ac_ext <<_ACEOF
+                                 IMAGELIBS="$IMAGELIBS -lz"
+                                 LIBS="$LIBS -lz"
+
+fi
+
+fi
+
+
+
+  if test "${ac_cv_header_png_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for png.h" >&5
+$as_echo_n "checking for png.h... " >&6; }
+if test "${ac_cv_header_png_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+$as_echo "$ac_cv_header_png_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5
+$as_echo_n "checking png.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <libdc1394/dc1394_control.h>
-
+$ac_includes_default
+#include <png.h>
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "do_extra_buffering" >/dev/null 2>&1; then
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DC1394_095 /**/
+       ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5
+$as_echo_n "checking png.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <png.h>
 _ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
 fi
-rm -f conftest*
 
-                                           IEEE1394LIBS="-lm -lraw1394 -ldc1394_control"
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: png.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: png.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: png.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: png.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for png.h" >&5
+$as_echo_n "checking for png.h... " >&6; }
+if test "${ac_cv_header_png_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_png_h=$ac_header_preproc
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+$as_echo "$ac_cv_header_png_h" >&6; }
 
 fi
+if test "x$ac_cv_header_png_h" = x""yes; then
 
 
-        fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PNG_H /**/
+_ACEOF
 
-        LIBS="$SAVELIBS"
-    else
-        # if we get here then --with-1394libs was not called with 'yes','no' or 'auto'
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-1394libs, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-1394libs, continuing assuming 'no'" >&2;}
-        have_dc1394=no
-    fi
-fi
+                    have_png=yes
 
- if test x"$have_dc1394" = "xyes"; then
-  BUILD_DC1394_TRUE=
-  BUILD_DC1394_FALSE='#'
-else
-  BUILD_DC1394_TRUE='#'
-  BUILD_DC1394_FALSE=
 fi
 
 
-# Video for Linux (V4L)
-# we support version 1 and 2 currently
-if test x"$with_v4l" = "xno"; then
-    have_v4l=no
-    have_v4l2=no
-    have_v4l1or2=no
-else
-    # check if ./configure arguments are valid
-    if test x"$with_v4l" = "xauto"; then
-       with_v4l=yes
-    fi
-    if test x"$with_v4l" = "xyes"; then
-        if test "${ac_cv_header_linux_videodev_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for linux/videodev.h" >&5
-$as_echo_n "checking for linux/videodev.h... " >&6; }
-if test "${ac_cv_header_linux_videodev_h+set}" = set; then
+  if test "${ac_cv_header_libpng_png_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for libpng/png.h" >&5
+$as_echo_n "checking for libpng/png.h... " >&6; }
+if test "${ac_cv_header_libpng_png_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev_h" >&5
-$as_echo "$ac_cv_header_linux_videodev_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpng_png_h" >&5
+$as_echo "$ac_cv_header_libpng_png_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking linux/videodev.h usability" >&5
-$as_echo_n "checking linux/videodev.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking libpng/png.h usability" >&5
+$as_echo_n "checking libpng/png.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26263,7 +23059,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <linux/videodev.h>
+#include <libpng/png.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -26296,15 +23092,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking linux/videodev.h presence" >&5
-$as_echo_n "checking linux/videodev.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking libpng/png.h presence" >&5
+$as_echo_n "checking libpng/png.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <linux/videodev.h>
+#include <libpng/png.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -26338,25 +23134,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: libpng/png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: libpng/png.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: libpng/png.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: libpng/png.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: libpng/png.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: libpng/png.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: libpng/png.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: libpng/png.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -26365,38 +23161,114 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for linux/videodev.h" >&5
-$as_echo_n "checking for linux/videodev.h... " >&6; }
-if test "${ac_cv_header_linux_videodev_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for libpng/png.h" >&5
+$as_echo_n "checking for libpng/png.h... " >&6; }
+if test "${ac_cv_header_libpng_png_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_linux_videodev_h=$ac_header_preproc
+  ac_cv_header_libpng_png_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev_h" >&5
-$as_echo "$ac_cv_header_linux_videodev_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpng_png_h" >&5
+$as_echo "$ac_cv_header_libpng_png_h" >&6; }
 
 fi
-if test "x$ac_cv_header_linux_videodev_h" = x""yes; then
+if test "x$ac_cv_header_libpng_png_h" = x""yes; then
 
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_CAMV4L /**/
+#define HAVE_LIBPNG_PNG_H /**/
 _ACEOF
 
-                          have_v4l=yes
-                          have_v4l1or2=yes
+                    have_png=yes
+
+fi
 
+
+
+  if test x"$have_png" = "xyes"; then
+    { $as_echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
+$as_echo_n "checking for png_read_image in -lpng12... " >&6; }
+if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng12  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-                          have_v4l=no
-                          have_v4l1or2=no
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_read_image ();
+int
+main ()
+{
+return png_read_image ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_png12_png_read_image=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_lib_png12_png_read_image=no
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
+$as_echo "$ac_cv_lib_png12_png_read_image" >&6; }
+if test "x$ac_cv_lib_png12_png_read_image" = x""yes; then
 
+                   have_png=yes
 
-        { $as_echo "$as_me:$LINENO: checking for linux/videodev2.h" >&5
-$as_echo_n "checking for linux/videodev2.h... " >&6; }
-if test "${ac_cv_header_linux_videodev2_h+set}" = set; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PNG /**/
+_ACEOF
+
+                   IMAGELIBS="-lpng12 $IMAGELIBS"
+                   LIBS="-lpng12 $LIBS"
+
+
+for ac_func in png_get_valid png_set_tRNS_to_alpha
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -26405,22 +23277,54 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
 
-                #include <asm/types.h>
-                #include <sys/time.h>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
+#undef $ac_func
 
-#include <linux/videodev2.h>
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -26429,79 +23333,55 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_linux_videodev2_h=yes
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_linux_videodev2_h=no
+       eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_videodev2_h" >&5
-$as_echo "$ac_cv_header_linux_videodev2_h" >&6; }
-if test "x$ac_cv_header_linux_videodev2_h" = x""yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CAMV4L2 /**/
+ac_res=`eval 'as_val=${'$as_ac_var'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+                $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
-                          have_v4l2=yes
-                          have_v4l1or2=yes
-
-else
-   have_v4l2=no
 fi
+done
 
 
-    else
-        # if we get here then --with-v4l was not called with 'yes','no' or 'auto'
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-v4l, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-v4l, continuing assuming 'no'" >&2;}
-        have_v4l=no
-        have_v4l2=no
-        have_v4l1or2=no
-    fi
-
-fi
- if test x"$have_v4l1or2" = "xyes"; then
-  BUILD_V4L_TRUE=
-  BUILD_V4L_FALSE='#'
 else
-  BUILD_V4L_TRUE='#'
-  BUILD_V4L_FALSE=
+   have_png=no
 fi
 
+  fi
 
-
-######################################################################
-# HighGUI dependencies for image I/O
-
-SAVELIBS="$LIBS"
-IMAGELIBS=""
-
-
-
-have_imageio=no
-if test x"$with_imageio" = "xauto"; then
-    with_imageio=yes
-fi
-if test x"$with_imageio" = "xyes"; then
-    if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5
-$as_echo_n "checking for ApplicationServices/ApplicationServices.h... " >&6; }
-if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
+  if test "${ac_cv_header_tiff_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for tiff.h" >&5
+$as_echo_n "checking for tiff.h... " >&6; }
+if test "${ac_cv_header_tiff_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ApplicationServices_ApplicationServices_h" >&5
-$as_echo "$ac_cv_header_ApplicationServices_ApplicationServices_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiff_h" >&5
+$as_echo "$ac_cv_header_tiff_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking ApplicationServices/ApplicationServices.h usability" >&5
-$as_echo_n "checking ApplicationServices/ApplicationServices.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking tiff.h usability" >&5
+$as_echo_n "checking tiff.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26509,7 +23389,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <ApplicationServices/ApplicationServices.h>
+#include <tiff.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -26542,15 +23422,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking ApplicationServices/ApplicationServices.h presence" >&5
-$as_echo_n "checking ApplicationServices/ApplicationServices.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking tiff.h presence" >&5
+$as_echo_n "checking tiff.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <ApplicationServices/ApplicationServices.h>
+#include <tiff.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -26584,25 +23464,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: tiff.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: tiff.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ApplicationServices/ApplicationServices.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: ApplicationServices/ApplicationServices.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: tiff.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tiff.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: tiff.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: tiff.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tiff.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: tiff.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: tiff.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: tiff.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -26611,65 +23491,114 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for ApplicationServices/ApplicationServices.h" >&5
-$as_echo_n "checking for ApplicationServices/ApplicationServices.h... " >&6; }
-if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for tiff.h" >&5
+$as_echo_n "checking for tiff.h... " >&6; }
+if test "${ac_cv_header_tiff_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_ApplicationServices_ApplicationServices_h=$ac_header_preproc
+  ac_cv_header_tiff_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ApplicationServices_ApplicationServices_h" >&5
-$as_echo "$ac_cv_header_ApplicationServices_ApplicationServices_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiff_h" >&5
+$as_echo "$ac_cv_header_tiff_h" >&6; }
 
 fi
-if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = x""yes; then
-
-                      have_imageio=yes
+if test "x$ac_cv_header_tiff_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAStrip in -ltiff" >&5
+$as_echo_n "checking for TIFFReadRGBAStrip in -ltiff... " >&6; }
+if test "${ac_cv_lib_tiff_TIFFReadRGBAStrip+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltiff  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAGEIO /**/
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TIFFReadRGBAStrip ();
+int
+main ()
+{
+return TIFFReadRGBAStrip ();
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_tiff_TIFFReadRGBAStrip=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-                      IMAGELIBS="$IMAGELIBS -framework ApplicationServices"
-                      LIBS="$LIBS -framework ApplicationServices"
+       ac_cv_lib_tiff_TIFFReadRGBAStrip=no
+fi
 
-else
-   have_imageio=no
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAStrip" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAStrip" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFReadRGBAStrip" = x""yes; then
 
+                                 have_tiff=yes
 
-fi
- if test x"$have_imageio" = "xyes"; then
-  BUILD_IMAGEIO_TRUE=
-  BUILD_IMAGEIO_FALSE='#'
-else
-  BUILD_IMAGEIO_TRUE='#'
-  BUILD_IMAGEIO_FALSE=
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TIFF /**/
+_ACEOF
 
+                                 IMAGELIBS="$IMAGELIBS -ltiff"
+                                 LIBS="$LIBS -ltiff"
 
+fi
 
-have_jpeg=no
-have_zlib=no
-have_png=no
-have_tiff=no
+fi
 
-# there are problems with dependencies of ImageIO to libtiff, etc.
-# that we avoid by not linking them ourselves
-if test x"$have_imageio" = "xno" ; then
 
-  if test "${ac_cv_header_jpeglib_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-$as_echo_n "checking for jpeglib.h... " >&6; }
-if test "${ac_cv_header_jpeglib_h+set}" = set; then
+fi
+
+have_jasper=no
+if test "${ac_cv_header_jasper_jasper_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for jasper/jasper.h" >&5
+$as_echo_n "checking for jasper/jasper.h... " >&6; }
+if test "${ac_cv_header_jasper_jasper_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jasper_jasper_h" >&5
+$as_echo "$ac_cv_header_jasper_jasper_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
-$as_echo_n "checking jpeglib.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking jasper/jasper.h usability" >&5
+$as_echo_n "checking jasper/jasper.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26677,7 +23606,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <jpeglib.h>
+#include <jasper/jasper.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -26710,15 +23639,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
-$as_echo_n "checking jpeglib.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking jasper/jasper.h presence" >&5
+$as_echo_n "checking jasper/jasper.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <jpeglib.h>
+#include <jasper/jasper.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -26752,25 +23681,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: jasper/jasper.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: jasper/jasper.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: jpeglib.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: jpeglib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: jasper/jasper.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: jasper/jasper.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: jasper/jasper.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: jasper/jasper.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: jasper/jasper.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: jasper/jasper.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -26779,25 +23708,25 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-$as_echo_n "checking for jpeglib.h... " >&6; }
-if test "${ac_cv_header_jpeglib_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for jasper/jasper.h" >&5
+$as_echo_n "checking for jasper/jasper.h... " >&6; }
+if test "${ac_cv_header_jasper_jasper_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_jpeglib_h=$ac_header_preproc
+  ac_cv_header_jasper_jasper_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jasper_jasper_h" >&5
+$as_echo "$ac_cv_header_jasper_jasper_h" >&6; }
 
 fi
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
-$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
+if test "x$ac_cv_header_jasper_jasper_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for jas_image_readcmpt in -ljasper" >&5
+$as_echo_n "checking for jas_image_readcmpt in -ljasper... " >&6; }
+if test "${ac_cv_lib_jasper_jas_image_readcmpt+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg  $LIBS"
+LIBS="-ljasper  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26811,11 +23740,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char jpeg_destroy_decompress ();
+char jas_image_readcmpt ();
 int
 main ()
 {
-return jpeg_destroy_decompress ();
+return jas_image_readcmpt ();
   ;
   return 0;
 }
@@ -26841,12 +23770,12 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
+  ac_cv_lib_jasper_jas_image_readcmpt=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_jpeg_jpeg_destroy_decompress=no
+       ac_cv_lib_jasper_jas_image_readcmpt=no
 fi
 
 rm -rf conftest.dSYM
@@ -26854,17 +23783,18 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
-$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_image_readcmpt" >&5
+$as_echo "$ac_cv_lib_jasper_jas_image_readcmpt" >&6; }
+if test "x$ac_cv_lib_jasper_jas_image_readcmpt" = x""yes; then
 
-                                 have_jpeg=yes
+                               have_jasper=yes
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_JPEG /**/
+#define HAVE_JASPER /**/
 _ACEOF
 
-                                 IMAGELIBS="$IMAGELIBS -ljpeg"
+                               IMAGELIBS="$IMAGELIBS -ljasper"
+                               LIBS="$LIBS -ljasper"
 
 fi
 
 
 
 
-  if test "${ac_cv_header_zlib_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
-$as_echo_n "checking for zlib.h... " >&6; }
-if test "${ac_cv_header_zlib_h+set}" = set; then
+have_ilmimf=no
+if test "${ac_cv_header_ImfCRgbaFile_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for ImfCRgbaFile.h" >&5
+$as_echo_n "checking for ImfCRgbaFile.h... " >&6; }
+if test "${ac_cv_header_ImfCRgbaFile_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ImfCRgbaFile_h" >&5
+$as_echo "$ac_cv_header_ImfCRgbaFile_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
-$as_echo_n "checking zlib.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking ImfCRgbaFile.h usability" >&5
+$as_echo_n "checking ImfCRgbaFile.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26891,7 +23822,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <zlib.h>
+#include <ImfCRgbaFile.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -26924,15 +23855,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
-$as_echo_n "checking zlib.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking ImfCRgbaFile.h presence" >&5
+$as_echo_n "checking ImfCRgbaFile.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <zlib.h>
+#include <ImfCRgbaFile.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -26966,25 +23897,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ImfCRgbaFile.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ImfCRgbaFile.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ImfCRgbaFile.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ImfCRgbaFile.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ImfCRgbaFile.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ImfCRgbaFile.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ImfCRgbaFile.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ImfCRgbaFile.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -26993,25 +23924,25 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
-$as_echo_n "checking for zlib.h... " >&6; }
-if test "${ac_cv_header_zlib_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for ImfCRgbaFile.h" >&5
+$as_echo_n "checking for ImfCRgbaFile.h... " >&6; }
+if test "${ac_cv_header_ImfCRgbaFile_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_zlib_h=$ac_header_preproc
+  ac_cv_header_ImfCRgbaFile_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ImfCRgbaFile_h" >&5
+$as_echo "$ac_cv_header_ImfCRgbaFile_h" >&6; }
 
 fi
-if test "x$ac_cv_header_zlib_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
-$as_echo_n "checking for gzopen in -lz... " >&6; }
-if test "${ac_cv_lib_z_gzopen+set}" = set; then
+if test "x$ac_cv_header_ImfCRgbaFile_h" = x""yes; then
+  { $as_echo "$as_me:$LINENO: checking for ImfInputReadPixels in -lIlmImf" >&5
+$as_echo_n "checking for ImfInputReadPixels in -lIlmImf... " >&6; }
+if test "${ac_cv_lib_IlmImf_ImfInputReadPixels+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
+LIBS="-lIlmImf  -lIex -lHalf  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27025,11 +23956,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char gzopen ();
+char ImfInputReadPixels ();
 int
 main ()
 {
-return gzopen ();
+return ImfInputReadPixels ();
   ;
   return 0;
 }
@@ -27055,194 +23986,318 @@ $as_echo "$ac_try_echo") >&5
         test "$cross_compiling" = yes ||
         $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_z_gzopen=yes
+  ac_cv_lib_IlmImf_ImfInputReadPixels=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_z_gzopen=no
-fi
+       ac_cv_lib_IlmImf_ImfInputReadPixels=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_IlmImf_ImfInputReadPixels" >&5
+$as_echo "$ac_cv_lib_IlmImf_ImfInputReadPixels" >&6; }
+if test "x$ac_cv_lib_IlmImf_ImfInputReadPixels" = x""yes; then
+
+                               have_ilmimf=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ILMIMF /**/
+_ACEOF
+
+                               IMAGELIBS="$IMAGELIBS -lIlmImf -lIex -lHalf"
+                               LIBS="$LIBS -lIlmImf -lIex -lHalf"
+
+fi
+
+fi
+
+
+
+# Restore original LIBS settings...
+LIBS="$SAVELIBS"
+
+
+
+######################################################################
+# SWIG wrappers
+
+# each language should have --with-LANGUAGE switch
+
+# check for python
+if test x"$with_python" = "xyes"; then
+    { $as_echo "$as_me:$LINENO: Checking for necessary tools to build python wrappers" >&5
+$as_echo "$as_me: Checking for necessary tools to build python wrappers" >&6;}
+
+    # we need Python now
+
+
+
+
+        # Find any Python interpreter.
+    if test -z "$PYTHON"; then
+      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PYTHON+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PYTHON in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PYTHON" && break
+done
+test -n "$PYTHON" || PYTHON=":"
+
+    fi
+    am_display_PYTHON=python
+
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+  if test "$PYTHON" = :; then
+      { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
+$as_echo "$as_me: error: no suitable Python interpreter found" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+
+
+  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+if test "${am_cv_python_version+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
-$as_echo "$ac_cv_lib_z_gzopen" >&6; }
-if test "x$ac_cv_lib_z_gzopen" = x""yes; then
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+$as_echo "$am_cv_python_version" >&6; }
+  PYTHON_VERSION=$am_cv_python_version
 
-                                 have_zlib=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ZLIB /**/
-_ACEOF
 
-                                 IMAGELIBS="$IMAGELIBS -lz -lm"
-                                 LIBS="$LIBS -lz -lm"
+  PYTHON_PREFIX='${prefix}'
+
+  PYTHON_EXEC_PREFIX='${exec_prefix}'
+
 
-fi
 
+  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+if test "${am_cv_python_platform+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
 fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+$as_echo "$am_cv_python_platform" >&6; }
+  PYTHON_PLATFORM=$am_cv_python_platform
 
 
 
-  if test "${ac_cv_header_png_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for png.h" >&5
-$as_echo_n "checking for png.h... " >&6; }
-if test "${ac_cv_header_png_h+set}" = set; then
+
+                { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+if test "${am_cv_python_pythondir+set}" = set; then
   $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-$as_echo "$ac_cv_header_png_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5
-$as_echo_n "checking png.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <png.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_header_compiler=no
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+$as_echo "$am_cv_python_pythondir" >&6; }
+  pythondir=$am_cv_python_pythondir
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5
-$as_echo_n "checking png.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <png.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
+  pkgpythondir=\${pythondir}/$PACKAGE
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: png.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: png.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: png.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: png.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for png.h" >&5
-$as_echo_n "checking for png.h... " >&6; }
-if test "${ac_cv_header_png_h+set}" = set; then
+            { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+if test "${am_cv_python_pyexecdir+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_png_h=$ac_header_preproc
+  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-$as_echo "$ac_cv_header_png_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+$as_echo "$am_cv_python_pyexecdir" >&6; }
+  pyexecdir=$am_cv_python_pyexecdir
+
+
+
+  pkgpyexecdir=\${pyexecdir}/$PACKAGE
+
+
+
+  fi
+
+
+
+    # get some info on how to compile and link python modules
+
+
+    if test -n "$PYTHON"
+    then
+        az_python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
+        if test -z "$az_python_prefix"
+        then
+            { { $as_echo "$as_me:$LINENO: error: Python Prefix is not known" >&5
+$as_echo "$as_me: error: Python Prefix is not known" >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+        az_python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
+        az_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
+        az_python_includespec="-I${az_python_prefix}/include/python${az_python_version}"
+        if test x"$python_prefix" != x"$python_execprefix"; then
+            az_python_execspec="-I${az_python_execprefix}/include/python${az_python_version}"
+            az_python_includespec="${az_python_includespec} $az_python_execspec"
+        fi
+        az_python_ccshared=`${PYTHON} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('CFLAGSFORSHARED')"`
+        az_python_cspec="${az_python_ccshared} ${az_python_includespec}"
+        PYTHON_CSPEC=${az_python_cspec}
+
+        { $as_echo "$as_me:$LINENO: PYTHON_CSPEC=${az_python_cspec}" >&5
+$as_echo "$as_me: PYTHON_CSPEC=${az_python_cspec}" >&6;}
+    fi
+
+
+
+    if test -n "$PYTHON"
+    then
+
+
+    if test -z "$PYTHON"
+    then
+        { { $as_echo "$as_me:$LINENO: error: Python Executable not found" >&5
+$as_echo "$as_me: error: Python Executable not found" >&2;}
+   { (exit 1); exit 1; }; }
+    else
+        cat >conftest.py <<_ACEOF
+
+import sys
+import distutils.sysconfig
+strUseFrameWork = "--enable-framework"
+dictConfig = distutils.sysconfig.get_config_vars( )
+strConfigArgs = dictConfig.get("CONFIG_ARGS")
+strLinkSpec =  dictConfig.get('LDFLAGS')
+if -1 ==  strConfigArgs.find(strUseFrameWork):
+    strLibPL = dictConfig.get("LIBPL")
+    if strLibPL and (strLibPL != ""):
+        strLinkSpec += " -L%s" % (strLibPL)
+    strSys = dictConfig.get("SYSLIBS")
+    if strSys and (strSys != ""):
+        strLinkSpec += " %s" % (strSys)
+    strSHL = dictConfig.get("SHLIBS")
+    if strSHL and (strSHL != ""):
+        strLinkSpec += " %s" % (strSHL)
+    # Construct the Python Library Name.
+    strTmplte = " -lpython%d.%d"
+    if (sys.platform == "win32") or (sys.platform == "os2emx"):
+        strTmplte = " -lpython%d%d"
+    strWrk = strTmplte % ( (sys.hexversion >> 24),
+                            ((sys.hexversion >> 16) & 0xff))
+    strLinkSpec += strWrk
+else:
+    # This is not ideal since it changes the search path
+    # for Frameworks which could have side-effects on
+    # other included Frameworks.  However, it is necessary
+    # where someone has installed more than one frameworked
+    # Python.  Frameworks are really only used in MacOSX.
+    strLibFW = dictConfig.get("PYTHONFRAMEWORKPREFIX")
+    if strLibFW and (strLibFW != ""):
+        strLinkSpec += " -F%s" % (strLibFW)
+    strLibPL = dictConfig.get("LIBPL")
+    if strLibPL and (strLibPL != ""):
+        strLinkSpec += " -L%s" % (strLibPL)
+    # Construct the Python Library Name.
+    strTmplte = " -lpython%d.%d"
+    if (sys.platform == "win32") or (sys.platform == "os2emx"):
+        strTmplte = " -lpython%d%d"
+    strWrk = strTmplte % ( (sys.hexversion >> 24),
+                            ((sys.hexversion >> 16) & 0xff))
+    strLinkSpec += strWrk
+strLinkSpec += " %s" % (dictConfig.get('LINKFORSHARED'))
+print strLinkSpec
 
-fi
-if test "x$ac_cv_header_png_h" = x""yes; then
+_ACEOF
+        az_python_output=`$PYTHON conftest.py`
+        az_python_cc=$?
+        rm conftest.py
+        if test -f "conftest.pyc"
+        then
+            rm conftest.pyc
+        fi
+    fi
 
+        PYTHON_LSPEC=${az_python_output}
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PNG_H /**/
-_ACEOF
+        { $as_echo "$as_me:$LINENO: PYTHON_LSPEC=${az_python_output}" >&5
+$as_echo "$as_me: PYTHON_LSPEC=${az_python_output}" >&6;}
+    fi
 
-                    have_png=yes
 
-fi
+    # if not explicitly forbidden, check for swig also
+    if test x"$with_swig" = "xauto"; then
+        with_swig=yes
+    fi
 
+    ### almost ok... just need to check if we have the Python headers ###
 
-  if test "${ac_cv_header_libpng_png_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for libpng/png.h" >&5
-$as_echo_n "checking for libpng/png.h... " >&6; }
-if test "${ac_cv_header_libpng_png_h+set}" = set; then
+    # first, save the CPPFLAGS
+    OLD_CPPFLAGS=$CPPFLAGS
+
+    # then add the PYTHON path founded previously
+    CPPFLAGS="$CPPFLAGS $PYTHON_CSPEC"
+
+    # now, we can check
+    if test "${ac_cv_header_Python_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for Python.h" >&5
+$as_echo_n "checking for Python.h... " >&6; }
+if test "${ac_cv_header_Python_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpng_png_h" >&5
-$as_echo "$ac_cv_header_libpng_png_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+$as_echo "$ac_cv_header_Python_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking libpng/png.h usability" >&5
-$as_echo_n "checking libpng/png.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking Python.h usability" >&5
+$as_echo_n "checking Python.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27250,7 +24305,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <libpng/png.h>
+#include <Python.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -27279,300 +24334,261 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking libpng/png.h presence" >&5
-$as_echo_n "checking libpng/png.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libpng/png.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: libpng/png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: libpng/png.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: libpng/png.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: libpng/png.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: libpng/png.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: libpng/png.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: libpng/png.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libpng/png.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: libpng/png.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for libpng/png.h" >&5
-$as_echo_n "checking for libpng/png.h... " >&6; }
-if test "${ac_cv_header_libpng_png_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_libpng_png_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpng_png_h" >&5
-$as_echo "$ac_cv_header_libpng_png_h" >&6; }
-
-fi
-if test "x$ac_cv_header_libpng_png_h" = x""yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBPNG_PNG_H /**/
-_ACEOF
-
-                    have_png=yes
-
-fi
-
-
-
-  if test x"$have_png" = "xyes"; then
-    { $as_echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-$as_echo_n "checking for png_read_image in -lpng12... " >&6; }
-if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng12  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char png_read_image ();
-int
-main ()
-{
-return png_read_image ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_png12_png_read_image=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_png12_png_read_image=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-$as_echo "$ac_cv_lib_png12_png_read_image" >&6; }
-if test "x$ac_cv_lib_png12_png_read_image" = x""yes; then
-
-                   have_png=yes
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PNG /**/
-_ACEOF
-
-                   IMAGELIBS="-lpng12 $IMAGELIBS"
-                   LIBS="-lpng12 $LIBS"
-
-
-for ac_func in png_get_valid png_set_tRNS_to_alpha
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking Python.h presence" >&5
+$as_echo_n "checking Python.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
+#include <Python.h>
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
+  (exit $ac_status); } >/dev/null && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
        }; then
-  eval "$as_ac_var=yes"
+  ac_header_preproc=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       eval "$as_ac_var=no"
+  ac_header_preproc=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: Python.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to opencvlibrary-devel@lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for Python.h" >&5
+$as_echo_n "checking for Python.h... " >&6; }
+if test "${ac_cv_header_Python_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_Python_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+$as_echo "$ac_cv_header_Python_h" >&6; }
+
+fi
+if test "x$ac_cv_header_Python_h" = x""yes; then
+  have_python=yes
+else
+
+          { $as_echo "$as_me:$LINENO: WARNING: Python headers not found, disabling python wrappers" >&5
+$as_echo "$as_me: WARNING: Python headers not found, disabling python wrappers" >&2;}
+          have_python=no
+
 fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-                $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
 
+
+
+    # restore the old CPPFLAGS
+    CPPFLAGS=$OLD_CPPFLAGS
+
+else
+    # check if ./configure arguments are valid
+    if test x"$with_python" = "xno"; then
+        have_python=no
+    else
+        # if we get here then --with-python was not called with 'yes','no' or 'auto'
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-python, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-python, continuing assuming 'no'" >&2;}
+        have_python=no
+    fi
+fi
+ if test x"$have_python" = "xyes"; then
+  BUILD_PYTHON_WRAPPERS_TRUE=
+  BUILD_PYTHON_WRAPPERS_FALSE='#'
+else
+  BUILD_PYTHON_WRAPPERS_TRUE='#'
+  BUILD_PYTHON_WRAPPERS_FALSE=
+fi
+
+
+# check for octave
+if test x"$with_octave" = "xyes"; then
+    { $as_echo "$as_me:$LINENO: Checking for necessary tools to build octave wrappers" >&5
+$as_echo "$as_me: Checking for necessary tools to build octave wrappers" >&6;}
+
+    # find octave and mkoctfile
+    # Extract the first word of "octave", so it can be a program name with args.
+set dummy octave; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_OCTAVE+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $OCTAVE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_OCTAVE="$OCTAVE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_OCTAVE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+OCTAVE=$ac_cv_path_OCTAVE
+if test -n "$OCTAVE"; then
+  { $as_echo "$as_me:$LINENO: result: $OCTAVE" >&5
+$as_echo "$OCTAVE" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
+
+    # Extract the first word of "mkoctfile", so it can be a program name with args.
+set dummy mkoctfile; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MKOCTFILE+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $MKOCTFILE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MKOCTFILE="$MKOCTFILE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MKOCTFILE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
 done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+MKOCTFILE=$ac_cv_path_MKOCTFILE
+if test -n "$MKOCTFILE"; then
+  { $as_echo "$as_me:$LINENO: result: $MKOCTFILE" >&5
+$as_echo "$MKOCTFILE" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+    if test -z "$OCTAVE"; then
+       { $as_echo "$as_me:$LINENO: WARNING: octave not found, disabling octave wrappers" >&5
+$as_echo "$as_me: WARNING: octave not found, disabling octave wrappers" >&2;}
+       with_octave=no
+    fi
+    if test -z "$MKOCTFILE"; then
+       { $as_echo "$as_me:$LINENO: WARNING: mkoctfile not found, disabling octave wrappers" >&5
+$as_echo "$as_me: WARNING: mkoctfile not found, disabling octave wrappers" >&2;}
+       with_octave=no
+    fi
+    OCTAVE_INCFLAGS=`$MKOCTFILE -p INCFLAGS`
+    OCTAVE_INCFLAGS=$OCTAVE_INCFLAGS
 
+fi
+if test x"$with_octave" = "xyes"; then
+    # check that octave version is at least 2.9.12
+    cat > conftest.m <<'EOF'
+[a,b,c]=sscanf([version()," "],"%i.%i.%i","C");
+exit(sum([a,b,c].*[1e5,1e3,1])<209012)
+EOF
+    $OCTAVE --no-init-file conftest.m >& /dev/null || with_octave="no";
+    rm -f conftest.m
 
-else
-   have_png=no
+    if test x"$with_octave" = "xno"; then
+       { $as_echo "$as_me:$LINENO: WARNING: Octave version < 2.9.12, disabling octave wrappers" >&5
+$as_echo "$as_me: WARNING: Octave version < 2.9.12, disabling octave wrappers" >&2;}
+    fi
 fi
+if test x"$with_octave" = "xyes"; then
+    # if not explicitly forbidden, check for swig also
+    if test x"$with_swig" = "xauto"; then
+        with_swig=yes
+    fi
 
-  fi
-
-  if test "${ac_cv_header_tiff_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for tiff.h" >&5
-$as_echo_n "checking for tiff.h... " >&6; }
-if test "${ac_cv_header_tiff_h+set}" = set; then
+    # check that we have octave headers
+    OLD_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS -x c++ $OCTAVE_INCFLAGS"
+    if test "${ac_cv_header_octave_oct_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for octave/oct.h" >&5
+$as_echo_n "checking for octave/oct.h... " >&6; }
+if test "${ac_cv_header_octave_oct_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiff_h" >&5
-$as_echo "$ac_cv_header_tiff_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_octave_oct_h" >&5
+$as_echo "$ac_cv_header_octave_oct_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking tiff.h usability" >&5
-$as_echo_n "checking tiff.h usability... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking octave/oct.h usability" >&5
+$as_echo_n "checking octave/oct.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27580,7 +24596,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <tiff.h>
+#include <octave/oct.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -27613,15 +24629,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking tiff.h presence" >&5
-$as_echo_n "checking tiff.h presence... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking octave/oct.h presence" >&5
+$as_echo_n "checking octave/oct.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <tiff.h>
+#include <octave/oct.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -27655,25 +24671,25 @@ $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: tiff.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: tiff.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: octave/oct.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: octave/oct.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: tiff.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiff.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: tiff.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: tiff.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiff.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: tiff.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: tiff.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiff.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: tiff.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: octave/oct.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: octave/oct.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: octave/oct.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: octave/oct.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: octave/oct.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: octave/oct.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to opencvlibrary-devel@lists.sourceforge.net ##
@@ -27682,3342 +24698,3310 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for tiff.h" >&5
-$as_echo_n "checking for tiff.h... " >&6; }
-if test "${ac_cv_header_tiff_h+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for octave/oct.h" >&5
+$as_echo_n "checking for octave/oct.h... " >&6; }
+if test "${ac_cv_header_octave_oct_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_header_tiff_h=$ac_header_preproc
+  ac_cv_header_octave_oct_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiff_h" >&5
-$as_echo "$ac_cv_header_tiff_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_octave_oct_h" >&5
+$as_echo "$ac_cv_header_octave_oct_h" >&6; }
 
 fi
-if test "x$ac_cv_header_tiff_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAStrip in -ltiff" >&5
-$as_echo_n "checking for TIFFReadRGBAStrip in -ltiff... " >&6; }
-if test "${ac_cv_lib_tiff_TIFFReadRGBAStrip+set}" = set; then
-  $as_echo_n "(cached) " >&6
+if test "x$ac_cv_header_octave_oct_h" = x""yes; then
+  have_octave=yes
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltiff  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char TIFFReadRGBAStrip ();
-int
-main ()
-{
-return TIFFReadRGBAStrip ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_tiff_TIFFReadRGBAStrip=yes
+          { $as_echo "$as_me:$LINENO: WARNING: Octave headers not found, disabling octave wrappers" >&5
+$as_echo "$as_me: WARNING: Octave headers not found, disabling octave wrappers" >&2;}
+          have_octave=no
+
+fi
+
+
+
+    # restore the old CPPFLAGS
+    CPPFLAGS=$OLD_CPPFLAGS
+
+    # find Octave arch
+    { $as_echo "$as_me:$LINENO: checking for Octave arch" >&5
+$as_echo_n "checking for Octave arch... " >&6; }
+    OCTAVE_ARCH=`$OCTAVE -q --eval 'strcat(octave_config_info("canonical_host_type"), "-", octave_config_info("api_version"))'|sed -e 's/ans = //'`
+    { $as_echo "$as_me:$LINENO: result: $OCTAVE_ARCH" >&5
+$as_echo "$OCTAVE_ARCH" >&6; }
+    OCTAVE_ARCH=$OCTAVE_ARCH
+
+
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    # check if ./configure arguments are valid
+    if test x"$with_octave" = "xno"; then
+        have_octave=no
+    else
+        # if we get here then --with-octave was not called with 'yes','no' or 'auto'
+        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-octave, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-octave, continuing assuming 'no'" >&2;}
+        have_octave=no
+    fi
+fi
+ if test x"$have_octave" = "xyes"; then
+  BUILD_OCTAVE_WRAPPERS_TRUE=
+  BUILD_OCTAVE_WRAPPERS_FALSE='#'
+else
+  BUILD_OCTAVE_WRAPPERS_TRUE='#'
+  BUILD_OCTAVE_WRAPPERS_FALSE=
+fi
 
-       ac_cv_lib_tiff_TIFFReadRGBAStrip=no
+
+# check for swig itself
+SWIG=""
+if test x"$with_swig" = "xyes"; then
+    { $as_echo "$as_me:$LINENO: Checking for SWIG" >&5
+$as_echo "$as_me: Checking for SWIG" >&6;}
+
+       # Python 2.5 requires SWIG >= 1.3.30
+       prog="import sys, string
+# split strings by '.' and convert to numeric.  Append some zeros
+# because we need at least 4 digits for the hex conversion.
+minver = map(int, string.split('have_python25=yes', '.')) + [0, 0, 0]
+minverhex = 0
+for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
+sys.exit(sys.hexversion < minverhex)"
+  if { echo "$as_me:$LINENO: 2.5 -c "$prog"" >&5
+   (2.5 -c "$prog") >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+  have_python25=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+       if test x"$have_python25" = "xyes" ; then
+
+  #
+  # define SWIG as precious variable
+
+  #
+  # check where to find the swig executable
+  # Extract the first word of "swig", so it can be a program name with args.
+set dummy swig; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SWIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $SWIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+SWIG=$ac_cv_path_SWIG
+if test -n "$SWIG"; then
+  { $as_echo "$as_me:$LINENO: result: $SWIG" >&5
+$as_echo "$SWIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAStrip" >&5
-$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAStrip" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFReadRGBAStrip" = x""yes; then
 
-                                 have_tiff=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TIFF /**/
-_ACEOF
+  if test -n "$SWIG"; then
+    #
+    # inquire version number
+    if test -n "$SWIG"; then
+      { $as_echo "$as_me:$LINENO: checking for SWIG version" >&5
+$as_echo_n "checking for SWIG version... " >&6; }
+            SWIG_VERSION=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed -e 's/^[^0-9]*//g' -e 's/ .*//g'`
+      { $as_echo "$as_me:$LINENO: result: $SWIG_VERSION" >&5
+$as_echo "$SWIG_VERSION" >&6; }
+    else
+      SWIG_VERSION=""
+    fi
+    #
+    # if a user requested a given number, check for that now
+    if test -n "1.3.30"; then
+      if test -n "$SWIG_VERSION"; then
+        #
+        # compare version strings
+
+  # check if both parameters were given
+  if test -n "$SWIG_VERSION"; then
+    if test -n "1.3.30"; then
+      :
+    else
+      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
+$as_echo "$as_me: error: no required-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
+$as_echo "$as_me: error: no given-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  #
+  # recombine version strings
+  tmp_both=`echo "1.3.30
+$SWIG_VERSION" | sed 's/\.0*/./g'`
+  tmp_sorted=`
+    echo "$tmp_both" | {
+      # Use POSIX sort first, falling back on traditional sort.
+      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
+      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
+    }
+  `
+  #
+  # set result value
+  if test "x$tmp_both" = "x$tmp_sorted"; then
+    ac_version_at_least=yes
+  else
+    ac_version_at_least=no
+  fi
 
-                                 IMAGELIBS="$IMAGELIBS -ltiff"
-                                 LIBS="$LIBS -ltiff"
+        if test x"$ac_version_at_least" = "xyes"; then
+          # everything is perfect
+          :
+        else
+          # version requirement not fulfilled
+          # we could stop with an error, but instead we just pretend
+          # that there is no swig installed
+          { $as_echo "$as_me:$LINENO: WARNING: SWIG version 1.3.30 is required, you have $SWIG_VERSION" >&5
+$as_echo "$as_me: WARNING: SWIG version 1.3.30 is required, you have $SWIG_VERSION" >&2;}
+          SWIG=""
+        fi
+      else
+        # there was no version number available from swig
+        # and because the user has given requirements, we take
+        # this for a version mismatch
+        { $as_echo "$as_me:$LINENO: WARNING: SWIG version 1.3.30 is required, you have $SWIG_VERSION" >&5
+$as_echo "$as_me: WARNING: SWIG version 1.3.30 is required, you have $SWIG_VERSION" >&2;}
+        SWIG=""
+      fi
+    else
+      # there was no version number available from swig
+      # but because no requirement was given, just warn and go on
+      { $as_echo "$as_me:$LINENO: WARNING: cannot determine SWIG version" >&5
+$as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
+    fi
+  fi
+  #
+  # just in case someone wants to link swig libraries,
+  # we try to determine their path
+  if test -n "$SWIG" ; then
+    SWIG_RUNTIME_LIBS_DIR="${SWIG%/bin*}/lib"
+    { $as_echo "$as_me:$LINENO: SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'" >&5
+$as_echo "$as_me: SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'" >&6;}
+  fi
+  #
+# AC_SUBST([SWIG])  -- already done by AC_PATH_PROG([SWIG],[swig])
 
-fi
 
-fi
 
+       else
 
-fi
+  #
+  # define SWIG as precious variable
 
-have_jasper=no
-if test "${ac_cv_header_jasper_jasper_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for jasper/jasper.h" >&5
-$as_echo_n "checking for jasper/jasper.h... " >&6; }
-if test "${ac_cv_header_jasper_jasper_h+set}" = set; then
+  #
+  # check where to find the swig executable
+  # Extract the first word of "swig", so it can be a program name with args.
+set dummy swig; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SWIG+set}" = set; then
   $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jasper_jasper_h" >&5
-$as_echo "$ac_cv_header_jasper_jasper_h" >&6; }
 else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking jasper/jasper.h usability" >&5
-$as_echo_n "checking jasper/jasper.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <jasper/jasper.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+  case $SWIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+fi
+SWIG=$ac_cv_path_SWIG
+if test -n "$SWIG"; then
+  { $as_echo "$as_me:$LINENO: result: $SWIG" >&5
+$as_echo "$SWIG" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_header_compiler=no
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking jasper/jasper.h presence" >&5
-$as_echo_n "checking jasper/jasper.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <jasper/jasper.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if test -n "$SWIG"; then
+    #
+    # inquire version number
+    if test -n "$SWIG"; then
+      { $as_echo "$as_me:$LINENO: checking for SWIG version" >&5
+$as_echo_n "checking for SWIG version... " >&6; }
+            SWIG_VERSION=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed -e 's/^[^0-9]*//g' -e 's/ .*//g'`
+      { $as_echo "$as_me:$LINENO: result: $SWIG_VERSION" >&5
+$as_echo "$SWIG_VERSION" >&6; }
+    else
+      SWIG_VERSION=""
+    fi
+    #
+    # if a user requested a given number, check for that now
+    if test -n "1.2.24"; then
+      if test -n "$SWIG_VERSION"; then
+        #
+        # compare version strings
+
+  # check if both parameters were given
+  if test -n "$SWIG_VERSION"; then
+    if test -n "1.2.24"; then
+      :
+    else
+      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
+$as_echo "$as_me: error: no required-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
+$as_echo "$as_me: error: no given-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  #
+  # recombine version strings
+  tmp_both=`echo "1.2.24
+$SWIG_VERSION" | sed 's/\.0*/./g'`
+  tmp_sorted=`
+    echo "$tmp_both" | {
+      # Use POSIX sort first, falling back on traditional sort.
+      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
+      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
+    }
+  `
+  #
+  # set result value
+  if test "x$tmp_both" = "x$tmp_sorted"; then
+    ac_version_at_least=yes
+  else
+    ac_version_at_least=no
+  fi
 
-  ac_header_preproc=no
-fi
+        if test x"$ac_version_at_least" = "xyes"; then
+          # everything is perfect
+          :
+        else
+          # version requirement not fulfilled
+          # we could stop with an error, but instead we just pretend
+          # that there is no swig installed
+          { $as_echo "$as_me:$LINENO: WARNING: SWIG version 1.2.24 is required, you have $SWIG_VERSION" >&5
+$as_echo "$as_me: WARNING: SWIG version 1.2.24 is required, you have $SWIG_VERSION" >&2;}
+          SWIG=""
+        fi
+      else
+        # there was no version number available from swig
+        # and because the user has given requirements, we take
+        # this for a version mismatch
+        { $as_echo "$as_me:$LINENO: WARNING: SWIG version 1.2.24 is required, you have $SWIG_VERSION" >&5
+$as_echo "$as_me: WARNING: SWIG version 1.2.24 is required, you have $SWIG_VERSION" >&2;}
+        SWIG=""
+      fi
+    else
+      # there was no version number available from swig
+      # but because no requirement was given, just warn and go on
+      { $as_echo "$as_me:$LINENO: WARNING: cannot determine SWIG version" >&5
+$as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
+    fi
+  fi
+  #
+  # just in case someone wants to link swig libraries,
+  # we try to determine their path
+  if test -n "$SWIG" ; then
+    SWIG_RUNTIME_LIBS_DIR="${SWIG%/bin*}/lib"
+    { $as_echo "$as_me:$LINENO: SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'" >&5
+$as_echo "$as_me: SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'" >&6;}
+  fi
+  #
+# AC_SUBST([SWIG])  -- already done by AC_PATH_PROG([SWIG],[swig])
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: jasper/jasper.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: jasper/jasper.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: jasper/jasper.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: jasper/jasper.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: jasper/jasper.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: jasper/jasper.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: jasper/jasper.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: jasper/jasper.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: jasper/jasper.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for jasper/jasper.h" >&5
-$as_echo_n "checking for jasper/jasper.h... " >&6; }
-if test "${ac_cv_header_jasper_jasper_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_jasper_jasper_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jasper_jasper_h" >&5
-$as_echo "$ac_cv_header_jasper_jasper_h" >&6; }
 
-fi
-if test "x$ac_cv_header_jasper_jasper_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for jas_image_readcmpt in -ljasper" >&5
-$as_echo_n "checking for jas_image_readcmpt in -ljasper... " >&6; }
-if test "${ac_cv_lib_jasper_jas_image_readcmpt+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljasper  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+       fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char jas_image_readcmpt ();
-int
-main ()
-{
-return jas_image_readcmpt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_jasper_jas_image_readcmpt=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_jasper_jas_image_readcmpt=no
-fi
+    if test -n "$SWIG"; then
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_image_readcmpt" >&5
-$as_echo "$ac_cv_lib_jasper_jas_image_readcmpt" >&6; }
-if test "x$ac_cv_lib_jasper_jas_image_readcmpt" = x""yes; then
 
-                               have_jasper=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_JASPER /**/
-_ACEOF
+  if test -z "$SWIG" ; then
+    { { $as_echo "$as_me:$LINENO: error: swig not found" >&5
+$as_echo "$as_me: error: swig not found" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  SWIG="$SWIG -c++"
 
-                               IMAGELIBS="$IMAGELIBS -ljasper"
-                               LIBS="$LIBS -ljasper"
 
-fi
 
-fi
+  { $as_echo "$as_me:$LINENO: checking for swig multi module support" >&5
+$as_echo_n "checking for swig multi module support... " >&6; }
+  #
+  if test -n "$SWIG_VERSION"; then
+    #
 
+  # check if both parameters were given
+  if test -n "$SWIG_VERSION"; then
+    if test -n "1.3.24"; then
+      :
+    else
+      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
+$as_echo "$as_me: error: no required-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
+$as_echo "$as_me: error: no given-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  #
+  # recombine version strings
+  tmp_both=`echo "1.3.24
+$SWIG_VERSION" | sed 's/\.0*/./g'`
+  tmp_sorted=`
+    echo "$tmp_both" | {
+      # Use POSIX sort first, falling back on traditional sort.
+      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
+      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
+    }
+  `
+  #
+  # set result value
+  if test "x$tmp_both" = "x$tmp_sorted"; then
+    ac_version_at_least=yes
+  else
+    ac_version_at_least=no
+  fi
 
+    if test x"$ac_version_at_least" = "xyes"; then
+      # perfect!
+      { $as_echo "$as_me:$LINENO: result: always working (SWIG >= 1.3.24)" >&5
+$as_echo "always working (SWIG >= 1.3.24)" >&6; }
+    else
+      #
+      # there were some older versions that need special treatment
+      # in form of additional command line flags and/or library
+      # dependencies
 
-have_ilmimf=no
-if test "${ac_cv_header_ImfCRgbaFile_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for ImfCRgbaFile.h" >&5
-$as_echo_n "checking for ImfCRgbaFile.h... " >&6; }
-if test "${ac_cv_header_ImfCRgbaFile_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ImfCRgbaFile_h" >&5
-$as_echo "$ac_cv_header_ImfCRgbaFile_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking ImfCRgbaFile.h usability" >&5
-$as_echo_n "checking ImfCRgbaFile.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <ImfCRgbaFile.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  # check if both parameters were given
+  if test -n "$SWIG_VERSION"; then
+    if test -n "1.3.20"; then
+      :
+    else
+      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
+$as_echo "$as_me: error: no required-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
+$as_echo "$as_me: error: no given-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  #
+  # recombine version strings
+  tmp_both=`echo "1.3.20
+$SWIG_VERSION" | sed 's/\.0*/./g'`
+  tmp_sorted=`
+    echo "$tmp_both" | {
+      # Use POSIX sort first, falling back on traditional sort.
+      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
+      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
+    }
+  `
+  #
+  # set result value
+  if test "x$tmp_both" = "x$tmp_sorted"; then
+    ac_version_at_least=yes
+  else
+    ac_version_at_least=no
+  fi
 
-       ac_header_compiler=no
-fi
+      if test x"$ac_version_at_least" = "xyes"; then
+        SWIG="$SWIG -noruntime"
+        { $as_echo "$as_me:$LINENO: result: interim syntax (SWIG >= 1.3.20 < 1.3.24)" >&5
+$as_echo "interim syntax (SWIG >= 1.3.20 < 1.3.24)" >&6; }
+      else
+        SWIG="$SWIG -c"
+        { $as_echo "$as_me:$LINENO: result: old syntax (SWIG < 1.3.20)" >&5
+$as_echo "old syntax (SWIG < 1.3.20)" >&6; }
+      fi
+    fi
+  else
+    { { $as_echo "$as_me:$LINENO: error: SWIG version number unknown - cannot set flags for multi module support" >&5
+$as_echo "$as_me: error: SWIG version number unknown - cannot set flags for multi module support" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+# AC_SUBST([SWIG]) -- already done by AC_PATH_SWIG()
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking ImfCRgbaFile.h presence" >&5
-$as_echo_n "checking ImfCRgbaFile.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ImfCRgbaFile.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+       # if octave wrappers are enabled, check that swig supports octave
+       if test x"$with_octave" = "xyes"; then
+          { $as_echo "$as_me:$LINENO: checking if SWIG supports Octave" >&5
+$as_echo_n "checking if SWIG supports Octave... " >&6; }
+cat > conftest.i <<EOF
+%module conftest
+EOF
+          $SWIG -c++ -octave conftest.i || { { $as_echo "$as_me:$LINENO: error: SWIG doesn't support Octave modules" >&5
+$as_echo "$as_me: error: SWIG doesn't support Octave modules" >&2;}
+   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+          rm -f conftest.*
 
-  ac_header_preproc=no
-fi
+        # specify the flags for swig
+        SWIG_OCTAVE_OPT="-octave"
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: ImfCRgbaFile.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: ImfCRgbaFile.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: ImfCRgbaFile.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: ImfCRgbaFile.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: ImfCRgbaFile.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: ImfCRgbaFile.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: ImfCRgbaFile.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ImfCRgbaFile.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: ImfCRgbaFile.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for ImfCRgbaFile.h" >&5
-$as_echo_n "checking for ImfCRgbaFile.h... " >&6; }
-if test "${ac_cv_header_ImfCRgbaFile_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_ImfCRgbaFile_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ImfCRgbaFile_h" >&5
-$as_echo "$ac_cv_header_ImfCRgbaFile_h" >&6; }
+       fi
 
-fi
-if test "x$ac_cv_header_ImfCRgbaFile_h" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for ImfInputReadPixels in -lIlmImf" >&5
-$as_echo_n "checking for ImfInputReadPixels in -lIlmImf... " >&6; }
-if test "${ac_cv_lib_IlmImf_ImfInputReadPixels+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lIlmImf  -lIex -lHalf  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+        # check for swig python library
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ImfInputReadPixels ();
-int
-main ()
-{
-return ImfInputReadPixels ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_IlmImf_ImfInputReadPixels=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_IlmImf_ImfInputReadPixels=no
-fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_IlmImf_ImfInputReadPixels" >&5
-$as_echo "$ac_cv_lib_IlmImf_ImfInputReadPixels" >&6; }
-if test "x$ac_cv_lib_IlmImf_ImfInputReadPixels" = x""yes; then
+  #
+  test "x" != "xno" || swig_shadow=" -noproxy"
+  #
+  if test -n "$SWIG_VERSION"; then
 
-                               have_ilmimf=yes
+  # check if both parameters were given
+  if test -n "$SWIG_VERSION"; then
+    if test -n "1.3.24"; then
+      :
+    else
+      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
+$as_echo "$as_me: error: no required-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
+$as_echo "$as_me: error: no given-version supplied" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  #
+  # recombine version strings
+  tmp_both=`echo "1.3.24
+$SWIG_VERSION" | sed 's/\.0*/./g'`
+  tmp_sorted=`
+    echo "$tmp_both" | {
+      # Use POSIX sort first, falling back on traditional sort.
+      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
+      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
+    }
+  `
+  #
+  # set result value
+  if test "x$tmp_both" = "x$tmp_sorted"; then
+    ac_version_at_least=yes
+  else
+    ac_version_at_least=no
+  fi
+
+    if test x"$ac_version_at_least" = "xyes"; then
+      SWIG_PYTHON_LIBS=""
+    else
+      SWIG_PYTHON_LIBS="-L$SWIG_RUNTIME_LIBS_DIR -lswigpy"
+    fi
+  else
+    { { $as_echo "$as_me:$LINENO: error: SWIG version number unknown - cannot set python libs" >&5
+$as_echo "$as_me: error: SWIG version number unknown - cannot set python libs" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  #
+  SWIG_PYTHON_OPT="-python$swig_shadow"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ILMIMF /**/
-_ACEOF
 
-                               IMAGELIBS="$IMAGELIBS -lIlmImf -lIex -lHalf"
-                               LIBS="$LIBS -lIlmImf -lIex -lHalf"
 
+        have_swig=yes
+    else
+               if test x"$have_python25" = "xyes"; then
+                       { $as_echo "$as_me:$LINENO: WARNING: Python Version >= 2.5 requires SWIG >= 1.3.30" >&5
+$as_echo "$as_me: WARNING: Python Version >= 2.5 requires SWIG >= 1.3.30" >&2;}
+               fi
+               have_swig=no
+    fi
+else
+    if test x"$with_swig" = "xno"; then
+        have_swig=no
+    else
+        if test x"$with_swig" = "xauto"; then
+            # no (python) wrapper will be generated
+            # we don't need to check for SWIG
+            have_swig=no
+        else
+            # if we get here then --with-swig was not called with 'yes','no' or 'auto'
+            { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-swig, continuing assuming 'no'" >&5
+$as_echo "$as_me: WARNING: unexpected arguments for option --with-swig, continuing assuming 'no'" >&2;}
+            have_swig=no
+        fi
+    fi
 fi
-
+ if test x"$have_swig" = "xyes"; then
+  UPDATE_SWIG_WRAPPERS_TRUE=
+  UPDATE_SWIG_WRAPPERS_FALSE='#'
+else
+  UPDATE_SWIG_WRAPPERS_TRUE='#'
+  UPDATE_SWIG_WRAPPERS_FALSE=
 fi
 
 
 
-# Restore original LIBS settings...
-LIBS="$SAVELIBS"
-
 
+ac_config_files="$ac_config_files Makefile opencv.pc opencv.spec doc/Makefile data/Makefile include/Makefile 3rdparty/Makefile src/Makefile apps/Makefile interfaces/Makefile interfaces/swig/Makefile interfaces/swig/filtered/Makefile interfaces/swig/general/Makefile interfaces/swig/python/Makefile interfaces/swig/octave/Makefile tests/Makefile utils/Makefile samples/Makefile"
 
-######################################################################
-# SWIG wrappers
 
-# each language should have --with-LANGUAGE switch
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
-# check for python
-if test x"$with_python" = "xyes"; then
-    { $as_echo "$as_me:$LINENO: Checking for necessary tools to build python wrappers" >&5
-$as_echo "$as_me: Checking for necessary tools to build python wrappers" >&6;}
+_ACEOF
 
-    # we need Python now
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
 
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+       "s/'/'\\\\''/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
 
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
+DEFS=-DHAVE_CONFIG_H
 
-        # Find any Python interpreter.
-    if test -z "$PYTHON"; then
-      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $PYTHON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
-IFS=$as_save_IFS
+LIBOBJS=$ac_libobjs
 
-  ;;
-esac
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_APPS_TRUE}" && test -z "${BUILD_APPS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_APPS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_APPS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+if test -z "${NATIVE_LAPACK_TRUE}" && test -z "${NATIVE_LAPACK_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"NATIVE_LAPACK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"NATIVE_LAPACK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_CARBON_TRUE}" && test -z "${BUILD_CARBON_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CARBON\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_CARBON\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_GTK_TRUE}" && test -z "${BUILD_GTK_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GTK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_GTK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_QUICKTIME_TRUE}" && test -z "${BUILD_QUICKTIME_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_QUICKTIME\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_QUICKTIME\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_GSTREAMER_TRUE}" && test -z "${BUILD_GSTREAMER_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GSTREAMER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_GSTREAMER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_UNICAP_TRUE}" && test -z "${BUILD_UNICAP_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_UNICAP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_UNICAP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${BUILD_XINE_TRUE}" && test -z "${BUILD_XINE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_XINE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_XINE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
-  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+if test -z "${BUILD_FFMPEG_TRUE}" && test -z "${BUILD_FFMPEG_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_FFMPEG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_FFMPEG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-
-
-  test -n "$PYTHON" && break
-done
-test -n "$PYTHON" || PYTHON=":"
-
-    fi
-    am_display_PYTHON=python
-
-
-  if test "$PYTHON" = :; then
-      { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
-$as_echo "$as_me: error: no suitable Python interpreter found" >&2;}
+if test -z "${BUILD_DC1394_TRUE}" && test -z "${BUILD_DC1394_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DC1394\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_DC1394\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
-  else
-
-
-  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if test "${am_cv_python_version+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
-  PYTHON_VERSION=$am_cv_python_version
-
-
-
-  PYTHON_PREFIX='${prefix}'
-
-  PYTHON_EXEC_PREFIX='${exec_prefix}'
-
-
-
-  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if test "${am_cv_python_platform+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
+if test -z "${BUILD_DC1394_2_TRUE}" && test -z "${BUILD_DC1394_2_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DC1394_2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_DC1394_2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
-  PYTHON_PLATFORM=$am_cv_python_platform
-
-
-
-
-                { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if test "${am_cv_python_pythondir+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+if test -z "${BUILD_V4L_TRUE}" && test -z "${BUILD_V4L_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_V4L\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_V4L\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
-  pythondir=$am_cv_python_pythondir
-
-
-
-  pkgpythondir=\${pythondir}/$PACKAGE
-
-
-            { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if test "${am_cv_python_pyexecdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+if test -z "${BUILD_IMAGEIO_TRUE}" && test -z "${BUILD_IMAGEIO_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_IMAGEIO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_IMAGEIO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
-  pyexecdir=$am_cv_python_pyexecdir
-
-
-
-  pkgpyexecdir=\${pyexecdir}/$PACKAGE
-
-
-
-  fi
-
-
-
-    # get some info on how to compile and link python modules
-
-
-    if test -n "$PYTHON"
-    then
-        az_python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
-        if test -z "$az_python_prefix"
-        then
-            { { $as_echo "$as_me:$LINENO: error: Python Prefix is not known" >&5
-$as_echo "$as_me: error: Python Prefix is not known" >&2;}
+if test -z "${BUILD_PYTHON_WRAPPERS_TRUE}" && test -z "${BUILD_PYTHON_WRAPPERS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PYTHON_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_PYTHON_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
-        fi
-        az_python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
-        az_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
-        az_python_includespec="-I${az_python_prefix}/include/python${az_python_version}"
-        if test x"$python_prefix" != x"$python_execprefix"; then
-            az_python_execspec="-I${az_python_execprefix}/include/python${az_python_version}"
-            az_python_includespec="${az_python_includespec} $az_python_execspec"
-        fi
-        az_python_ccshared=`${PYTHON} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('CFLAGSFORSHARED')"`
-        az_python_cspec="${az_python_ccshared} ${az_python_includespec}"
-        PYTHON_CSPEC=${az_python_cspec}
-
-        { $as_echo "$as_me:$LINENO: PYTHON_CSPEC=${az_python_cspec}" >&5
-$as_echo "$as_me: PYTHON_CSPEC=${az_python_cspec}" >&6;}
-    fi
-
-
-
-    if test -n "$PYTHON"
-    then
-
-
-    if test -z "$PYTHON"
-    then
-        { { $as_echo "$as_me:$LINENO: error: Python Executable not found" >&5
-$as_echo "$as_me: error: Python Executable not found" >&2;}
+fi
+if test -z "${BUILD_OCTAVE_WRAPPERS_TRUE}" && test -z "${BUILD_OCTAVE_WRAPPERS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_OCTAVE_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_OCTAVE_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
-    else
-        cat >conftest.py <<_ACEOF
+fi
+if test -z "${UPDATE_SWIG_WRAPPERS_TRUE}" && test -z "${UPDATE_SWIG_WRAPPERS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"UPDATE_SWIG_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"UPDATE_SWIG_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
-import sys
-import distutils.sysconfig
-strUseFrameWork = "--enable-framework"
-dictConfig = distutils.sysconfig.get_config_vars( )
-strConfigArgs = dictConfig.get("CONFIG_ARGS")
-strLinkSpec =  dictConfig.get('LDFLAGS')
-if -1 ==  strConfigArgs.find(strUseFrameWork):
-    strLibPL = dictConfig.get("LIBPL")
-    if strLibPL and (strLibPL != ""):
-        strLinkSpec += " -L%s" % (strLibPL)
-    strSys = dictConfig.get("SYSLIBS")
-    if strSys and (strSys != ""):
-        strLinkSpec += " %s" % (strSys)
-    strSHL = dictConfig.get("SHLIBS")
-    if strSHL and (strSHL != ""):
-        strLinkSpec += " %s" % (strSHL)
-    # Construct the Python Library Name.
-    strTmplte = " -lpython%d.%d"
-    if (sys.platform == "win32") or (sys.platform == "os2emx"):
-        strTmplte = " -lpython%d%d"
-    strWrk = strTmplte % ( (sys.hexversion >> 24),
-                            ((sys.hexversion >> 16) & 0xff))
-    strLinkSpec += strWrk
-else:
-    # This is not ideal since it changes the search path
-    # for Frameworks which could have side-effects on
-    # other included Frameworks.  However, it is necessary
-    # where someone has installed more than one frameworked
-    # Python.  Frameworks are really only used in MacOSX.
-    strLibFW = dictConfig.get("PYTHONFRAMEWORKPREFIX")
-    if strLibFW and (strLibFW != ""):
-        strLinkSpec += " -F%s" % (strLibFW)
-    strLibPL = dictConfig.get("LIBPL")
-    if strLibPL and (strLibPL != ""):
-        strLinkSpec += " -L%s" % (strLibPL)
-    # Construct the Python Library Name.
-    strTmplte = " -lpython%d.%d"
-    if (sys.platform == "win32") or (sys.platform == "os2emx"):
-        strTmplte = " -lpython%d%d"
-    strWrk = strTmplte % ( (sys.hexversion >> 24),
-                            ((sys.hexversion >> 16) & 0xff))
-    strLinkSpec += strWrk
-strLinkSpec += " %s" % (dictConfig.get('LINKFORSHARED'))
-print strLinkSpec
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
 
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
-        az_python_output=`$PYTHON conftest.py`
-        az_python_cc=$?
-        rm conftest.py
-        if test -f "conftest.pyc"
-        then
-            rm conftest.pyc
-        fi
-    fi
 
-        PYTHON_LSPEC=${az_python_output}
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
 
-        { $as_echo "$as_me:$LINENO: PYTHON_LSPEC=${az_python_output}" >&5
-$as_echo "$as_me: PYTHON_LSPEC=${az_python_output}" >&6;}
-    fi
+fi
 
 
-    # if not explicitly forbidden, check for swig also
-    if test x"$with_swig" = "xauto"; then
-        with_swig=yes
-    fi
 
-    ### almost ok... just need to check if we have the Python headers ###
 
-    # first, save the CPPFLAGS
-    OLD_CPPFLAGS=$CPPFLAGS
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-    # then add the PYTHON path founded previously
-    CPPFLAGS="$CPPFLAGS $PYTHON_CSPEC"
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+       expr "X$arg" : "X\\(.*\\)$as_nl";
+       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
-    # now, we can check
-    if test "${ac_cv_header_Python_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for Python.h" >&5
-$as_echo_n "checking for Python.h... " >&6; }
-if test "${ac_cv_header_Python_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
-$as_echo "$ac_cv_header_Python_h" >&6; }
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
 else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking Python.h usability" >&5
-$as_echo_n "checking Python.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <Python.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""       $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  as_expr=false
+fi
 
-       ac_header_compiler=no
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking Python.h presence" >&5
-$as_echo_n "checking Python.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <Python.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+        X"$0" : 'X\(//\)$' \| \
+        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
 
-  ac_header_preproc=no
-fi
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: Python.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
-{ $as_echo "$as_me:$LINENO: checking for Python.h" >&5
-$as_echo_n "checking for Python.h... " >&6; }
-if test "${ac_cv_header_Python_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  ac_cv_header_Python_h=$ac_header_preproc
+  as_expr=false
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
-$as_echo "$ac_cv_header_Python_h" >&6; }
 
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-if test "x$ac_cv_header_Python_h" = x""yes; then
-  have_python=yes
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
 else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
-          { $as_echo "$as_me:$LINENO: WARNING: Python headers not found, disabling python wrappers" >&5
-$as_echo "$as_me: WARNING: Python headers not found, disabling python wrappers" >&2;}
-          have_python=no
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
 
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+       test -d "$1/.";
+      else
+       case $1 in
+       -*)set "./$1";;
+       esac;
+       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+       ???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
+as_executable_p=$as_test_x
 
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-    # restore the old CPPFLAGS
-    CPPFLAGS=$OLD_CPPFLAGS
 
-else
-    # check if ./configure arguments are valid
-    if test x"$with_python" = "xno"; then
-        have_python=no
-    else
-        # if we get here then --with-python was not called with 'yes','no' or 'auto'
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-python, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-python, continuing assuming 'no'" >&2;}
-        have_python=no
-    fi
-fi
- if test x"$have_python" = "xyes"; then
-  BUILD_PYTHON_WRAPPERS_TRUE=
-  BUILD_PYTHON_WRAPPERS_FALSE='#'
-else
-  BUILD_PYTHON_WRAPPERS_TRUE='#'
-  BUILD_PYTHON_WRAPPERS_FALSE=
-fi
+exec 6>&1
 
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by opencv $as_me 1.2.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
-# check for octave
-if test x"$with_octave" = "xyes"; then
-    { $as_echo "$as_me:$LINENO: Checking for necessary tools to build octave wrappers" >&5
-$as_echo "$as_me: Checking for necessary tools to build octave wrappers" >&6;}
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
 
-    # find octave and mkoctfile
-    # Extract the first word of "octave", so it can be a program name with args.
-set dummy octave; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_OCTAVE+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $OCTAVE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_OCTAVE="$OCTAVE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_OCTAVE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
 
-  ;;
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
 esac
-fi
-OCTAVE=$ac_cv_path_OCTAVE
-if test -n "$OCTAVE"; then
-  { $as_echo "$as_me:$LINENO: result: $OCTAVE" >&5
-$as_echo "$OCTAVE" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
 
-    # Extract the first word of "mkoctfile", so it can be a program name with args.
-set dummy mkoctfile; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MKOCTFILE+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $MKOCTFILE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MKOCTFILE="$MKOCTFILE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MKOCTFILE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-  ;;
-esac
-fi
-MKOCTFILE=$ac_cv_path_MKOCTFILE
-if test -n "$MKOCTFILE"; then
-  { $as_echo "$as_me:$LINENO: result: $MKOCTFILE" >&5
-$as_echo "$MKOCTFILE" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
+_ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
 
-    if test -z "$OCTAVE"; then
-       { $as_echo "$as_me:$LINENO: WARNING: octave not found, disabling octave wrappers" >&5
-$as_echo "$as_me: WARNING: octave not found, disabling octave wrappers" >&2;}
-       with_octave=no
-    fi
-    if test -z "$MKOCTFILE"; then
-       { $as_echo "$as_me:$LINENO: WARNING: mkoctfile not found, disabling octave wrappers" >&5
-$as_echo "$as_me: WARNING: mkoctfile not found, disabling octave wrappers" >&2;}
-       with_octave=no
-    fi
-    OCTAVE_INCFLAGS=`$MKOCTFILE -p INCFLAGS`
-    OCTAVE_INCFLAGS=$OCTAVE_INCFLAGS
+Usage: $0 [OPTION]... [FILE]...
 
-fi
-if test x"$with_octave" = "xyes"; then
-    # check that octave version is at least 2.9.12
-    cat > conftest.m <<'EOF'
-[a,b,c]=sscanf([version()," "],"%i.%i.%i","C");
-exit(sum([a,b,c].*[1e5,1e3,1])<209012)
-EOF
-    $OCTAVE --no-init-file conftest.m >& /dev/null || with_octave="no";
-    rm -f conftest.m
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
-    if test x"$with_octave" = "xno"; then
-       { $as_echo "$as_me:$LINENO: WARNING: Octave version < 2.9.12, disabling octave wrappers" >&5
-$as_echo "$as_me: WARNING: Octave version < 2.9.12, disabling octave wrappers" >&2;}
-    fi
-fi
-if test x"$with_octave" = "xyes"; then
-    # if not explicitly forbidden, check for swig also
-    if test x"$with_swig" = "xauto"; then
-        with_swig=yes
-    fi
+Configuration files:
+$config_files
 
-    # check that we have octave headers
-    OLD_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS -x c++ $OCTAVE_INCFLAGS"
-    if test "${ac_cv_header_octave_oct_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for octave/oct.h" >&5
-$as_echo_n "checking for octave/oct.h... " >&6; }
-if test "${ac_cv_header_octave_oct_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_octave_oct_h" >&5
-$as_echo "$ac_cv_header_octave_oct_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking octave/oct.h usability" >&5
-$as_echo_n "checking octave/oct.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <octave/oct.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+Configuration headers:
+$config_headers
 
-       ac_header_compiler=no
-fi
+Configuration commands:
+$config_commands
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+Report bugs to <bug-autoconf@gnu.org>."
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking octave/oct.h presence" >&5
-$as_echo_n "checking octave/oct.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <octave/oct.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+opencv config.status 1.2.1
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-  ac_header_preproc=no
-fi
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: octave/oct.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: octave/oct.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
     ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: octave/oct.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: octave/oct.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: octave/oct.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: octave/oct.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: octave/oct.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: octave/oct.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: octave/oct.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## -------------------------------------------------------- ##
-## Report this to opencvlibrary-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
     ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for octave/oct.h" >&5
-$as_echo_n "checking for octave/oct.h... " >&6; }
-if test "${ac_cv_header_octave_oct_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_octave_oct_h=$ac_header_preproc
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { $as_echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_octave_oct_h" >&5
-$as_echo "$ac_cv_header_octave_oct_h" >&6; }
 
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
 fi
-if test "x$ac_cv_header_octave_oct_h" = x""yes; then
-  have_octave=yes
-else
 
-          { $as_echo "$as_me:$LINENO: WARNING: Octave headers not found, disabling octave wrappers" >&5
-$as_echo "$as_me: WARNING: Octave headers not found, disabling octave wrappers" >&2;}
-          have_octave=no
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
 
-fi
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-    # restore the old CPPFLAGS
-    CPPFLAGS=$OLD_CPPFLAGS
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+SHELL \
+ECHO \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_ld_CXX \
+hardcode_libdir_separator_CXX \
+fix_srcfile_path_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
 
-    # find Octave arch
-    { $as_echo "$as_me:$LINENO: checking for Octave arch" >&5
-$as_echo_n "checking for Octave arch... " >&6; }
-    OCTAVE_ARCH=`$OCTAVE -q --eval 'strcat(octave_config_info("canonical_host_type"), "-", octave_config_info("api_version"))'|sed -e 's/ans = //'`
-    { $as_echo "$as_me:$LINENO: result: $OCTAVE_ARCH" >&5
-$as_echo "$OCTAVE_ARCH" >&6; }
-    OCTAVE_ARCH=$OCTAVE_ARCH
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
 
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
 
-else
-    # check if ./configure arguments are valid
-    if test x"$with_octave" = "xno"; then
-        have_octave=no
-    else
-        # if we get here then --with-octave was not called with 'yes','no' or 'auto'
-        { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-octave, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-octave, continuing assuming 'no'" >&2;}
-        have_octave=no
-    fi
-fi
- if test x"$have_octave" = "xyes"; then
-  BUILD_OCTAVE_WRAPPERS_TRUE=
-  BUILD_OCTAVE_WRAPPERS_FALSE='#'
-else
-  BUILD_OCTAVE_WRAPPERS_TRUE='#'
-  BUILD_OCTAVE_WRAPPERS_FALSE=
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
 fi
 
 
-# check for swig itself
-SWIG=""
-if test x"$with_swig" = "xyes"; then
-    { $as_echo "$as_me:$LINENO: Checking for SWIG" >&5
-$as_echo "$as_me: Checking for SWIG" >&6;}
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
 
-       # Python 2.5 requires SWIG >= 1.3.30
-       prog="import sys, string
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('have_python25=yes', '.')) + [0, 0, 0]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
-  if { echo "$as_me:$LINENO: 2.5 -c "$prog"" >&5
-   (2.5 -c "$prog") >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-  have_python25=no
-fi
 
-       if test x"$have_python25" = "xyes" ; then
 
-  #
-  # define SWIG as precious variable
 
-  #
-  # check where to find the swig executable
-  # Extract the first word of "swig", so it can be a program name with args.
-set dummy swig; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SWIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $SWIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-  ;;
-esac
-fi
-SWIG=$ac_cv_path_SWIG
-if test -n "$SWIG"; then
-  { $as_echo "$as_me:$LINENO: result: $SWIG" >&5
-$as_echo "$SWIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
+_ACEOF
 
-  if test -n "$SWIG"; then
-    #
-    # inquire version number
-    if test -n "$SWIG"; then
-      { $as_echo "$as_me:$LINENO: checking for SWIG version" >&5
-$as_echo_n "checking for SWIG version... " >&6; }
-            SWIG_VERSION=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed -e 's/^[^0-9]*//g' -e 's/ .*//g'`
-      { $as_echo "$as_me:$LINENO: result: $SWIG_VERSION" >&5
-$as_echo "$SWIG_VERSION" >&6; }
-    else
-      SWIG_VERSION=""
-    fi
-    #
-    # if a user requested a given number, check for that now
-    if test -n "1.3.30"; then
-      if test -n "$SWIG_VERSION"; then
-        #
-        # compare version strings
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
-  # check if both parameters were given
-  if test -n "$SWIG_VERSION"; then
-    if test -n "1.3.30"; then
-      :
-    else
-      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
-$as_echo "$as_me: error: no required-version supplied" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
-$as_echo "$as_me: error: no given-version supplied" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  #
-  # recombine version strings
-  tmp_both=`echo "1.3.30
-$SWIG_VERSION" | sed 's/\.0*/./g'`
-  tmp_sorted=`
-    echo "$tmp_both" | {
-      # Use POSIX sort first, falling back on traditional sort.
-      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
-      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
-    }
-  `
-  #
-  # set result value
-  if test "x$tmp_both" = "x$tmp_sorted"; then
-    ac_version_at_least=yes
-  else
-    ac_version_at_least=no
-  fi
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "cvconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS cvconfig.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "opencv.pc") CONFIG_FILES="$CONFIG_FILES opencv.pc" ;;
+    "opencv.spec") CONFIG_FILES="$CONFIG_FILES opencv.spec" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+    "3rdparty/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
+    "interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/Makefile" ;;
+    "interfaces/swig/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/Makefile" ;;
+    "interfaces/swig/filtered/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/filtered/Makefile" ;;
+    "interfaces/swig/general/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/general/Makefile" ;;
+    "interfaces/swig/python/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/python/Makefile" ;;
+    "interfaces/swig/octave/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/octave/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
+    "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
 
-        if test x"$ac_version_at_least" = "xyes"; then
-          # everything is perfect
-          :
-        else
-          # version requirement not fulfilled
-          # we could stop with an error, but instead we just pretend
-          # that there is no swig installed
-          { $as_echo "$as_me:$LINENO: WARNING: SWIG version 1.3.30 is required, you have $SWIG_VERSION" >&5
-$as_echo "$as_me: WARNING: SWIG version 1.3.30 is required, you have $SWIG_VERSION" >&2;}
-          SWIG=""
-        fi
-      else
-        # there was no version number available from swig
-        # and because the user has given requirements, we take
-        # this for a version mismatch
-        { $as_echo "$as_me:$LINENO: WARNING: SWIG version 1.3.30 is required, you have $SWIG_VERSION" >&5
-$as_echo "$as_me: WARNING: SWIG version 1.3.30 is required, you have $SWIG_VERSION" >&2;}
-        SWIG=""
-      fi
-    else
-      # there was no version number available from swig
-      # but because no requirement was given, just warn and go on
-      { $as_echo "$as_me:$LINENO: WARNING: cannot determine SWIG version" >&5
-$as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
-    fi
-  fi
-  #
-  # just in case someone wants to link swig libraries,
-  # we try to determine their path
-  if test -n "$SWIG" ; then
-    SWIG_RUNTIME_LIBS_DIR="${SWIG%/bin*}/lib"
-    { $as_echo "$as_me:$LINENO: SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'" >&5
-$as_echo "$as_me: SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'" >&6;}
-  fi
-  #
-# AC_SUBST([SWIG])  -- already done by AC_PATH_PROG([SWIG],[swig])
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
 
 
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
 
-       else
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
 
-  #
-  # define SWIG as precious variable
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
 
-  #
-  # check where to find the swig executable
-  # Extract the first word of "swig", so it can be a program name with args.
-set dummy swig; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SWIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $SWIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
 
-  ;;
-esac
-fi
-SWIG=$ac_cv_path_SWIG
-if test -n "$SWIG"; then
-  { $as_echo "$as_me:$LINENO: result: $SWIG" >&5
-$as_echo "$SWIG" >&6; }
+
+ac_cr='\r'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cs_awk_cr=$ac_cr
 fi
 
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
 
-  if test -n "$SWIG"; then
-    #
-    # inquire version number
-    if test -n "$SWIG"; then
-      { $as_echo "$as_me:$LINENO: checking for SWIG version" >&5
-$as_echo_n "checking for SWIG version... " >&6; }
-            SWIG_VERSION=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed -e 's/^[^0-9]*//g' -e 's/ .*//g'`
-      { $as_echo "$as_me:$LINENO: result: $SWIG_VERSION" >&5
-$as_echo "$SWIG_VERSION" >&6; }
-    else
-      SWIG_VERSION=""
-    fi
-    #
-    # if a user requested a given number, check for that now
-    if test -n "1.2.24"; then
-      if test -n "$SWIG_VERSION"; then
-        #
-        # compare version strings
 
-  # check if both parameters were given
-  if test -n "$SWIG_VERSION"; then
-    if test -n "1.2.24"; then
-      :
-    else
-      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
-$as_echo "$as_me: error: no required-version supplied" >&2;}
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-    fi
-  else
-    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
-$as_echo "$as_me: error: no given-version supplied" >&2;}
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  fi
-  #
-  # recombine version strings
-  tmp_both=`echo "1.2.24
-$SWIG_VERSION" | sed 's/\.0*/./g'`
-  tmp_sorted=`
-    echo "$tmp_both" | {
-      # Use POSIX sort first, falling back on traditional sort.
-      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
-      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
-    }
-  `
-  #
-  # set result value
-  if test "x$tmp_both" = "x$tmp_sorted"; then
-    ac_version_at_least=yes
   else
-    ac_version_at_least=no
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
+done
+rm -f conf$$subs.sh
 
-        if test x"$ac_version_at_least" = "xyes"; then
-          # everything is perfect
-          :
-        else
-          # version requirement not fulfilled
-          # we could stop with an error, but instead we just pretend
-          # that there is no swig installed
-          { $as_echo "$as_me:$LINENO: WARNING: SWIG version 1.2.24 is required, you have $SWIG_VERSION" >&5
-$as_echo "$as_me: WARNING: SWIG version 1.2.24 is required, you have $SWIG_VERSION" >&2;}
-          SWIG=""
-        fi
-      else
-        # there was no version number available from swig
-        # and because the user has given requirements, we take
-        # this for a version mismatch
-        { $as_echo "$as_me:$LINENO: WARNING: SWIG version 1.2.24 is required, you have $SWIG_VERSION" >&5
-$as_echo "$as_me: WARNING: SWIG version 1.2.24 is required, you have $SWIG_VERSION" >&2;}
-        SWIG=""
-      fi
-    else
-      # there was no version number available from swig
-      # but because no requirement was given, just warn and go on
-      { $as_echo "$as_me:$LINENO: WARNING: cannot determine SWIG version" >&5
-$as_echo "$as_me: WARNING: cannot determine SWIG version" >&2;}
-    fi
-  fi
-  #
-  # just in case someone wants to link swig libraries,
-  # we try to determine their path
-  if test -n "$SWIG" ; then
-    SWIG_RUNTIME_LIBS_DIR="${SWIG%/bin*}/lib"
-    { $as_echo "$as_me:$LINENO: SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'" >&5
-$as_echo "$as_me: SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'" >&6;}
-  fi
-  #
-# AC_SUBST([SWIG])  -- already done by AC_PATH_PROG([SWIG],[swig])
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = "\a"
 
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
+  print line
+}
 
-       fi
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
 
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[         ]*VPATH[        ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[    ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[      ]*$//
+}'
+fi
 
-    if test -n "$SWIG"; then
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
 
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-  if test -z "$SWIG" ; then
-    { { $as_echo "$as_me:$LINENO: error: swig not found" >&5
-$as_echo "$as_me: error: swig not found" >&2;}
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
    { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
-  SWIG="$SWIG -c++"
-
+done
 
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
 
-  { $as_echo "$as_me:$LINENO: checking for swig multi module support" >&5
-$as_echo_n "checking for swig multi module support... " >&6; }
-  #
-  if test -n "$SWIG_VERSION"; then
-    #
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[    ]*#[    ]*define[       ][      ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
 
-  # check if both parameters were given
-  if test -n "$SWIG_VERSION"; then
-    if test -n "1.3.24"; then
-      :
-    else
-      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
-$as_echo "$as_me: error: no required-version supplied" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
-$as_echo "$as_me: error: no given-version supplied" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  #
-  # recombine version strings
-  tmp_both=`echo "1.3.24
-$SWIG_VERSION" | sed 's/\.0*/./g'`
-  tmp_sorted=`
-    echo "$tmp_both" | {
-      # Use POSIX sort first, falling back on traditional sort.
-      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
-      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = "\a"
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
     }
-  `
-  #
-  # set result value
-  if test "x$tmp_both" = "x$tmp_sorted"; then
-    ac_version_at_least=yes
-  else
-    ac_version_at_least=no
-  fi
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
 
-    if test x"$ac_version_at_least" = "xyes"; then
-      # perfect!
-      { $as_echo "$as_me:$LINENO: result: always working (SWIG >= 1.3.24)" >&5
-$as_echo "always working (SWIG >= 1.3.24)" >&6; }
-    else
-      #
-      # there were some older versions that need special treatment
-      # in form of additional command line flags and/or library
-      # dependencies
 
-  # check if both parameters were given
-  if test -n "$SWIG_VERSION"; then
-    if test -n "1.3.20"; then
-      :
-    else
-      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
-$as_echo "$as_me: error: no required-version supplied" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
-$as_echo "$as_me: error: no given-version supplied" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  #
-  # recombine version strings
-  tmp_both=`echo "1.3.20
-$SWIG_VERSION" | sed 's/\.0*/./g'`
-  tmp_sorted=`
-    echo "$tmp_both" | {
-      # Use POSIX sort first, falling back on traditional sort.
-      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
-      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
-    }
-  `
-  #
-  # set result value
-  if test "x$tmp_both" = "x$tmp_sorted"; then
-    ac_version_at_least=yes
-  else
-    ac_version_at_least=no
-  fi
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+        # (if the path is not absolute).  The absolute path cannot be DOS-style,
+        # because $ac_f cannot contain `:'.
+        test -f "$ac_f" ||
+          case $ac_f in
+          [\\/$]*) false;;
+          *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+          esac ||
+          { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
+    done
 
-      if test x"$ac_version_at_least" = "xyes"; then
-        SWIG="$SWIG -noruntime"
-        { $as_echo "$as_me:$LINENO: result: interim syntax (SWIG >= 1.3.20 < 1.3.24)" >&5
-$as_echo "interim syntax (SWIG >= 1.3.20 < 1.3.24)" >&6; }
-      else
-        SWIG="$SWIG -c"
-        { $as_echo "$as_me:$LINENO: result: old syntax (SWIG < 1.3.20)" >&5
-$as_echo "old syntax (SWIG < 1.3.20)" >&6; }
-      fi
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+         $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+       `' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
-  else
-    { { $as_echo "$as_me:$LINENO: error: SWIG version number unknown - cannot set flags for multi module support" >&5
-$as_echo "$as_me: error: SWIG version number unknown - cannot set flags for multi module support" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-# AC_SUBST([SWIG]) -- already done by AC_PATH_SWIG()
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
+    esac
+    ;;
+  esac
 
-       # if octave wrappers are enabled, check that swig supports octave
-       if test x"$with_octave" = "xyes"; then
-          { $as_echo "$as_me:$LINENO: checking if SWIG supports Octave" >&5
-$as_echo_n "checking if SWIG supports Octave... " >&6; }
-cat > conftest.i <<EOF
-%module conftest
-EOF
-          $SWIG -c++ -octave conftest.i || { { $as_echo "$as_me:$LINENO: error: SWIG doesn't support Octave modules" >&5
-$as_echo "$as_me: error: SWIG doesn't support Octave modules" >&2;}
-   { (exit 1); exit 1; }; }
-          { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-          rm -f conftest.*
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$ac_file" : 'X\(//\)[^/]' \| \
+        X"$ac_file" : 'X\(//\)$' \| \
+        X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
 
-        # specify the flags for swig
-        SWIG_OCTAVE_OPT="-octave"
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-       fi
 
-        # check for swig python library
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
 
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
 
-  #
-  test "x" != "xno" || swig_shadow=" -noproxy"
-  #
-  if test -n "$SWIG_VERSION"; then
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
 
-  # check if both parameters were given
-  if test -n "$SWIG_VERSION"; then
-    if test -n "1.3.24"; then
-      :
-    else
-      { { $as_echo "$as_me:$LINENO: error: no required-version supplied" >&5
-$as_echo "$as_me: error: no required-version supplied" >&2;}
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
    { (exit 1); exit 1; }; }
-    fi
-  else
-    { { $as_echo "$as_me:$LINENO: error: no given-version supplied" >&5
-$as_echo "$as_me: error: no given-version supplied" >&2;}
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
    { (exit 1); exit 1; }; }
-  fi
+ ;;
+  :H)
   #
-  # recombine version strings
-  tmp_both=`echo "1.3.24
-$SWIG_VERSION" | sed 's/\.0*/./g'`
-  tmp_sorted=`
-    echo "$tmp_both" | {
-      # Use POSIX sort first, falling back on traditional sort.
-      sort -t. -k1,1n -k1,1 -k2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 2>/dev/null ||
-      sort -t. +0n -1 +0 -1 +1n -2 +1 -2 +2n -3 +2 -3 +3n -4 +3 -4
-    }
-  `
+  # CONFIG_HEADER
   #
-  # set result value
-  if test "x$tmp_both" = "x$tmp_sorted"; then
-    ac_version_at_least=yes
-  else
-    ac_version_at_least=no
-  fi
-
-    if test x"$ac_version_at_least" = "xyes"; then
-      SWIG_PYTHON_LIBS=""
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      SWIG_PYTHON_LIBS="-L$SWIG_RUNTIME_LIBS_DIR -lswigpy"
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+       || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    { { $as_echo "$as_me:$LINENO: error: SWIG version number unknown - cannot set python libs" >&5
-$as_echo "$as_me: error: SWIG version number unknown - cannot set python libs" >&2;}
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
    { (exit 1); exit 1; }; }
   fi
-  #
-  SWIG_PYTHON_OPT="-python$swig_shadow"
-
-
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$_am_arg" : 'X\(//\)[^/]' \| \
+        X"$_am_arg" : 'X\(//\)$' \| \
+        X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
-        have_swig=yes
-    else
-               if test x"$have_python25" = "xyes"; then
-                       { $as_echo "$as_me:$LINENO: WARNING: Python Version >= 2.5 requires SWIG >= 1.3.30" >&5
-$as_echo "$as_me: WARNING: Python Version >= 2.5 requires SWIG >= 1.3.30" >&2;}
-               fi
-               have_swig=no
-    fi
-else
-    if test x"$with_swig" = "xno"; then
-        have_swig=no
-    else
-        if test x"$with_swig" = "xauto"; then
-            # no (python) wrapper will be generated
-            # we don't need to check for SWIG
-            have_swig=no
-        else
-            # if we get here then --with-swig was not called with 'yes','no' or 'auto'
-            { $as_echo "$as_me:$LINENO: WARNING: unexpected arguments for option --with-swig, continuing assuming 'no'" >&5
-$as_echo "$as_me: WARNING: unexpected arguments for option --with-swig, continuing assuming 'no'" >&2;}
-            have_swig=no
-        fi
-    fi
-fi
- if test x"$have_swig" = "xyes"; then
-  UPDATE_SWIG_WRAPPERS_TRUE=
-  UPDATE_SWIG_WRAPPERS_FALSE='#'
-else
-  UPDATE_SWIG_WRAPPERS_TRUE='#'
-  UPDATE_SWIG_WRAPPERS_FALSE=
-fi
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
 
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file.  Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*)   set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+    dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$mf" : 'X\(//\)[^/]' \| \
+        X"$mf" : 'X\(//\)$' \| \
+        X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$file" : 'X\(//\)[^/]' \| \
+        X"$file" : 'X\(//\)$' \| \
+        X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
+    "libtool":C)
 
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
 
-ac_config_files="$ac_config_files Makefile opencv.pc opencv.spec doc/Makefile data/Makefile include/Makefile 3rdparty/Makefile src/Makefile apps/Makefile interfaces/Makefile interfaces/swig/Makefile interfaces/swig/filtered/Makefile interfaces/swig/general/Makefile interfaces/swig/python/Makefile interfaces/swig/octave/Makefile tests/Makefile utils/Makefile samples/Makefile"
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
 
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
 
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
 #
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-_ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
 
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-       "s/'/'\\\\''/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
+# ### BEGIN LIBTOOL CONFIG
 
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
 
-DEFS=-DHAVE_CONFIG_H
+# Assembler program.
+AS=$AS
 
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
+# DLL creation program.
+DLLTOOL=$DLLTOOL
 
-LTLIBOBJS=$ac_ltlibobjs
+# Object dumper program.
+OBJDUMP=$OBJDUMP
 
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
 
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_APPS_TRUE}" && test -z "${BUILD_APPS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_APPS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_APPS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
 
-if test -z "${NATIVE_LAPACK_TRUE}" && test -z "${NATIVE_LAPACK_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"NATIVE_LAPACK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"NATIVE_LAPACK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_CARBON_TRUE}" && test -z "${BUILD_CARBON_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CARBON\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_CARBON\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_GTK_TRUE}" && test -z "${BUILD_GTK_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GTK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_GTK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_QUICKTIME_TRUE}" && test -z "${BUILD_QUICKTIME_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_QUICKTIME\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_QUICKTIME\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_GSTREAMER_TRUE}" && test -z "${BUILD_GSTREAMER_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GSTREAMER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_GSTREAMER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_UNICAP_TRUE}" && test -z "${BUILD_UNICAP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_UNICAP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_UNICAP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_XINE_TRUE}" && test -z "${BUILD_XINE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_XINE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_XINE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_FFMPEG_TRUE}" && test -z "${BUILD_FFMPEG_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_FFMPEG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_FFMPEG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_DC1394_TRUE}" && test -z "${BUILD_DC1394_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DC1394\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_DC1394\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_V4L_TRUE}" && test -z "${BUILD_V4L_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_V4L\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_V4L\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_IMAGEIO_TRUE}" && test -z "${BUILD_IMAGEIO_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_IMAGEIO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_IMAGEIO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_PYTHON_WRAPPERS_TRUE}" && test -z "${BUILD_PYTHON_WRAPPERS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PYTHON_WRAPPERS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_PYTHON_WRAPPERS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${BUILD_OCTAVE_WRAPPERS_TRUE}" && test -z "${BUILD_OCTAVE_WRAPPERS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_OCTAVE_WRAPPERS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"BUILD_OCTAVE_WRAPPERS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${UPDATE_SWIG_WRAPPERS_TRUE}" && test -z "${UPDATE_SWIG_WRAPPERS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"UPDATE_SWIG_WRAPPERS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"UPDATE_SWIG_WRAPPERS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
 
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
+# A sed program that does not truncate output.
+SED=$lt_SED
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
 
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
+# A grep program that handles long lines.
+GREP=$lt_GREP
 
-fi
+# An ERE matcher.
+EGREP=$lt_EGREP
 
+# A literal string matcher.
+FGREP=$lt_FGREP
 
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
 
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
 
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-       expr "X$arg" : "X\\(.*\\)$as_nl";
-       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+# Object file suffix (normally "o").
+objext=$ac_objext
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
+# Executable file suffix (normally "").
+exeext=$exeext
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
+# whether the shell understands "unset".
+lt_unset=$lt_unset
 
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""       $as_nl"
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
 
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
 
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
 
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
+# A symbol stripping program.
+STRIP=$lt_STRIP
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# A C compiler.
+LTCC=$lt_CC
 
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
 
-# CDPATH.
-$as_unset CDPATH
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
 
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
+# Library versioning type.
+version_type=$version_type
 
+# Shared library runtime path variable.
+runpath_var=$runpath_var
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
 
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
 
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-       test -d "$1/.";
-      else
-       case $1 in
-       -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
 
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
 
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
 
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
 
-exec 6>&1
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
 
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by opencv $as_me 1.2.1, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
 
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
-_ACEOF
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
 
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
 
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
 
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
 
-_ACEOF
+# The linker used to build libraries.
+LD=$lt_LD
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
 
-Usage: $0 [OPTION]... [FILE]...
+# A language specific compiler.
+CC=$lt_compiler
 
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
 
-Configuration files:
-$config_files
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-Configuration headers:
-$config_headers
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
 
-Configuration commands:
-$config_commands
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
 
-Report bugs to <bug-autoconf@gnu.org>."
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-opencv config.status 1.2.1
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
 
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
 
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
-  # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
 
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
 
-  esac
-  shift
-done
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
 
-ac_configure_extra_args=
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
 
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
 
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
 
-_ACEOF
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
 
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "cvconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS cvconfig.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "opencv.pc") CONFIG_FILES="$CONFIG_FILES opencv.pc" ;;
-    "opencv.spec") CONFIG_FILES="$CONFIG_FILES opencv.spec" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "3rdparty/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
-    "interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/Makefile" ;;
-    "interfaces/swig/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/Makefile" ;;
-    "interfaces/swig/filtered/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/filtered/Makefile" ;;
-    "interfaces/swig/general/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/general/Makefile" ;;
-    "interfaces/swig/python/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/python/Makefile" ;;
-    "interfaces/swig/octave/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/swig/octave/Makefile" ;;
-    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-    "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
-    "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
 
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
 
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
 
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
 
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
 
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
 
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
 
-ac_cr='\r'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
 
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
 
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
 }
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = "\a"
 
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
 }
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
 {
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
 
-  print line
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
 }
 
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
-_ACEOF
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[         ]*VPATH[        ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[    ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[      ]*$//
-}'
-fi
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
 
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
 
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
   else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+    func_dirname_result="$func_dirname_result${2}"
   fi
-done
+}
 
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
 
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[    ]*#[    ]*define[       ][      ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = "\a"
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
 }
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
 }
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
 
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
+
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
 
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
 
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-        # (if the path is not absolute).  The absolute path cannot be DOS-style,
-        # because $ac_f cannot contain `:'.
-        test -f "$ac_f" ||
-          case $ac_f in
-          [\\/$]*) false;;
-          *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-          esac ||
-          { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
-    done
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
 
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-         $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-       `' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
 
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
-    esac
-    ;;
-  esac
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
 
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$ac_file" : 'X\(//\)[^/]' \| \
-        X"$ac_file" : 'X\(//\)$' \| \
-        X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_dir" : 'X\(//\)[^/]' \| \
-        X"$as_dir" : 'X\(//\)$' \| \
-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
 
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
 
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
 
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
 
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
 
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
 
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
 
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-       || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$_am_arg" : 'X\(//\)[^/]' \| \
-        X"$_am_arg" : 'X\(//\)$' \| \
-        X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
 
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$mf" : 'X\(//\)[^/]' \| \
-        X"$mf" : 'X\(//\)$' \| \
-        X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$file" : 'X\(//\)[^/]' \| \
-        X"$file" : 'X\(//\)$' \| \
-        X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_dir" : 'X\(//\)[^/]' \| \
-        X"$as_dir" : 'X\(//\)$' \| \
-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
  ;;
 
   esac
@@ -31100,6 +28084,7 @@ HighGUI configuration ================================================
     Use gstreamer:            ${have_gstreamer}
     Use ffmpeg:               ${have_ffmpeg}
     Use dc1394 & raw1394:     ${have_dc1394}
+    Use dc1394_v2 & raw1394:  ${have_dc1394_2}
     Use v4l:                  ${have_v4l}
     Use v4l2:                 ${have_v4l2}
     Use unicap:               ${have_unicap}
@@ -31155,6 +28140,7 @@ HighGUI configuration ================================================
     Use gstreamer:            ${have_gstreamer}
     Use ffmpeg:               ${have_ffmpeg}
     Use dc1394 & raw1394:     ${have_dc1394}
+    Use dc1394_v2 & raw1394:  ${have_dc1394_2}
     Use v4l:                  ${have_v4l}
     Use v4l2:                 ${have_v4l2}
     Use unicap:               ${have_unicap}
index afb27f2c2a9664bf3c35b0ec9f5cf15928e0ab18..5bdb26ac11fff804899cfd865a8b087269b695b7 100644 (file)
@@ -323,11 +323,11 @@ AC_SUBST(OPTIMIZATION_CPPFLAGS)
 AC_SUBST(OPTIMIZATION_CXXFLAGS)
 AC_SUBST(FLOAT_STORE_CFLAGS)
 
-
-# add libm because it is used by several libraries and OpenCV itself
+# basic libraries needed by OpenCV
 AC_CHECK_LIB(m,pow)
 AC_CHECK_LIB(dl,dlopen)
 AC_CHECK_LIB(pthread,pthread_create)
+AC_CHECK_LIB(z,gzputs)
 
 # check endianness
 AC_C_BIGENDIAN
@@ -338,8 +338,6 @@ AC_FUNC_ALLOCA
 AC_CHECK_HEADERS([malloc.h])
 AC_CHECK_HEADERS([assert.h])
 AC_CHECK_FUNCS(lrint)
-#AC_CHECK_FUNC(clock_gettime,, [AC_CHECK_LIB(rt, clock_gettime, [LIBRT="-lrt"])])
-#AC_SUBST(LIBRT)
 AC_SEARCH_LIBS([clock_gettime],[rt])
 
 ######################################################################
@@ -637,32 +635,34 @@ if test x"$with_ffmpeg" = "xno"; then
     have_ffmpeg=no
     # FFMPEGLIBS=""
 else
-
+    
+    have_ffmpeg=no
+    have_avcodec=no
+    have_avformat=no
+    
     # check if ./configure arguments are valid
     if test x"$with_ffmpeg" = "xauto"; then
        with_ffmpeg=yes
     fi
+    
     if test x"$with_ffmpeg" = "xyes"; then
-        AC_CHECK_HEADER(ffmpeg/avcodec.h,
-                        AC_SEARCH_LIBS([avcodec_decode_video],[avcodec_pic avcodec],                                      [
-                                       AC_SEARCH_LIBS([av_open_input_file], [avformat_pic avformat],
-                                                    [
-                                                      have_ffmpeg=yes
-                                                      AC_DEFINE(HAVE_FFMPEG,,[FFMpeg video library])
-                                                      FFMPEGLIBS="-lavcodec -lavformat"
-                                                    ],
-                                                    [ have_ffmpeg=no ],
-                                                    [-lavcodec])
-                                     ],
-                                     [ have_ffmpeg=no ]),
-                        [ have_ffmpeg=no ])
-        AC_CHECK_HEADER([ffmpeg/swscale.h],
-                            AC_CHECK_LIB(swscale,sws_getContext,
-                                         [
-                                          AC_DEFINE(HAVE_FFMPEG_SWSCALE,,[ffmpeg's libswscale])
-                                           FFMPEG_SWSCALE_LIBS="-lswscale"
-                                         ]))
-        FFMPEGLIBS="$FFMPEGLIBS $FFMPEG_SWSCALE_LIBS"
+        AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h],[have_avcodec=yes])
+        AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h],[have_avformat=yes])
+        
+        if test x"$have_avcodec"x"$have_avformat" = "xyesxyes" ; then
+            AC_SEARCH_LIBS([avcodec_decode_video],[avcodec_pic avcodec],[
+                AC_SEARCH_LIBS([av_open_input_file], [avformat_pic avformat],[have_ffmpeg=yes],[],[-lavcodec])])
+        fi
+        
+        if test x"$have_ffmpeg" = "xyes" ; then
+            # libswscale is not always necessary, but if it is there, we want to use it
+            AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h],[
+                AC_CHECK_LIB([swscale],[sws_getContext],[FFMPEG_SWSCALE_LIBS="-lswscale"
+                    AC_DEFINE(HAVE_FFMPEG_SWSCALE,,[FFMPEG helper library])])])
+            
+            AC_DEFINE(HAVE_FFMPEG,,[FFMPEG video library])
+            FFMPEGLIBS="-lavcodec -lavformat $FFMPEG_SWSCALE_LIBS"
+        fi
     else
         # if we get here then --with-ffmpeg was not called with 'yes','no' or 'auto'
         AC_MSG_WARN([unexpected arguments for option --with-ffmpeg, continuing assuming 'no'])
@@ -677,6 +677,7 @@ AM_CONDITIONAL([BUILD_FFMPEG], [test x"$have_ffmpeg" = "xyes"])
 if test x"$with_1394libs" = "xno"; then
     have_raw1394=no
     have_dc1394=no
+    have_dc1394_2=no
     # IEEE1394LIBS=""
 else
 
@@ -689,24 +690,35 @@ else
         SAVELIBS="$LIBS"
         have_raw1394=no
         have_dc1394=no
+        have_dc1394_2=no
 
         AC_CHECK_HEADER(libraw1394/raw1394.h,
                         AC_CHECK_LIB(raw1394, raw1394_new_handle,
                                      [
                                        have_raw1394=yes
-                                       LIBS="-lm -lraw1394 $LIBS"
+                                       LIBS="-lraw1394 $LIBS"
                                      ]))
 
         if test x"$have_raw1394" = "xyes"; then
-            AC_CHECK_HEADER(libdc1394/dc1394_control.h,
-                            AC_CHECK_LIB(dc1394_control, dc1394_camera_on,
+            AC_CHECK_HEADER(dc1394/dc1394.h,
+                            AC_CHECK_LIB(dc1394, dc1394_camera_enumerate,
                                          [
-                                           have_dc1394=yes
-                                           AC_DEFINE(HAVE_DC1394,,[IEEE1394 capturing support])
-                                           AC_EGREP_HEADER(do_extra_buffering, libdc1394/dc1394_control.h,
-                                                           [AC_DEFINE(HAVE_DC1394_095,,[libdc1394 0.9.4 or 0.9.5])])
-                                           IEEE1394LIBS="-lm -lraw1394 -ldc1394_control"
+                                           have_dc1394_2=yes
+                                           AC_DEFINE(HAVE_DC1394_2,,[IEEE1394 capturing support])
+                                           IEEE1394LIBS="-lraw1394 -ldc1394"
                                          ]))
+            
+            if test x"$have_dc1394_2" = "xno"; then
+                AC_CHECK_HEADER(libdc1394/dc1394_control.h,
+                                AC_CHECK_LIB(dc1394_control, dc1394_camera_on,
+                                             [
+                                               have_dc1394=yes
+                                               AC_DEFINE(HAVE_DC1394,,[IEEE1394 capturing support])
+                                               AC_EGREP_HEADER(do_extra_buffering, libdc1394/dc1394_control.h,
+                                                               [AC_DEFINE(HAVE_DC1394_095,,[libdc1394 0.9.4 or 0.9.5])])
+                                               IEEE1394LIBS="-lraw1394 -ldc1394_control"
+                                             ]))
+            fi
         fi
 
         LIBS="$SAVELIBS"
@@ -718,6 +730,7 @@ else
 fi
 AC_SUBST(IEEE1394LIBS)
 AM_CONDITIONAL([BUILD_DC1394], [test x"$have_dc1394" = "xyes"])
+AM_CONDITIONAL([BUILD_DC1394_2], [test x"$have_dc1394_2" = "xyes"])
 
 # Video for Linux (V4L)
 # we support version 1 and 2 currently
@@ -811,8 +824,8 @@ if test x"$have_imageio" = "xno" ; then
                                [
                                  have_zlib=yes
                                  AC_DEFINE(HAVE_ZLIB,,[LZ77 compression/decompression library (used for PNG)])
-                                 IMAGELIBS="$IMAGELIBS -lz -lm"
-                                 LIBS="$LIBS -lz -lm"
+                                 IMAGELIBS="$IMAGELIBS -lz"
+                                 LIBS="$LIBS -lz"
                                ]))
 
   AC_CHECK_HEADER(png.h,
@@ -1117,6 +1130,7 @@ HighGUI configuration ================================================
     Use gstreamer:            ${have_gstreamer}
     Use ffmpeg:               ${have_ffmpeg}
     Use dc1394 & raw1394:     ${have_dc1394}
+    Use dc1394_v2 & raw1394:  ${have_dc1394_2}
     Use v4l:                  ${have_v4l}
     Use v4l2:                 ${have_v4l2}
     Use unicap:               ${have_unicap}
index ca7584822929055b4f6fb0492a1842511c4afd17..bec5218bee78cf693fabfbc097468b1019161054 100644 (file)
 /* libdc1394 0.9.4 or 0.9.5 */
 #undef HAVE_DC1394_095
 
+/* IEEE1394 capturing support */
+#undef HAVE_DC1394_2
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* FFMpeg video library */
+/* FFMPEG video library */
 #undef HAVE_FFMPEG
 
-/* ffmpeg's libswscale */
+/* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
+#undef HAVE_FFMPEG_AVCODEC_H
+
+/* Define to 1 if you have the <ffmpeg/avformat.h> header file. */
+#undef HAVE_FFMPEG_AVFORMAT_H
+
+/* FFMPEG helper library */
 #undef HAVE_FFMPEG_SWSCALE
 
+/* Define to 1 if you have the <ffmpeg/swscale.h> header file. */
+#undef HAVE_FFMPEG_SWSCALE_H
+
 /* GStreamer multimedia framework */
 #undef HAVE_GSTREAMER
 
 /* IJG JPEG codec */
 #undef HAVE_JPEG
 
+/* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
+#undef HAVE_LIBAVCODEC_AVCODEC_H
+
+/* Define to 1 if you have the <libavformat/avformat.h> header file. */
+#undef HAVE_LIBAVFORMAT_AVFORMAT_H
+
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 
+/* Define to 1 if you have the <libswscale/swscale.h> header file. */
+#undef HAVE_LIBSWSCALE_SWSCALE_H
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
 /* Define to 1 if you have the `lrint' function. */
 #undef HAVE_LRINT
 
 /* LZ77 compression/decompression library (used for PNG) */
 #undef HAVE_ZLIB
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Name of package */
 #undef PACKAGE
 
index 9db77a518e24a41d61d5064d8a44f737b361e7a8..b1f233712cb42b6e61315c608ca4a035c70718d7 100644 (file)
@@ -17,4 +17,12 @@ nobase_dist_pkgdata_DATA = \
   haarcascades/haarcascade_lowerbody.xml \
   haarcascades/haarcascade_profileface.xml \
   haarcascades/haarcascade_righteye_2splits.xml \
-  haarcascades/haarcascade_upperbody.xml
+  haarcascades/haarcascade_upperbody.xml \
+  \
+  haarcascades/haarcascade_mcs_eyepair_big.xml \
+  haarcascades/haarcascade_mcs_eyepair_small.xml \
+  haarcascades/haarcascade_mcs_lefteye.xml \
+  haarcascades/haarcascade_mcs_mouth.xml \
+  haarcascades/haarcascade_mcs_nose.xml \
+  haarcascades/haarcascade_mcs_righteye.xml \
+  haarcascades/haarcascade_mcs_upperbody.xml
index 40bf306e42e9b54659797a8dbf6c632d7a5a5c8f..b49e5bc452c824fc460f8554c85f1d2deeae2278 100644 (file)
@@ -44,7 +44,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -94,15 +98,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -119,10 +122,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -132,6 +137,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -141,6 +147,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -182,7 +190,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -213,6 +221,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -253,7 +262,15 @@ nobase_dist_pkgdata_DATA = \
   haarcascades/haarcascade_lowerbody.xml \
   haarcascades/haarcascade_profileface.xml \
   haarcascades/haarcascade_righteye_2splits.xml \
-  haarcascades/haarcascade_upperbody.xml
+  haarcascades/haarcascade_upperbody.xml \
+  \
+  haarcascades/haarcascade_mcs_eyepair_big.xml \
+  haarcascades/haarcascade_mcs_eyepair_small.xml \
+  haarcascades/haarcascade_mcs_lefteye.xml \
+  haarcascades/haarcascade_mcs_mouth.xml \
+  haarcascades/haarcascade_mcs_nose.xml \
+  haarcascades/haarcascade_mcs_righteye.xml \
+  haarcascades/haarcascade_mcs_upperbody.xml
 
 all: all-am
 
index 578ea40b6db7b02d68ae8197498ff38c020ef4c3..16f1969298e2db5cc81d8549ef4582cad74c3bad 100644 (file)
@@ -44,7 +44,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -94,15 +98,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -119,10 +122,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -132,6 +137,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -141,6 +147,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -182,7 +190,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -213,6 +221,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
index 6a213b7da08750a96c91525610dccb2344a50990..0476aa76dc4e6400ac5f2c26bdb35e9cd54e4a03 100644 (file)
@@ -45,7 +45,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -97,15 +101,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -122,10 +125,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -135,6 +140,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -144,6 +150,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -185,7 +193,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -216,6 +224,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
index 270de278bc7a0a3bc034a2fe16326daf2354e79f..d0c1d51f56fb01b39da182b9bf6868d70d1257b8 100644 (file)
@@ -478,6 +478,9 @@ IplConvKernelFP;
 #define CV_64F  6
 #define CV_USRTYPE1 7
 
+#define CV_MAT_DEPTH_MASK       (CV_DEPTH_MAX - 1)
+#define CV_MAT_DEPTH(flags)     ((flags) & CV_MAT_DEPTH_MASK)
+
 #define CV_MAKETYPE(depth,cn) (CV_MAT_DEPTH(depth) + (((cn)-1) << CV_CN_SHIFT))
 #define CV_MAKE_TYPE CV_MAKETYPE
 
@@ -528,8 +531,6 @@ IplConvKernelFP;
 
 #define CV_MAT_CN_MASK          ((CV_CN_MAX - 1) << CV_CN_SHIFT)
 #define CV_MAT_CN(flags)        ((((flags) & CV_MAT_CN_MASK) >> CV_CN_SHIFT) + 1)
-#define CV_MAT_DEPTH_MASK       (CV_DEPTH_MAX - 1)
-#define CV_MAT_DEPTH(flags)     ((flags) & CV_MAT_DEPTH_MASK)
 #define CV_MAT_TYPE_MASK        (CV_DEPTH_MAX*CV_CN_MAX - 1)
 #define CV_MAT_TYPE(flags)      ((flags) & CV_MAT_TYPE_MASK)
 #define CV_MAT_CONT_FLAG_SHIFT  14
index 03eaf1b5b19d257c813f2458381f89cce2e6d048..c7836808da11210b0b2a734751c96350e1404d15 100644 (file)
@@ -598,6 +598,7 @@ public:
     CvEM();
     CvEM( const CvMat* samples, const CvMat* sample_idx=0,
           CvEMParams params=CvEMParams(), CvMat* labels=0 );
+    //CvEM (CvEMParams params, CvMat * means, CvMat ** covs, CvMat * weights, CvMat * probs, CvMat * log_weight_div_det, CvMat * inv_eigen_values, CvMat** cov_rotate_mats);
 
     virtual ~CvEM();
 
@@ -607,13 +608,17 @@ public:
     virtual float predict( const CvMat* sample, CvMat* probs ) const;
     virtual void clear();
 
-    int get_nclusters() const;
-    const CvMat* get_means() const;
-    const CvMat** get_covs() const;
-    const CvMat* get_weights() const;
-    const CvMat* get_probs() const;
+    int           get_nclusters() const;
+    const CvMat*  get_means()     const;
+    const CvMat** get_covs()      const;
+    const CvMat*  get_weights()   const;
+    const CvMat*  get_probs()     const;
 
-    inline double get_log_likelihood () const { return log_likelihood; };
+    inline double         get_log_likelihood     () const { return log_likelihood;     };
+    
+//    inline const CvMat *  get_log_weight_div_det () const { return log_weight_div_det; };
+//    inline const CvMat *  get_inv_eigen_values   () const { return inv_eigen_values;   };
+//    inline const CvMat ** get_cov_rotate_mats    () const { return cov_rotate_mats;    };
 
 protected:
 
index 5b11f45f994b49012c526addda6fe903e00cc6b0..2f3468197978614043f8b9691a96f390e7998396 100644 (file)
@@ -48,7 +48,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -101,15 +105,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -126,10 +129,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -139,6 +144,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -148,6 +154,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -189,7 +197,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -220,6 +228,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -244,7 +253,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = swig
-EXTRA_DIST = CMakeLists.txt ffopencv ippopencv
+EXTRA_DIST = CMakeLists.txt ffopencv
 all: all-recursive
 
 .SUFFIXES:
index 4aa24cb766c165f44a656004c0f8cca4dc89ff3f..8557aef92bbc0a9fd67007a96b14fa47ff2c60be 100644 (file)
@@ -46,7 +46,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -99,15 +103,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -124,10 +127,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -137,6 +142,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -146,6 +152,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -187,7 +195,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -218,6 +226,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
index eeed6ecd809a3d09911b6a6c40d8cb670dcbbf18..2a56ef6759476ebd4e826825d702471d48f718e1 100644 (file)
@@ -48,7 +48,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -92,15 +96,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -117,10 +120,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -130,6 +135,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -139,6 +145,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -180,7 +188,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -211,6 +219,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
index eabf5d72b4b32c2fa4952b6938363dfe16976b00..5a69ff6d6c76d59ab8e741377c7f4357cbf40e42 100644 (file)
 
 #define CV_MINOR_VERSION    1
 
-#define CV_SUBMINOR_VERSION 0
+#define CV_SUBMINOR_VERSION 1
 
-#define CV_VERSION          "1.1.0"
+#define CV_VERSION          CVAUX_STR(CV_MAJOR_VERSION) "." CVAUX_STR(CV_MINOR_VERSION) "." CVAUX_STR(CV_SUBMINOR_VERSION)
 
-#define CV_PI   3.1415926535897932384626433832795\r
+#define CV_PI   3.1415926535897932384626433832795
 
-#define CV_LOG2 0.69314718055994530941723212145818\r
+#define CV_LOG2 0.69314718055994530941723212145818
 
-#define IPL_DEPTH_SIGN 0x80000000\r
+#define IPL_DEPTH_SIGN 0x80000000
 
-#define IPL_DEPTH_1U     1\r
+#define IPL_DEPTH_1U     1
 
-#define IPL_DEPTH_8U     8\r
+#define IPL_DEPTH_8U     8
 
-#define IPL_DEPTH_16U   16\r
+#define IPL_DEPTH_16U   16
 
-#define IPL_DEPTH_32F   32\r
+#define IPL_DEPTH_32F   32
 
-#define IPL_DEPTH_8S  (IPL_DEPTH_SIGN| 8)\r
+#define IPL_DEPTH_8S  (IPL_DEPTH_SIGN| 8)
 
-#define IPL_DEPTH_16S (IPL_DEPTH_SIGN|16)\r
+#define IPL_DEPTH_16S (IPL_DEPTH_SIGN|16)
 
-#define IPL_DEPTH_32S (IPL_DEPTH_SIGN|32)\r
+#define IPL_DEPTH_32S (IPL_DEPTH_SIGN|32)
 
-#define IPL_DATA_ORDER_PIXEL  0\r
+#define IPL_DATA_ORDER_PIXEL  0
 
-#define IPL_DATA_ORDER_PLANE  1\r
+#define IPL_DATA_ORDER_PLANE  1
 
-#define IPL_ORIGIN_TL 0\r
+#define IPL_ORIGIN_TL 0
 
-#define IPL_ORIGIN_BL 1\r
+#define IPL_ORIGIN_BL 1
 
-#define IPL_ALIGN_4BYTES   4\r
+#define IPL_ALIGN_4BYTES   4
 
-#define IPL_ALIGN_8BYTES   8\r
+#define IPL_ALIGN_8BYTES   8
 
-#define IPL_ALIGN_16BYTES 16\r
+#define IPL_ALIGN_16BYTES 16
 
-#define IPL_ALIGN_32BYTES 32\r
+#define IPL_ALIGN_32BYTES 32
 
-#define IPL_ALIGN_DWORD   IPL_ALIGN_4BYTES\r
+#define IPL_ALIGN_DWORD   IPL_ALIGN_4BYTES
 
-#define IPL_ALIGN_QWORD   IPL_ALIGN_8BYTES\r
+#define IPL_ALIGN_QWORD   IPL_ALIGN_8BYTES
 
-#define IPL_BORDER_CONSTANT   0\r
+#define IPL_BORDER_CONSTANT   0
 
-#define IPL_BORDER_REPLICATE  1\r
+#define IPL_BORDER_REPLICATE  1
 
-#define IPL_BORDER_REFLECT    2\r
+#define IPL_BORDER_REFLECT    2
 
-#define IPL_BORDER_WRAP       3\r
+#define IPL_BORDER_WRAP       3
 
-#define IPL_IMAGE_HEADER 1\r
+#define IPL_IMAGE_HEADER 1
 
-#define IPL_IMAGE_DATA   2\r
+#define IPL_IMAGE_DATA   2
 
-#define IPL_IMAGE_ROI    4\r
+#define IPL_IMAGE_ROI    4
 
-#define IPL_BORDER_REFLECT_101    4\r
+#define IPL_BORDER_REFLECT_101    4
 
-#define IPL_IMAGE_MAGIC_VAL  ((int)sizeof(IplImage))\r
+#define IPL_IMAGE_MAGIC_VAL  ((int)sizeof(IplImage))
 
-#define CV_TYPE_NAME_IMAGE "opencv-image"\r
+#define CV_TYPE_NAME_IMAGE "opencv-image"
 
-#define IPL_DEPTH_64F  64\r
+#define IPL_DEPTH_64F  64
 
-#define CV_CN_MAX     64\r
+#define CV_CN_MAX     64
 
-#define CV_CN_SHIFT   3\r
+#define CV_CN_SHIFT   3
 
-#define CV_DEPTH_MAX  (1 << CV_CN_SHIFT)\r
+#define CV_DEPTH_MAX  (1 << CV_CN_SHIFT)
 
-#define CV_8U   0\r
+#define CV_8U   0
 
-#define CV_8S   1\r
+#define CV_8S   1
 
-#define CV_16U  2\r
+#define CV_16U  2
 
-#define CV_16S  3\r
+#define CV_16S  3
 
-#define CV_32S  4\r
+#define CV_32S  4
 
-#define CV_32F  5\r
+#define CV_32F  5
 
-#define CV_64F  6\r
+#define CV_64F  6
 
-#define CV_USRTYPE1 7\r
+#define CV_USRTYPE1 7
 
-#define CV_MAKETYPE(depth,cn) ((depth) + (((cn)-1) << CV_CN_SHIFT))\r
+#define CV_MAT_DEPTH_MASK       (CV_DEPTH_MAX - 1)
 
-#define CV_MAKE_TYPE CV_MAKETYPE\r
+#define CV_MAT_DEPTH(flags)     ((flags) & CV_MAT_DEPTH_MASK)
 
-#define CV_8UC1 CV_MAKETYPE(CV_8U,1)\r
+#define CV_MAKETYPE(depth,cn) (CV_MAT_DEPTH(depth) + (((cn)-1) << CV_CN_SHIFT))
 
-#define CV_8UC2 CV_MAKETYPE(CV_8U,2)\r
+#define CV_MAKE_TYPE CV_MAKETYPE
 
-#define CV_8UC3 CV_MAKETYPE(CV_8U,3)\r
+#define CV_8UC1 CV_MAKETYPE(CV_8U,1)
 
-#define CV_8UC4 CV_MAKETYPE(CV_8U,4)\r
+#define CV_8UC2 CV_MAKETYPE(CV_8U,2)
 
-#define CV_8SC1 CV_MAKETYPE(CV_8S,1)\r
+#define CV_8UC3 CV_MAKETYPE(CV_8U,3)
 
-#define CV_8SC2 CV_MAKETYPE(CV_8S,2)\r
+#define CV_8UC4 CV_MAKETYPE(CV_8U,4)
 
-#define CV_8SC3 CV_MAKETYPE(CV_8S,3)\r
+#define CV_8SC1 CV_MAKETYPE(CV_8S,1)
 
-#define CV_8SC4 CV_MAKETYPE(CV_8S,4)\r
+#define CV_8SC2 CV_MAKETYPE(CV_8S,2)
 
-#define CV_16UC1 CV_MAKETYPE(CV_16U,1)\r
+#define CV_8SC3 CV_MAKETYPE(CV_8S,3)
 
-#define CV_16UC2 CV_MAKETYPE(CV_16U,2)\r
+#define CV_8SC4 CV_MAKETYPE(CV_8S,4)
 
-#define CV_16UC3 CV_MAKETYPE(CV_16U,3)\r
+#define CV_16UC1 CV_MAKETYPE(CV_16U,1)
 
-#define CV_16UC4 CV_MAKETYPE(CV_16U,4)\r
+#define CV_16UC2 CV_MAKETYPE(CV_16U,2)
 
-#define CV_16SC1 CV_MAKETYPE(CV_16S,1)\r
+#define CV_16UC3 CV_MAKETYPE(CV_16U,3)
 
-#define CV_16SC2 CV_MAKETYPE(CV_16S,2)\r
+#define CV_16UC4 CV_MAKETYPE(CV_16U,4)
 
-#define CV_16SC3 CV_MAKETYPE(CV_16S,3)\r
+#define CV_16SC1 CV_MAKETYPE(CV_16S,1)
 
-#define CV_16SC4 CV_MAKETYPE(CV_16S,4)\r
+#define CV_16SC2 CV_MAKETYPE(CV_16S,2)
 
-#define CV_32SC1 CV_MAKETYPE(CV_32S,1)\r
+#define CV_16SC3 CV_MAKETYPE(CV_16S,3)
 
-#define CV_32SC2 CV_MAKETYPE(CV_32S,2)\r
+#define CV_16SC4 CV_MAKETYPE(CV_16S,4)
 
-#define CV_32SC3 CV_MAKETYPE(CV_32S,3)\r
+#define CV_32SC1 CV_MAKETYPE(CV_32S,1)
 
-#define CV_32SC4 CV_MAKETYPE(CV_32S,4)\r
+#define CV_32SC2 CV_MAKETYPE(CV_32S,2)
 
-#define CV_32FC1 CV_MAKETYPE(CV_32F,1)\r
+#define CV_32SC3 CV_MAKETYPE(CV_32S,3)
 
-#define CV_32FC2 CV_MAKETYPE(CV_32F,2)\r
+#define CV_32SC4 CV_MAKETYPE(CV_32S,4)
 
-#define CV_32FC3 CV_MAKETYPE(CV_32F,3)\r
+#define CV_32FC1 CV_MAKETYPE(CV_32F,1)
 
-#define CV_32FC4 CV_MAKETYPE(CV_32F,4)\r
+#define CV_32FC2 CV_MAKETYPE(CV_32F,2)
 
-#define CV_64FC1 CV_MAKETYPE(CV_64F,1)\r
+#define CV_32FC3 CV_MAKETYPE(CV_32F,3)
 
-#define CV_64FC2 CV_MAKETYPE(CV_64F,2)\r
+#define CV_32FC4 CV_MAKETYPE(CV_32F,4)
 
-#define CV_64FC3 CV_MAKETYPE(CV_64F,3)\r
+#define CV_64FC1 CV_MAKETYPE(CV_64F,1)
 
-#define CV_64FC4 CV_MAKETYPE(CV_64F,4)\r
+#define CV_64FC2 CV_MAKETYPE(CV_64F,2)
 
-#define CV_AUTO_STEP  0x7fffffff\r
+#define CV_64FC3 CV_MAKETYPE(CV_64F,3)
 
-#define CV_WHOLE_ARR  cvSlice( 0, 0x3fffffff )\r
+#define CV_64FC4 CV_MAKETYPE(CV_64F,4)
 
-#define CV_MAT_CN_MASK          ((CV_CN_MAX - 1) << CV_CN_SHIFT)\r
+#define CV_AUTO_STEP  0x7fffffff
 
-#define CV_MAT_DEPTH_MASK       (CV_DEPTH_MAX - 1)\r
+#define CV_WHOLE_ARR  cvSlice( 0, 0x3fffffff )
 
-#define CV_MAT_TYPE_MASK        (CV_DEPTH_MAX*CV_CN_MAX - 1)\r
+#define CV_MAT_CN_MASK          ((CV_CN_MAX - 1) << CV_CN_SHIFT)
 
-#define CV_MAT_CONT_FLAG_SHIFT  14\r
+#define CV_MAT_TYPE_MASK        (CV_DEPTH_MAX*CV_CN_MAX - 1)
 
-#define CV_MAT_CONT_FLAG        (1 << CV_MAT_CONT_FLAG_SHIFT)\r
+#define CV_MAT_TYPE(flags)      ((flags) & CV_MAT_TYPE_MASK)
 
-#define CV_IS_CONT_MAT          CV_IS_MAT_CONT\r
+#define CV_MAT_CONT_FLAG_SHIFT  14
 
-#define CV_MAT_TEMP_FLAG_SHIFT  15\r
+#define CV_MAT_CONT_FLAG        (1 << CV_MAT_CONT_FLAG_SHIFT)
 
-#define CV_MAT_TEMP_FLAG        (1 << CV_MAT_TEMP_FLAG_SHIFT)\r
+#define CV_IS_CONT_MAT          CV_IS_MAT_CONT
 
-#define CV_MAGIC_MASK       0xFFFF0000\r
+#define CV_MAT_TEMP_FLAG_SHIFT  15
 
-#define CV_MAT_MAGIC_VAL    0x42420000\r
+#define CV_MAT_TEMP_FLAG        (1 << CV_MAT_TEMP_FLAG_SHIFT)
 
-#define CV_TYPE_NAME_MAT    "opencv-matrix"\r
+#define CV_MAGIC_MASK       0xFFFF0000
 
-#define CV_MATND_MAGIC_VAL    0x42430000\r
+#define CV_MAT_MAGIC_VAL    0x42420000
 
-#define CV_TYPE_NAME_MATND    "opencv-nd-matrix"\r
+#define CV_TYPE_NAME_MAT    "opencv-matrix"
 
-#define CV_MAX_DIM            32\r
+#define CV_MATND_MAGIC_VAL    0x42430000
 
-#define CV_MAX_DIM_HEAP       (1 << 16)\r
+#define CV_TYPE_NAME_MATND    "opencv-nd-matrix"
 
-#define CV_SPARSE_MAT_MAGIC_VAL    0x42440000\r
+#define CV_MAX_DIM            32
 
-#define CV_TYPE_NAME_SPARSE_MAT    "opencv-sparse-matrix"\r
+#define CV_MAX_DIM_HEAP       (1 << 16)
 
-#define CV_HIST_MAGIC_VAL     0x42450000\r
+#define CV_SPARSE_MAT_MAGIC_VAL    0x42440000
 
-#define CV_HIST_UNIFORM_FLAG  (1 << 10)\r
+#define CV_TYPE_NAME_SPARSE_MAT    "opencv-sparse-matrix"
 
-#define CV_HIST_RANGES_FLAG   (1 << 11)\r
+#define CV_HIST_MAGIC_VAL     0x42450000
 
-#define CV_HIST_ARRAY         0\r
+#define CV_HIST_UNIFORM_FLAG  (1 << 10)
 
-#define CV_HIST_SPARSE        1\r
+#define CV_HIST_RANGES_FLAG   (1 << 11)
 
-#define CV_HIST_TREE          CV_HIST_SPARSE\r
+#define CV_HIST_ARRAY         0
 
-#define CV_HIST_UNIFORM       1\r
+#define CV_HIST_SPARSE        1
 
-#define CV_TERMCRIT_ITER    1\r
+#define CV_HIST_TREE          CV_HIST_SPARSE
 
-#define CV_TERMCRIT_NUMBER  CV_TERMCRIT_ITER\r
+#define CV_HIST_UNIFORM       1
 
-#define CV_TERMCRIT_EPS     2\r
+#define CV_TERMCRIT_ITER    1
 
-#define CV_WHOLE_SEQ_END_INDEX 0x3fffffff\r
+#define CV_TERMCRIT_NUMBER  CV_TERMCRIT_ITER
 
-#define CV_WHOLE_SEQ  cvSlice(0, CV_WHOLE_SEQ_END_INDEX)\r
+#define CV_TERMCRIT_EPS     2
 
-#define CV_STORAGE_MAGIC_VAL    0x42890000\r
+#define CV_WHOLE_SEQ_END_INDEX 0x3fffffff
 
-#define CV_TYPE_NAME_SEQ             "opencv-sequence"\r
+#define CV_WHOLE_SEQ  cvSlice(0, CV_WHOLE_SEQ_END_INDEX)
 
-#define CV_TYPE_NAME_SEQ_TREE        "opencv-sequence-tree"\r
+#define CV_STORAGE_MAGIC_VAL    0x42890000
 
-#define CV_SET_ELEM_IDX_MASK   ((1 << 26) - 1)\r
+#define CV_TYPE_NAME_SEQ             "opencv-sequence"
 
-#define CV_SET_ELEM_FREE_FLAG  (1 << (sizeof(int)*8-1))\r
+#define CV_TYPE_NAME_SEQ_TREE        "opencv-sequence-tree"
 
-#define CV_TYPE_NAME_GRAPH "opencv-graph"\r
+#define CV_SET_ELEM_IDX_MASK   ((1 << 26) - 1)
 
-#define CV_SEQ_MAGIC_VAL             0x42990000\r
+#define CV_SET_ELEM_FREE_FLAG  (1 << (sizeof(int)*8-1))
 
-#define CV_SET_MAGIC_VAL             0x42980000\r
+#define CV_TYPE_NAME_GRAPH "opencv-graph"
 
-#define CV_SEQ_ELTYPE_BITS           9\r
+#define CV_SEQ_MAGIC_VAL             0x42990000
 
-#define CV_SEQ_ELTYPE_MASK           ((1 << CV_SEQ_ELTYPE_BITS) - 1)\r
+#define CV_SET_MAGIC_VAL             0x42980000
+
+#define CV_SEQ_ELTYPE_BITS           9
+
+#define CV_SEQ_ELTYPE_MASK           ((1 << CV_SEQ_ELTYPE_BITS) - 1)
 
 #define CV_SEQ_ELTYPE_POINT          CV_32SC2  
 
 #define CV_SEQ_ELTYPE_CODE           CV_8UC1   
 
-#define CV_SEQ_ELTYPE_GENERIC        0\r
+#define CV_SEQ_ELTYPE_GENERIC        0
 
-#define CV_SEQ_ELTYPE_PTR            CV_USRTYPE1\r
+#define CV_SEQ_ELTYPE_PTR            CV_USRTYPE1
 
 #define CV_SEQ_ELTYPE_PPOINT         CV_SEQ_ELTYPE_PTR  
 
 
 #define CV_SEQ_ELTYPE_POINT3D        CV_32FC3  
 
-#define CV_SEQ_KIND_BITS        3\r
+#define CV_SEQ_KIND_BITS        3
 
-#define CV_SEQ_KIND_MASK        (((1 << CV_SEQ_KIND_BITS) - 1)<<CV_SEQ_ELTYPE_BITS)\r
+#define CV_SEQ_KIND_MASK        (((1 << CV_SEQ_KIND_BITS) - 1)<<CV_SEQ_ELTYPE_BITS)
 
-#define CV_SEQ_KIND_GENERIC     (0 << CV_SEQ_ELTYPE_BITS)\r
+#define CV_SEQ_KIND_GENERIC     (0 << CV_SEQ_ELTYPE_BITS)
 
-#define CV_SEQ_KIND_CURVE       (1 << CV_SEQ_ELTYPE_BITS)\r
+#define CV_SEQ_KIND_CURVE       (1 << CV_SEQ_ELTYPE_BITS)
 
-#define CV_SEQ_KIND_BIN_TREE    (2 << CV_SEQ_ELTYPE_BITS)\r
+#define CV_SEQ_KIND_BIN_TREE    (2 << CV_SEQ_ELTYPE_BITS)
 
-#define CV_SEQ_KIND_GRAPH       (3 << CV_SEQ_ELTYPE_BITS)\r
+#define CV_SEQ_KIND_GRAPH       (3 << CV_SEQ_ELTYPE_BITS)
 
-#define CV_SEQ_KIND_SUBDIV2D    (4 << CV_SEQ_ELTYPE_BITS)\r
+#define CV_SEQ_KIND_SUBDIV2D    (4 << CV_SEQ_ELTYPE_BITS)
 
-#define CV_SEQ_FLAG_SHIFT       (CV_SEQ_KIND_BITS + CV_SEQ_ELTYPE_BITS)\r
+#define CV_SEQ_FLAG_SHIFT       (CV_SEQ_KIND_BITS + CV_SEQ_ELTYPE_BITS)
 
-#define CV_SEQ_FLAG_CLOSED     (1 << CV_SEQ_FLAG_SHIFT)\r
+#define CV_SEQ_FLAG_CLOSED     (1 << CV_SEQ_FLAG_SHIFT)
 
-#define CV_SEQ_FLAG_SIMPLE     (2 << CV_SEQ_FLAG_SHIFT)\r
+#define CV_SEQ_FLAG_SIMPLE     (2 << CV_SEQ_FLAG_SHIFT)
 
-#define CV_SEQ_FLAG_CONVEX     (4 << CV_SEQ_FLAG_SHIFT)\r
+#define CV_SEQ_FLAG_CONVEX     (4 << CV_SEQ_FLAG_SHIFT)
 
-#define CV_SEQ_FLAG_HOLE       (8 << CV_SEQ_FLAG_SHIFT)\r
+#define CV_SEQ_FLAG_HOLE       (8 << CV_SEQ_FLAG_SHIFT)
 
-#define CV_GRAPH_FLAG_ORIENTED (1 << CV_SEQ_FLAG_SHIFT)\r
+#define CV_GRAPH_FLAG_ORIENTED (1 << CV_SEQ_FLAG_SHIFT)
 
-#define CV_GRAPH               CV_SEQ_KIND_GRAPH\r
+#define CV_GRAPH               CV_SEQ_KIND_GRAPH
 
-#define CV_ORIENTED_GRAPH      (CV_SEQ_KIND_GRAPH|CV_GRAPH_FLAG_ORIENTED)\r
+#define CV_ORIENTED_GRAPH      (CV_SEQ_KIND_GRAPH|CV_GRAPH_FLAG_ORIENTED)
 
-#define CV_SEQ_POINT_SET       (CV_SEQ_KIND_GENERIC| CV_SEQ_ELTYPE_POINT)\r
+#define CV_SEQ_POINT_SET       (CV_SEQ_KIND_GENERIC| CV_SEQ_ELTYPE_POINT)
 
-#define CV_SEQ_POINT3D_SET     (CV_SEQ_KIND_GENERIC| CV_SEQ_ELTYPE_POINT3D)\r
+#define CV_SEQ_POINT3D_SET     (CV_SEQ_KIND_GENERIC| CV_SEQ_ELTYPE_POINT3D)
 
-#define CV_SEQ_POLYLINE        (CV_SEQ_KIND_CURVE  | CV_SEQ_ELTYPE_POINT)\r
+#define CV_SEQ_POLYLINE        (CV_SEQ_KIND_CURVE  | CV_SEQ_ELTYPE_POINT)
 
-#define CV_SEQ_POLYGON         (CV_SEQ_FLAG_CLOSED | CV_SEQ_POLYLINE )\r
+#define CV_SEQ_POLYGON         (CV_SEQ_FLAG_CLOSED | CV_SEQ_POLYLINE )
 
-#define CV_SEQ_CONTOUR         CV_SEQ_POLYGON\r
+#define CV_SEQ_CONTOUR         CV_SEQ_POLYGON
 
-#define CV_SEQ_SIMPLE_POLYGON  (CV_SEQ_FLAG_SIMPLE | CV_SEQ_POLYGON  )\r
+#define CV_SEQ_SIMPLE_POLYGON  (CV_SEQ_FLAG_SIMPLE | CV_SEQ_POLYGON  )
 
-#define CV_SEQ_CHAIN           (CV_SEQ_KIND_CURVE  | CV_SEQ_ELTYPE_CODE)\r
+#define CV_SEQ_CHAIN           (CV_SEQ_KIND_CURVE  | CV_SEQ_ELTYPE_CODE)
 
-#define CV_SEQ_CHAIN_CONTOUR   (CV_SEQ_FLAG_CLOSED | CV_SEQ_CHAIN)\r
+#define CV_SEQ_CHAIN_CONTOUR   (CV_SEQ_FLAG_CLOSED | CV_SEQ_CHAIN)
 
-#define CV_SEQ_POLYGON_TREE    (CV_SEQ_KIND_BIN_TREE  | CV_SEQ_ELTYPE_TRIAN_ATR)\r
+#define CV_SEQ_POLYGON_TREE    (CV_SEQ_KIND_BIN_TREE  | CV_SEQ_ELTYPE_TRIAN_ATR)
 
-#define CV_SEQ_CONNECTED_COMP  (CV_SEQ_KIND_GENERIC  | CV_SEQ_ELTYPE_CONNECTED_COMP)\r
+#define CV_SEQ_CONNECTED_COMP  (CV_SEQ_KIND_GENERIC  | CV_SEQ_ELTYPE_CONNECTED_COMP)
 
-#define CV_SEQ_INDEX           (CV_SEQ_KIND_GENERIC  | CV_SEQ_ELTYPE_INDEX)\r
+#define CV_SEQ_INDEX           (CV_SEQ_KIND_GENERIC  | CV_SEQ_ELTYPE_INDEX)
 
-#define CV_STORAGE_READ          0\r
+#define CV_STORAGE_READ          0
 
-#define CV_STORAGE_WRITE         1\r
+#define CV_STORAGE_WRITE         1
 
-#define CV_STORAGE_WRITE_TEXT    CV_STORAGE_WRITE\r
+#define CV_STORAGE_WRITE_TEXT    CV_STORAGE_WRITE
 
-#define CV_STORAGE_WRITE_BINARY  CV_STORAGE_WRITE\r
+#define CV_STORAGE_WRITE_BINARY  CV_STORAGE_WRITE
 
-#define CV_STORAGE_APPEND        2\r
+#define CV_STORAGE_APPEND        2
 
-#define CV_NODE_NONE        0\r
+#define CV_NODE_NONE        0
 
-#define CV_NODE_INT         1\r
+#define CV_NODE_INT         1
 
-#define CV_NODE_INTEGER     CV_NODE_INT\r
+#define CV_NODE_INTEGER     CV_NODE_INT
 
-#define CV_NODE_REAL        2\r
+#define CV_NODE_REAL        2
 
-#define CV_NODE_FLOAT       CV_NODE_REAL\r
+#define CV_NODE_FLOAT       CV_NODE_REAL
 
-#define CV_NODE_STR         3\r
+#define CV_NODE_STR         3
 
-#define CV_NODE_STRING      CV_NODE_STR\r
+#define CV_NODE_STRING      CV_NODE_STR
 
 #define CV_NODE_REF         4 
 
-#define CV_NODE_SEQ         5\r
+#define CV_NODE_SEQ         5
 
-#define CV_NODE_MAP         6\r
+#define CV_NODE_MAP         6
 
-#define CV_NODE_TYPE_MASK   7\r
+#define CV_NODE_TYPE_MASK   7
 
 #define CV_NODE_FLOW        8 
 
-#define CV_NODE_USER        16\r
+#define CV_NODE_USER        16
 
-#define CV_NODE_EMPTY       32\r
+#define CV_NODE_EMPTY       32
 
-#define CV_NODE_NAMED       64\r
+#define CV_NODE_NAMED       64
 
-#define CV_NODE_SEQ_SIMPLE 256\r
+#define CV_NODE_SEQ_SIMPLE 256
 
 #define CV_StsOk                    0  
 
 
 #define CV_StsAssert                 -215 
 
-#define CV_BLUR_NO_SCALE 0\r
+#define CV_BLUR_NO_SCALE 0
 
-#define CV_BLUR  1\r
+#define CV_BLUR  1
 
-#define CV_GAUSSIAN  2\r
+#define CV_GAUSSIAN  2
 
-#define CV_MEDIAN 3\r
+#define CV_MEDIAN 3
 
-#define CV_BILATERAL 4\r
+#define CV_BILATERAL 4
 
-#define CV_INPAINT_NS      0\r
+#define CV_INPAINT_NS      0
 
-#define CV_INPAINT_TELEA   1\r
+#define CV_INPAINT_TELEA   1
 
-#define CV_SCHARR -1\r
+#define CV_SCHARR -1
 
-#define CV_MAX_SOBEL_KSIZE 7\r
+#define CV_MAX_SOBEL_KSIZE 7
 
-#define  CV_BGR2BGRA    0\r
+#define  CV_BGR2BGRA    0
 
-#define  CV_RGB2RGBA    CV_BGR2BGRA\r
+#define  CV_RGB2RGBA    CV_BGR2BGRA
 
-#define  CV_BGRA2BGR    1\r
+#define  CV_BGRA2BGR    1
 
-#define  CV_RGBA2RGB    CV_BGRA2BGR\r
+#define  CV_RGBA2RGB    CV_BGRA2BGR
 
-#define  CV_BGR2RGBA    2\r
+#define  CV_BGR2RGBA    2
 
-#define  CV_RGB2BGRA    CV_BGR2RGBA\r
+#define  CV_RGB2BGRA    CV_BGR2RGBA
 
-#define  CV_RGBA2BGR    3\r
+#define  CV_RGBA2BGR    3
 
-#define  CV_BGRA2RGB    CV_RGBA2BGR\r
+#define  CV_BGRA2RGB    CV_RGBA2BGR
 
-#define  CV_BGR2RGB     4\r
+#define  CV_BGR2RGB     4
 
-#define  CV_RGB2BGR     CV_BGR2RGB\r
+#define  CV_RGB2BGR     CV_BGR2RGB
 
-#define  CV_BGRA2RGBA   5\r
+#define  CV_BGRA2RGBA   5
 
-#define  CV_RGBA2BGRA   CV_BGRA2RGBA\r
+#define  CV_RGBA2BGRA   CV_BGRA2RGBA
 
-#define  CV_BGR2GRAY    6\r
+#define  CV_BGR2GRAY    6
 
-#define  CV_RGB2GRAY    7\r
+#define  CV_RGB2GRAY    7
 
-#define  CV_GRAY2BGR    8\r
+#define  CV_GRAY2BGR    8
 
-#define  CV_GRAY2RGB    CV_GRAY2BGR\r
+#define  CV_GRAY2RGB    CV_GRAY2BGR
 
-#define  CV_GRAY2BGRA   9\r
+#define  CV_GRAY2BGRA   9
 
-#define  CV_GRAY2RGBA   CV_GRAY2BGRA\r
+#define  CV_GRAY2RGBA   CV_GRAY2BGRA
 
-#define  CV_BGRA2GRAY   10\r
+#define  CV_BGRA2GRAY   10
 
-#define  CV_RGBA2GRAY   11\r
+#define  CV_RGBA2GRAY   11
 
-#define  CV_BGR2BGR565  12\r
+#define  CV_BGR2BGR565  12
 
-#define  CV_RGB2BGR565  13\r
+#define  CV_RGB2BGR565  13
 
-#define  CV_BGR5652BGR  14\r
+#define  CV_BGR5652BGR  14
 
-#define  CV_BGR5652RGB  15\r
+#define  CV_BGR5652RGB  15
 
-#define  CV_BGRA2BGR565 16\r
+#define  CV_BGRA2BGR565 16
 
-#define  CV_RGBA2BGR565 17\r
+#define  CV_RGBA2BGR565 17
 
-#define  CV_BGR5652BGRA 18\r
+#define  CV_BGR5652BGRA 18
 
-#define  CV_BGR5652RGBA 19\r
+#define  CV_BGR5652RGBA 19
 
-#define  CV_GRAY2BGR565 20\r
+#define  CV_GRAY2BGR565 20
 
-#define  CV_BGR5652GRAY 21\r
+#define  CV_BGR5652GRAY 21
 
-#define  CV_BGR2BGR555  22\r
+#define  CV_BGR2BGR555  22
 
-#define  CV_RGB2BGR555  23\r
+#define  CV_RGB2BGR555  23
 
-#define  CV_BGR5552BGR  24\r
+#define  CV_BGR5552BGR  24
 
-#define  CV_BGR5552RGB  25\r
+#define  CV_BGR5552RGB  25
 
-#define  CV_BGRA2BGR555 26\r
+#define  CV_BGRA2BGR555 26
 
-#define  CV_RGBA2BGR555 27\r
+#define  CV_RGBA2BGR555 27
 
-#define  CV_BGR5552BGRA 28\r
+#define  CV_BGR5552BGRA 28
 
-#define  CV_BGR5552RGBA 29\r
+#define  CV_BGR5552RGBA 29
 
-#define  CV_GRAY2BGR555 30\r
+#define  CV_GRAY2BGR555 30
 
-#define  CV_BGR5552GRAY 31\r
+#define  CV_BGR5552GRAY 31
 
-#define  CV_BGR2XYZ     32\r
+#define  CV_BGR2XYZ     32
 
-#define  CV_RGB2XYZ     33\r
+#define  CV_RGB2XYZ     33
 
-#define  CV_XYZ2BGR     34\r
+#define  CV_XYZ2BGR     34
 
-#define  CV_XYZ2RGB     35\r
+#define  CV_XYZ2RGB     35
 
-#define  CV_BGR2YCrCb   36\r
+#define  CV_BGR2YCrCb   36
 
-#define  CV_RGB2YCrCb   37\r
+#define  CV_RGB2YCrCb   37
 
-#define  CV_YCrCb2BGR   38\r
+#define  CV_YCrCb2BGR   38
 
-#define  CV_YCrCb2RGB   39\r
+#define  CV_YCrCb2RGB   39
 
-#define  CV_BGR2HSV     40\r
+#define  CV_BGR2HSV     40
 
-#define  CV_RGB2HSV     41\r
+#define  CV_RGB2HSV     41
 
-#define  CV_BGR2Lab     44\r
+#define  CV_BGR2Lab     44
 
-#define  CV_RGB2Lab     45\r
+#define  CV_RGB2Lab     45
 
-#define  CV_BayerBG2BGR 46\r
+#define  CV_BayerBG2BGR 46
 
-#define  CV_BayerGB2BGR 47\r
+#define  CV_BayerGB2BGR 47
 
-#define  CV_BayerRG2BGR 48\r
+#define  CV_BayerRG2BGR 48
 
-#define  CV_BayerGR2BGR 49\r
+#define  CV_BayerGR2BGR 49
 
-#define  CV_BayerBG2RGB CV_BayerRG2BGR\r
+#define  CV_BayerBG2RGB CV_BayerRG2BGR
 
-#define  CV_BayerGB2RGB CV_BayerGR2BGR\r
+#define  CV_BayerGB2RGB CV_BayerGR2BGR
 
-#define  CV_BayerRG2RGB CV_BayerBG2BGR\r
+#define  CV_BayerRG2RGB CV_BayerBG2BGR
 
-#define  CV_BayerGR2RGB CV_BayerGB2BGR\r
+#define  CV_BayerGR2RGB CV_BayerGB2BGR
 
-#define  CV_BGR2Luv     50\r
+#define  CV_BGR2Luv     50
 
-#define  CV_RGB2Luv     51\r
+#define  CV_RGB2Luv     51
 
-#define  CV_BGR2HLS     52\r
+#define  CV_BGR2HLS     52
 
-#define  CV_RGB2HLS     53\r
+#define  CV_RGB2HLS     53
 
-#define  CV_HSV2BGR     54\r
+#define  CV_HSV2BGR     54
 
-#define  CV_HSV2RGB     55\r
+#define  CV_HSV2RGB     55
 
-#define  CV_Lab2BGR     56\r
+#define  CV_Lab2BGR     56
 
-#define  CV_Lab2RGB     57\r
+#define  CV_Lab2RGB     57
 
-#define  CV_Luv2BGR     58\r
+#define  CV_Luv2BGR     58
 
-#define  CV_Luv2RGB     59\r
+#define  CV_Luv2RGB     59
 
-#define  CV_HLS2BGR     60\r
+#define  CV_HLS2BGR     60
 
-#define  CV_HLS2RGB     61\r
+#define  CV_HLS2RGB     61
 
-#define  CV_COLORCVT_MAX  100\r
+#define  CV_COLORCVT_MAX  100
 
-#define  CV_INTER_NN        0\r
+#define  CV_INTER_NN        0
 
-#define  CV_INTER_LINEAR    1\r
+#define  CV_INTER_LINEAR    1
 
-#define  CV_INTER_CUBIC     2\r
+#define  CV_INTER_CUBIC     2
 
-#define  CV_INTER_AREA      3\r
+#define  CV_INTER_AREA      3
 
-#define  CV_WARP_FILL_OUTLIERS 8\r
+#define  CV_WARP_FILL_OUTLIERS 8
 
-#define  CV_WARP_INVERSE_MAP  16\r
+#define  CV_WARP_INVERSE_MAP  16
 
-#define  CV_SHAPE_RECT      0\r
+#define  CV_SHAPE_RECT      0
 
-#define  CV_SHAPE_CROSS     1\r
+#define  CV_SHAPE_CROSS     1
 
-#define  CV_SHAPE_ELLIPSE   2\r
+#define  CV_SHAPE_ELLIPSE   2
 
-#define  CV_SHAPE_CUSTOM    100\r
+#define  CV_SHAPE_CUSTOM    100
 
-#define CV_MOP_OPEN         2\r
+#define CV_MOP_OPEN         2
 
-#define CV_MOP_CLOSE        3\r
+#define CV_MOP_CLOSE        3
 
-#define CV_MOP_GRADIENT     4\r
+#define CV_MOP_GRADIENT     4
 
-#define CV_MOP_TOPHAT       5\r
+#define CV_MOP_TOPHAT       5
 
-#define CV_MOP_BLACKHAT     6\r
+#define CV_MOP_BLACKHAT     6
 
-#define  CV_TM_SQDIFF        0\r
+#define  CV_TM_SQDIFF        0
 
-#define  CV_TM_SQDIFF_NORMED 1\r
+#define  CV_TM_SQDIFF_NORMED 1
 
-#define  CV_TM_CCORR         2\r
+#define  CV_TM_CCORR         2
 
-#define  CV_TM_CCORR_NORMED  3\r
+#define  CV_TM_CCORR_NORMED  3
 
-#define  CV_TM_CCOEFF        4\r
+#define  CV_TM_CCOEFF        4
 
-#define  CV_TM_CCOEFF_NORMED 5\r
+#define  CV_TM_CCOEFF_NORMED 5
 
-#define  CV_LKFLOW_PYR_A_READY       1\r
+#define  CV_LKFLOW_PYR_A_READY       1
 
-#define  CV_LKFLOW_PYR_B_READY       2\r
+#define  CV_LKFLOW_PYR_B_READY       2
 
-#define  CV_LKFLOW_INITIAL_GUESSES   4\r
+#define  CV_LKFLOW_INITIAL_GUESSES   4
 
-#define  CV_LKFLOW_GET_MIN_EIGENVALS 8\r
+#define  CV_LKFLOW_GET_MIN_EIGENVALS 8
 
-#define CV_POLY_APPROX_DP 0\r
+#define CV_POLY_APPROX_DP 0
 
-#define CV_DOMINANT_IPAN 1\r
+#define CV_DOMINANT_IPAN 1
 
-#define CV_CONTOURS_MATCH_I1  1\r
+#define CV_CONTOURS_MATCH_I1  1
 
-#define CV_CONTOURS_MATCH_I2  2\r
+#define CV_CONTOURS_MATCH_I2  2
 
-#define CV_CONTOURS_MATCH_I3  3\r
+#define CV_CONTOURS_MATCH_I3  3
 
-#define  CV_CONTOUR_TREES_MATCH_I1  1\r
+#define  CV_CONTOUR_TREES_MATCH_I1  1
 
-#define CV_CLOCKWISE         1\r
+#define CV_CLOCKWISE         1
 
-#define CV_COUNTER_CLOCKWISE 2\r
+#define CV_COUNTER_CLOCKWISE 2
 
-#define CV_COMP_CORREL        0\r
+#define CV_COMP_CORREL        0
 
-#define CV_COMP_CHISQR        1\r
+#define CV_COMP_CHISQR        1
 
-#define CV_COMP_INTERSECT     2\r
+#define CV_COMP_INTERSECT     2
 
-#define CV_COMP_BHATTACHARYYA 3\r
+#define CV_COMP_BHATTACHARYYA 3
 
-#define  CV_VALUE  1\r
+#define  CV_VALUE  1
 
-#define  CV_ARRAY  2\r
+#define  CV_ARRAY  2
 
-#define CV_DIST_MASK_3   3\r
+#define CV_DIST_MASK_3   3
 
-#define CV_DIST_MASK_5   5\r
+#define CV_DIST_MASK_5   5
 
-#define CV_DIST_MASK_PRECISE 0\r
+#define CV_DIST_MASK_PRECISE 0
 
 #define CV_THRESH_BINARY      0  
 
 
 #define CV_THRESH_TOZERO_INV  4  
 
-#define CV_THRESH_MASK        7\r
+#define CV_THRESH_MASK        7
 
 #define CV_THRESH_OTSU        8  
 
-#define CV_ADAPTIVE_THRESH_MEAN_C  0\r
+#define CV_ADAPTIVE_THRESH_MEAN_C  0
 
-#define CV_ADAPTIVE_THRESH_GAUSSIAN_C  1\r
+#define CV_ADAPTIVE_THRESH_GAUSSIAN_C  1
 
-#define CV_FLOODFILL_FIXED_RANGE (1 << 16)\r
+#define CV_FLOODFILL_FIXED_RANGE (1 << 16)
 
-#define CV_FLOODFILL_MASK_ONLY   (1 << 17)\r
+#define CV_FLOODFILL_MASK_ONLY   (1 << 17)
 
-#define CV_CANNY_L2_GRADIENT  (1 << 31)\r
+#define CV_CANNY_L2_GRADIENT  (1 << 31)
 
-#define CV_HOUGH_STANDARD 0\r
+#define CV_HOUGH_STANDARD 0
 
-#define CV_HOUGH_PROBABILISTIC 1\r
+#define CV_HOUGH_PROBABILISTIC 1
 
-#define CV_HOUGH_MULTI_SCALE 2\r
+#define CV_HOUGH_MULTI_SCALE 2
 
-#define CV_HOUGH_GRADIENT 3\r
+#define CV_HOUGH_GRADIENT 3
 
-#define CV_HAAR_DO_CANNY_PRUNING    1\r
+#define CV_HAAR_DO_CANNY_PRUNING    1
 
-#define CV_HAAR_SCALE_IMAGE         2\r
+#define CV_HAAR_SCALE_IMAGE         2
 
-#define CV_HAAR_FIND_BIGGEST_OBJECT 4\r
+#define CV_HAAR_FIND_BIGGEST_OBJECT 4
 
-#define CV_HAAR_DO_ROUGH_SEARCH     8\r
+#define CV_HAAR_DO_ROUGH_SEARCH     8
 
-#define CV_LMEDS 4\r
+#define CV_LMEDS 4
 
-#define CV_RANSAC 8\r
+#define CV_RANSAC 8
 
-#define CV_CALIB_CB_ADAPTIVE_THRESH  1\r
+#define CV_CALIB_CB_ADAPTIVE_THRESH  1
 
-#define CV_CALIB_CB_NORMALIZE_IMAGE  2\r
+#define CV_CALIB_CB_NORMALIZE_IMAGE  2
 
-#define CV_CALIB_CB_FILTER_QUADS     4\r
+#define CV_CALIB_CB_FILTER_QUADS     4
 
-#define CV_CALIB_USE_INTRINSIC_GUESS  1\r
+#define CV_CALIB_USE_INTRINSIC_GUESS  1
 
-#define CV_CALIB_FIX_ASPECT_RATIO     2\r
+#define CV_CALIB_FIX_ASPECT_RATIO     2
 
-#define CV_CALIB_FIX_PRINCIPAL_POINT  4\r
+#define CV_CALIB_FIX_PRINCIPAL_POINT  4
 
-#define CV_CALIB_ZERO_TANGENT_DIST    8\r
+#define CV_CALIB_ZERO_TANGENT_DIST    8
 
-#define CV_CALIB_FIX_FOCAL_LENGTH 16\r
+#define CV_CALIB_FIX_FOCAL_LENGTH 16
 
-#define CV_CALIB_FIX_K1  32\r
+#define CV_CALIB_FIX_K1  32
 
-#define CV_CALIB_FIX_K2  64\r
+#define CV_CALIB_FIX_K2  64
 
-#define CV_CALIB_FIX_K3  128\r
+#define CV_CALIB_FIX_K3  128
 
-#define CV_CALIB_FIX_INTRINSIC  256\r
+#define CV_CALIB_FIX_INTRINSIC  256
 
-#define CV_CALIB_SAME_FOCAL_LENGTH 512\r
+#define CV_CALIB_SAME_FOCAL_LENGTH 512
 
-#define CV_CALIB_ZERO_DISPARITY 1024\r
+#define CV_CALIB_ZERO_DISPARITY 1024
 
-#define CV_FM_7POINT 1\r
+#define CV_FM_7POINT 1
 
-#define CV_FM_8POINT 2\r
+#define CV_FM_8POINT 2
 
-#define CV_FM_LMEDS_ONLY  CV_LMEDS\r
+#define CV_FM_LMEDS_ONLY  CV_LMEDS
 
-#define CV_FM_RANSAC_ONLY CV_RANSAC\r
+#define CV_FM_RANSAC_ONLY CV_RANSAC
 
-#define CV_FM_LMEDS CV_LMEDS\r
+#define CV_FM_LMEDS CV_LMEDS
 
-#define CV_FM_RANSAC CV_RANSAC\r
+#define CV_FM_RANSAC CV_RANSAC
 
-#define CV_STEREO_BM_NORMALIZED_RESPONSE  0\r
+#define CV_STEREO_BM_NORMALIZED_RESPONSE  0
 
-#define CV_STEREO_BM_BASIC 0\r
+#define CV_STEREO_BM_BASIC 0
 
-#define CV_STEREO_BM_FISH_EYE 1\r
+#define CV_STEREO_BM_FISH_EYE 1
 
-#define CV_STEREO_BM_NARROW 2\r
+#define CV_STEREO_BM_NARROW 2
 
-#define CV_STEREO_GC_OCCLUDED  SHRT_MAX\r
+#define CV_STEREO_GC_OCCLUDED  SHRT_MAX
 
 #define CV_RETR_EXTERNAL 0
 
index 1904d2e79e574cf9db03f3ef70517bf1a9bc74f3..491162056550530c9c2bf68495ad90ef8bb5d10f 100644 (file)
@@ -6,7 +6,7 @@
 # 1 "../../../include/opencv/cxcore.h" 1
 # 70 "../../../include/opencv/cxcore.h"
 # 1 "../../../include/opencv/cxtypes.h" 1
-# 150 "../../../include/opencv/cxtypes.h"
+# 148 "../../../include/opencv/cxtypes.h"
 typedef long long int64;
 typedef unsigned long long uint64;
 
@@ -40,44 +40,33 @@ typedef union Cv64suf
     double f;
 }
 Cv64suf;
-# 215 "../../../include/opencv/cxtypes.h"
+# 213 "../../../include/opencv/cxtypes.h"
 inline int cvRound( double value )
 {
-# 235 "../../../include/opencv/cxtypes.h"
-    Cv64suf temp;
-    temp.f = value + 6755399441055744.0;
-    return (int)temp.u;
-
-}
+# 227 "../../../include/opencv/cxtypes.h"
+    return (int)lrint(value);
 
 
-inline int cvFloor( double value )
-{
-
 
 
+}
 
 
-    int temp = cvRound(value);
-    Cv32suf diff;
-    diff.f = (float)(value - temp);
-    return temp - (diff.i < 0);
+inline int cvFloor( double value )
+{
 
+    int i = (int)value;
+    return i - (i > value);
+# 250 "../../../include/opencv/cxtypes.h"
 }
 
 
 inline int cvCeil( double value )
 {
 
-
-
-
-
-    int temp = cvRound(value);
-    Cv32suf diff;
-    diff.f = (float)(temp - value);
-    return temp + (diff.i < 0);
-
+    int i = (int)value;
+    return i + (i < value);
+# 268 "../../../include/opencv/cxtypes.h"
 }
 
 
@@ -137,7 +126,7 @@ inline double cvRandReal( CvRNG* rng )
 {
     return cvRandInt(rng)*2.3283064365386962890625e-10 ;
 }
-# 370 "../../../include/opencv/cxtypes.h"
+# 369 "../../../include/opencv/cxtypes.h"
 typedef struct _IplImage
 {
     int nSize;
@@ -253,7 +242,7 @@ inline CvMat cvMat( int rows, int cols, int type, void* data = NULL)
     m.type = 0x42420000 | (1 << 14) | type;
     m.cols = cols;
     m.rows = rows;
-    m.step = rows > 1 ? m.cols*(((((type) & ((64 - 1) << 3)) >> 3) + 1) << ((((sizeof(size_t)/4+1)*16384|0x3a50) >> ((type) & ((1 << 3) - 1))*2) & 3)) : 0;
+    m.step = m.cols*(((((type) & ((64 - 1) << 3)) >> 3) + 1) << ((((sizeof(size_t)/4+1)*16384|0x3a50) >> ((type) & ((1 << 3) - 1))*2) & 3));
     m.data.ptr = (uchar*)data;
     m.refcount = NULL;
     m.hdr_refcount = 0;
@@ -269,11 +258,11 @@ inline double cvmGet( const CvMat* mat, int row, int col )
     assert( (unsigned)row < (unsigned)mat->rows &&
             (unsigned)col < (unsigned)mat->cols );
 
-    if( type == ((5) + (((1)-1) << 3)) )
+    if( type == (((5) & ((1 << 3) - 1)) + (((1)-1) << 3)) )
         return ((float*)(mat->data.ptr + (size_t)mat->step*row))[col];
     else
     {
-        assert( type == ((6) + (((1)-1) << 3)) );
+        assert( type == (((6) & ((1 << 3) - 1)) + (((1)-1) << 3)) );
         return ((double*)(mat->data.ptr + (size_t)mat->step*row))[col];
     }
 }
@@ -286,17 +275,17 @@ inline void cvmSet( CvMat* mat, int row, int col, double value )
     assert( (unsigned)row < (unsigned)mat->rows &&
             (unsigned)col < (unsigned)mat->cols );
 
-    if( type == ((5) + (((1)-1) << 3)) )
+    if( type == (((5) & ((1 << 3) - 1)) + (((1)-1) << 3)) )
         ((float*)(mat->data.ptr + (size_t)mat->step*row))[col] = (float)value;
     else
     {
-        assert( type == ((6) + (((1)-1) << 3)) );
+        assert( type == (((6) & ((1 << 3) - 1)) + (((1)-1) << 3)) );
         ((double*)(mat->data.ptr + (size_t)mat->step*row))[col] = (double)value;
     }
 }
 
 
-inline int cvCvToIplDepth( int type )
+inline int cvIplDepth( int type )
 {
     int depth = ((type) & ((1 << 3) - 1));
     return ((((sizeof(size_t)<<28)|0x8442211) >> ((depth) & ((1 << 3) - 1))*4) & 15)*8 | (depth == 1 || depth == 3 ||
@@ -1700,11 +1689,11 @@ extern "C" void cvSetSeqBlockSize( CvSeq* seq, int delta_elems );
 
 
 
-extern "C" schar* cvSeqPush( CvSeq* seq, void* element = NULL);
+extern "C" schar* cvSeqPush( CvSeq* seq, const void* element = NULL);
 
 
 
-extern "C" schar* cvSeqPushFront( CvSeq* seq, void* element = NULL);
+extern "C" schar* cvSeqPushFront( CvSeq* seq, const void* element = NULL);
 
 
 
@@ -1718,17 +1707,17 @@ extern "C" void cvSeqPopFront( CvSeq* seq, void* element = NULL);
 
 
 
-extern "C" void cvSeqPushMulti( CvSeq* seq, void* elements,
+extern "C" void cvSeqPushMulti( CvSeq* seq, const void* elements,
                              int count, int in_front = 0 );
 
 
-extern "C" void cvSeqPopMulti( CvSeq* seq, void* elements,
+extern "C" void cvSeqPopMulti( CvSeq* seq, const void* elements,
                             int count, int in_front = 0 );
 
 
 
 extern "C" schar* cvSeqInsert( CvSeq* seq, int before_index,
-                            void* element = NULL);
+                            const void* element = NULL);
 
 
 extern "C" void cvSeqRemove( CvSeq* seq, int index );
@@ -3817,12 +3806,12 @@ struct CvLSHOperations;
 
 extern "C" struct CvLSH* cvCreateLSH(struct CvLSHOperations* ops, int d,
                                  int L = 10, int k = 10,
-                                 int type = ((6) + (((1)-1) << 3)), double r = 4,
+                                 int type = (((6) & ((1 << 3) - 1)) + (((1)-1) << 3)), double r = 4,
                                  int64 seed = -1);
 
 
 extern "C" struct CvLSH* cvCreateMemoryLSH(int d, int n, int L = 10, int k = 10,
-                                       int type = ((6) + (((1)-1) << 3)), double r = 4,
+                                       int type = (((6) & ((1 << 3) - 1)) + (((1)-1) << 3)), double r = 4,
                                        int64 seed = -1);
 
 
@@ -3906,7 +3895,7 @@ typedef struct CvMSERParams
 }
 CvMSERParams;
 
-CvMSERParams cvMSERParams( int delta = 5, int min_area = 60,
+extern "C" CvMSERParams cvMSERParams( int delta = 5, int min_area = 60,
                            int max_area = 14400, float max_variation = .25f,
                            float min_diversity = .2f, int max_evolution = 200,
                            double area_threshold = 1.01,
@@ -3914,7 +3903,7 @@ CvMSERParams cvMSERParams( int delta = 5, int min_area = 60,
                            int edge_blur_size = 5 );
 
 
-void cvExtractMSER( CvArr* _img, CvArr* _mask, CvSeq** contours, CvMemStorage* storage, CvMSERParams params );
+extern "C" void cvExtractMSER( CvArr* _img, CvArr* _mask, CvSeq** contours, CvMemStorage* storage, CvMSERParams params );
 
 
 typedef struct CvStarKeypoint
@@ -3992,8 +3981,8 @@ extern "C" void cvSetImagesForHaarClassifierCascade( CvHaarClassifierCascade* ca
                                                 const CvArr* tilted_sum, double scale );
 
 
-extern "C" int cvRunHaarClassifierCascade( CvHaarClassifierCascade* cascade,
-                                      CvPoint pt, int start_stage = 0);
+extern "C" int cvRunHaarClassifierCascade( const CvHaarClassifierCascade* cascade,
+                                       CvPoint pt, int start_stage = 0);
 
 
 
@@ -4084,7 +4073,8 @@ extern "C" void cvFindExtrinsicCameraParams2( const CvMat* object_points,
                                           const CvMat* camera_matrix,
                                           const CvMat* distortion_coeffs,
                                           CvMat* rotation_vector,
-                                          CvMat* translation_vector );
+                                          CvMat* translation_vector,
+                                          int use_extrinsic_guess = 0 );
 
 
 
@@ -4109,7 +4099,7 @@ extern "C" int cvFindChessboardCorners( const void* image, CvSize pattern_size,
 extern "C" void cvDrawChessboardCorners( CvArr* image, CvSize pattern_size,
                                      CvPoint2D32f* corners,
                                      int count, int pattern_was_found );
-# 1402 "../../../include/opencv/cv.h"
+# 1403 "../../../include/opencv/cv.h"
 extern "C" void cvCalibrateCamera2( const CvMat* object_points,
                                 const CvMat* image_points,
                                 const CvMat* point_counts,
@@ -4186,7 +4176,7 @@ extern "C" int cvRANSACUpdateNumIters( double p, double err_prob,
                                    int model_points, int max_iters );
 
 extern "C" void cvConvertPointsHomogeneous( const CvMat* src, CvMat* dst );
-# 1486 "../../../include/opencv/cv.h"
+# 1487 "../../../include/opencv/cv.h"
 extern "C" int cvFindFundamentalMat( const CvMat* points1, const CvMat* points2,
                                  CvMat* fundamental_matrix,
                                  int method = 8,
index 51dad2970435dc0c98cf69bc9c084487b66be785..690e58a790319d928ad41613e7b695853b7c13fc 100644 (file)
@@ -43,7 +43,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -84,15 +88,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -109,10 +112,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -122,6 +127,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -131,6 +137,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -172,7 +180,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -203,6 +211,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
index 73c3b4060732fa027c510f4b609f0d1af3b4efa1..553ccc0ac042ab9a9852e1ede6ddc313409cfa1c 100644 (file)
@@ -28,6 +28,7 @@ void cvInvSqrt(double value);
 void cvSqrt(double value);
 int CV_IS_IMAGE_HDR(CvArr * img);
 int CV_IS_IMAGE(CvArr * img);
+int CV_MAT_DEPTH(int flags);
 int CV_MAKETYPE(int depth,int cn);
 int CV_8UC(int n);
 int CV_8SC(int n);
@@ -37,7 +38,6 @@ int CV_32SC(int n);
 int CV_32FC(int n);
 int CV_64FC(int n);
 int CV_MAT_CN(int flags);
-int CV_MAT_DEPTH(int flags);
 int CV_MAT_TYPE(int flags);
 int CV_IS_MAT_CONT(int flags);
 int CV_IS_TEMP_MAT(int flags);
index a0f5c8906203e0b7fb1275f5b4ab283a940b4c53..7ff3655e962dff97c168da6ddda78fd6a3aab28c 100644 (file)
@@ -108,14 +108,14 @@ opencv-1.1.0.tar.gz: $(PKG_OCT_FILES) $(PKG_OTHER_FILES)
 
 # seems that mkoctfile has some troubles compiling the wrapper... it takes forever
 # workaround is to use the g++ directly
-MY_MKOCTFILE=$(CXX) -O0 -g -shared $(OCTAVE_INCFLAGS)
+#MY_MKOCTFILE=$(CXX) -O0 -g -shared $(OCTAVE_INCFLAGS)
 
 cv.oct: cv_wrap.cpp cvshadow.cpp octerror.cpp octhelpers.cpp
-       $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/.libs -lcv $^
+       $(MKOCTFILE) -o $@ $(AM_CPPFLAGS) $(OCTAVE_INCFLAGS) -L$(top_builddir)/src/.libs -lcv -lcxcore $^
 ml.oct: ml_wrap.cpp octhelpers.cpp
-       $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/.libs -lml $^
+       $(MKOCTFILE) -o $@ $(AM_CPPFLAGS) $(OCTAVE_INCFLAGS) -L$(top_builddir)/src/.libs -lml -lcxcore $^
 highgui.oct: highgui_wrap.cpp octhelpers.cpp
-       $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/.libs -lhighgui $^
+       $(MKOCTFILE) -o $@ $(AM_CPPFLAGS) $(OCTAVE_INCFLAGS) -L$(top_builddir)/src/.libs -lhighgui -lcxcore $^
 
 endif
 
index 5d0dc0a3217a91d124265cdc4385b0a3e3601525..50514493d597e37759adaa5dc225a1cddde60b56 100644 (file)
@@ -41,7 +41,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -91,15 +95,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -116,10 +119,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -129,6 +134,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -138,6 +144,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -179,7 +187,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -210,6 +218,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -282,10 +291,6 @@ EXTRA_DIST = \
 @BUILD_OCTAVE_WRAPPERS_TRUE@PKG_OTHER_FILES = $(srcdir)/COPYING $(srcdir)/DESCRIPTION $(srcdir)/INDEX $(srcdir)/PKG_ADD_template
 @BUILD_OCTAVE_WRAPPERS_TRUE@octavedir = $(pkgdatadir)/octave
 @BUILD_OCTAVE_WRAPPERS_TRUE@nodist_octave_DATA = opencv-1.1.0.tar.gz
-
-# seems that mkoctfile has some troubles compiling the wrapper... it takes forever
-# workaround is to use the g++ directly
-@BUILD_OCTAVE_WRAPPERS_TRUE@MY_MKOCTFILE = $(CXX) -O0 -g -shared $(OCTAVE_INCFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -522,12 +527,16 @@ uninstall-am: uninstall-nodist_octaveDATA
 @BUILD_OCTAVE_WRAPPERS_TRUE@   tar cpzvf $@ $(PKG_NAME)
 @BUILD_OCTAVE_WRAPPERS_TRUE@   rm -rf $(PKG_NAME)
 
+# seems that mkoctfile has some troubles compiling the wrapper... it takes forever
+# workaround is to use the g++ directly
+#MY_MKOCTFILE=$(CXX) -O0 -g -shared $(OCTAVE_INCFLAGS)
+
 @BUILD_OCTAVE_WRAPPERS_TRUE@cv.oct: cv_wrap.cpp cvshadow.cpp octerror.cpp octhelpers.cpp
-@BUILD_OCTAVE_WRAPPERS_TRUE@   $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/.libs -lcv $^
+@BUILD_OCTAVE_WRAPPERS_TRUE@   $(MKOCTFILE) -o $@ $(AM_CPPFLAGS) $(OCTAVE_INCFLAGS) -L$(top_builddir)/src/.libs -lcv -lcxcore $^
 @BUILD_OCTAVE_WRAPPERS_TRUE@ml.oct: ml_wrap.cpp octhelpers.cpp
-@BUILD_OCTAVE_WRAPPERS_TRUE@   $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/.libs -lml $^
+@BUILD_OCTAVE_WRAPPERS_TRUE@   $(MKOCTFILE) -o $@ $(AM_CPPFLAGS) $(OCTAVE_INCFLAGS) -L$(top_builddir)/src/.libs -lml -lcxcore $^
 @BUILD_OCTAVE_WRAPPERS_TRUE@highgui.oct: highgui_wrap.cpp octhelpers.cpp
-@BUILD_OCTAVE_WRAPPERS_TRUE@   $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/.libs -lhighgui $^
+@BUILD_OCTAVE_WRAPPERS_TRUE@   $(MKOCTFILE) -o $@ $(AM_CPPFLAGS) $(OCTAVE_INCFLAGS) -L$(top_builddir)/src/.libs -lhighgui -lcxcore $^
 
 clean-local:
        rm -rf opencv-1.1.0.tar.gz *.oct
index a1b96b3718fad9351e1acb7a22fe2840fe1f7238..c68c459419ee1b40878feb1991a22f488899b98e 100644 (file)
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.36
+ * Version 1.3.39
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -8,22 +8,27 @@
  * interface file instead. 
  * ----------------------------------------------------------------------------- */
 
+#define SWIGOCTAVE
 #define SWIG_name_d      "cv"
 #define SWIG_name        cv
 
+
 #ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
-    T *tt;
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
-    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
 
 template <typename T> T SwigValueInit() {
@@ -145,11 +150,12 @@ template <typename T> T SwigValueInit() {
 #include <octave/parse.h>
 #include <octave/ov-fcn-handle.h>
 #include <octave/Cell.h>
+#include <octave/oct-map.h>
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
  * type checking.
  * ----------------------------------------------------------------------------- */
 
@@ -168,11 +174,11 @@ template <typename T> T SwigValueInit() {
 
 /*
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the swig runtime code.
-  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  creating a static or dynamic library from the SWIG runtime code.
+  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
   
-  But only do this if is strictly necessary, ie, if you have problems
-  with your compiler or so.
+  But only do this if strictly necessary, ie, if you have problems
+  with your compiler or suchlike.
 */
 
 #ifndef SWIGRUNTIME
@@ -199,14 +205,14 @@ template <typename T> T SwigValueInit() {
 /* 
    Flags/methods for returning states.
    
-   The swig conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
    Use the following macros/flags to set or process the returning
    states.
    
-   In old swig versions, you usually write code as:
+   In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
        // success code
@@ -214,7 +220,7 @@ template <typename T> T SwigValueInit() {
        //fail code
      }
 
-   Now you can be more explicit as:
+   Now you can be more explicit:
 
     int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
     if (SWIG_IsOK(res)) {
@@ -223,7 +229,7 @@ template <typename T> T SwigValueInit() {
       // fail code
     }
 
-   that seems to be the same, but now you can also do
+   which is the same really, but now you can also do
 
     Type *ptr;
     int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -241,7 +247,7 @@ template <typename T> T SwigValueInit() {
     
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
-   requires also to SWIG_ConvertPtr to return new result values, as
+   also requires SWIG_ConvertPtr to return new result values, such as
 
       int SWIG_ConvertPtr(obj, ptr,...) {         
         if (<obj is ok>) {                            
@@ -259,7 +265,7 @@ template <typename T> T SwigValueInit() {
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
    more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   swig errors code.
+   SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
    allows to return the 'cast rank', for example, if you have this
@@ -273,9 +279,8 @@ template <typename T> T SwigValueInit() {
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
+*/
 
-
- */
 #define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
@@ -300,7 +305,6 @@ template <typename T> T SwigValueInit() {
 #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
 #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
 
-
 /* Cast-Rank Mode */
 #if defined(SWIG_CASTRANK_MODE)
 #  ifndef SWIG_TypeRank
@@ -323,8 +327,6 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
-
-
 #include <string.h>
 
 #ifdef __cplusplus
@@ -421,40 +423,58 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
 }
 
 
-/* think of this as a c++ template<> or a scheme macro */
-#define SWIG_TypeCheck_Template(comparison, ty)         \
-  if (ty) {                                             \
-    swig_cast_info *iter = ty->cast;                    \
-    while (iter) {                                      \
-      if (comparison) {                                 \
-        if (iter == ty->cast) return iter;              \
-        /* Move iter to the top of the linked list */   \
-        iter->prev->next = iter->next;                  \
-        if (iter->next)                                 \
-          iter->next->prev = iter->prev;                \
-        iter->next = ty->cast;                          \
-        iter->prev = 0;                                 \
-        if (ty->cast) ty->cast->prev = iter;            \
-        ty->cast = iter;                                \
-        return iter;                                    \
-      }                                                 \
-      iter = iter->next;                                \
-    }                                                   \
-  }                                                     \
-  return 0
-
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (strcmp(iter->type->name, c) == 0) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
-/* Same as previous function, except strcmp is replaced with a pointer comparison */
+/* 
+  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
-  SWIG_TypeCheck_Template(iter->type == from, into);
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (iter->type == from) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
 /*
@@ -1324,7 +1344,7 @@ namespace Swig {
       // index operator
       else {
        if (ops[skip] == '(' || ops[skip] == '{') {
-         const char *op_name = ops[skip] == '(' ? "__paren" : "__brace";
+         const char *op_name = ops[skip] == '(' ? "__paren__" : "__brace__";
          octave_value_list args;
          args.append(*idx_it++);
          ++skip;
@@ -1363,7 +1383,7 @@ namespace Swig {
       }
 
       else if (ops[skip] == '(' || ops[skip] == '{') {
-       const char *op_name = ops[skip] == '(' ? "__paren_asgn" : "__brace_asgn";
+       const char *op_name = ops[skip] == '(' ? "__paren_asgn__" : "__brace_asgn__";
        member_value_pair *m = find_member(op_name, false);
        if (m) {
          octave_value_list args;
@@ -1401,40 +1421,27 @@ namespace Swig {
 
     virtual bool is_string() const {
       octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      return !!nc_this->find_member("__str", false);
+      return !!nc_this->find_member("__str__", false);
     }
 
     virtual std::string string_value(bool force = false) const {
       octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member("__str", false);
+      member_value_pair *m = nc_this->find_member("__str__", false);
       if (!m) {
-       error("__str method not defined");
+       error("__str__ method not defined");
        return std::string();
       }
       octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
       if (outarg.length() < 1 || !outarg(0).is_string()) {
-       error("__str method did not return a string");
+       error("__str__ method did not return a string");
        return std::string();
       }
       return outarg(0).string_value();
     }
 
-    /*
     virtual Octave_map map_value() const {
-      octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member("__str", false);
-      if (!m) {
-       error("__map method not defined");
-       return std::string();
-      }
-      octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
-      if (outarg.length() < 1 || !outarg(0).is_map()) {
-       error("__map method did not return a string");
-       return std::string();
-      }
-      return outarg(0).map_value();
+      return Octave_map();
     }
-    */
 
     virtual string_vector map_keys() const {
       member_map tmp;
@@ -1448,6 +1455,35 @@ namespace Swig {
       return keys;
     }
 
+    virtual bool save_ascii (std::ostream& os) {
+      return true;
+    }
+
+    virtual bool load_ascii (std::istream& is) {
+      return true;
+    }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
+      return true;
+    }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt) {
+      return true;
+    }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
+      return true;
+    }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
+      return true;
+    }
+#endif
+
     virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const {
       return string_value();
     }
@@ -1472,7 +1508,7 @@ namespace Swig {
       assert(ost);
 
       octave_value ret;
-      if (ost->dispatch_unary_op(std::string("__") + op_name, ret))
+      if (ost->dispatch_unary_op(std::string("__") + op_name + std::string("__"), ret))
        return ret;
       std::string symbol = "op_" + ost->swig_type_name() + "_" + op_name;
       octave_value_list args;
@@ -1489,7 +1525,7 @@ namespace Swig {
       octave_swig_type *rhs_ost = Swig::swig_value_deref(rhs);
 
       octave_value ret;
-      if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name, rhs, ret))
+      if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name + std::string("__"), rhs, ret))
        return ret;
 
       std::string symbol;
@@ -1611,9 +1647,35 @@ namespace Swig {
     virtual std::string string_value(bool force = false) const 
       { return ptr->string_value(force); }
 
+    virtual Octave_map map_value() const
+      { return ptr->map_value(); }
+
     virtual string_vector map_keys() const
       { return ptr->map_keys(); }
 
+    virtual bool save_ascii (std::ostream& os)
+      { return ptr->save_ascii(os); }
+
+    virtual bool load_ascii (std::istream& is)
+      { return ptr->load_ascii(is); }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats)
+      { return ptr->save_binary(os, save_as_floats); }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt)
+      { return ptr->load_binary(is, swap, fmt); }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
+      { return ptr->save_hdf5(loc_id, name, save_as_floats); }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug)
+      { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); }
+#endif
+
     virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const
       { return ptr->convert_to_str(pad, force, type); }
 
@@ -1662,6 +1724,37 @@ namespace Swig {
     void print(std::ostream &os, bool pr_as_read_syntax = false) const {
       os << "swig packed type: name = " << (type ? type->name : std::string()) << ", len = " << buf.size() << std::endl;
     }
+
+
+    virtual bool save_ascii (std::ostream& os) {
+      return true;
+    }
+
+    virtual bool load_ascii (std::istream& is) {
+      return true;
+    }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
+      return true;
+    }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt) {
+      return true;
+    }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
+      return true;
+    }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
+      return true;
+    }
+#endif
+
   private:
     DECLARE_OCTAVE_ALLOCATOR;
     DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
@@ -2035,211 +2128,205 @@ SWIGRUNTIME void SWIG_Octave_SetModule(void *clientdata, swig_module_info *point
 #define SWIGTYPE_p_Cv64suf swig_types[1]
 #define SWIGTYPE_p_CvAttrList swig_types[2]
 #define SWIGTYPE_p_CvAvgComp swig_types[3]
-#define SWIGTYPE_p_CvBaseImageFilter swig_types[4]
-#define SWIGTYPE_p_CvBox2D swig_types[5]
-#define SWIGTYPE_p_CvBoxFilter swig_types[6]
-#define SWIGTYPE_p_CvChain swig_types[7]
-#define SWIGTYPE_p_CvChainPtReader swig_types[8]
-#define SWIGTYPE_p_CvConDensation swig_types[9]
-#define SWIGTYPE_p_CvConnectedComp swig_types[10]
-#define SWIGTYPE_p_CvContour swig_types[11]
-#define SWIGTYPE_p_CvContourTree swig_types[12]
-#define SWIGTYPE_p_CvConvexityDefect swig_types[13]
-#define SWIGTYPE_p_CvFeatureTree swig_types[14]
-#define SWIGTYPE_p_CvFileNode swig_types[15]
-#define SWIGTYPE_p_CvFileNode_data swig_types[16]
-#define SWIGTYPE_p_CvFileStorage swig_types[17]
-#define SWIGTYPE_p_CvFilter swig_types[18]
-#define SWIGTYPE_p_CvFont swig_types[19]
-#define SWIGTYPE_p_CvGenericHash swig_types[20]
-#define SWIGTYPE_p_CvGraph swig_types[21]
-#define SWIGTYPE_p_CvGraphEdge swig_types[22]
-#define SWIGTYPE_p_CvGraphScanner swig_types[23]
-#define SWIGTYPE_p_CvGraphVtx swig_types[24]
-#define SWIGTYPE_p_CvGraphVtx2D swig_types[25]
-#define SWIGTYPE_p_CvHaarClassifier swig_types[26]
-#define SWIGTYPE_p_CvHaarClassifierCascade swig_types[27]
-#define SWIGTYPE_p_CvHaarFeature swig_types[28]
-#define SWIGTYPE_p_CvHaarFeature_rect swig_types[29]
-#define SWIGTYPE_p_CvHaarStageClassifier swig_types[30]
-#define SWIGTYPE_p_CvHidHaarClassifierCascade swig_types[31]
-#define SWIGTYPE_p_CvHistogram swig_types[32]
-#define SWIGTYPE_p_CvHuMoments swig_types[33]
-#define SWIGTYPE_p_CvImage swig_types[34]
-#define SWIGTYPE_p_CvKalman swig_types[35]
-#define SWIGTYPE_p_CvLaplaceFilter swig_types[36]
-#define SWIGTYPE_p_CvLevMarq swig_types[37]
-#define SWIGTYPE_p_CvLineIterator swig_types[38]
-#define SWIGTYPE_p_CvLinearFilter swig_types[39]
-#define SWIGTYPE_p_CvMat swig_types[40]
-#define SWIGTYPE_p_CvMatND swig_types[41]
-#define SWIGTYPE_p_CvMatND_data swig_types[42]
-#define SWIGTYPE_p_CvMatND_dim swig_types[43]
-#define SWIGTYPE_p_CvMat_data swig_types[44]
-#define SWIGTYPE_p_CvMatrix swig_types[45]
-#define SWIGTYPE_p_CvMatrix3 swig_types[46]
-#define SWIGTYPE_p_CvMemBlock swig_types[47]
-#define SWIGTYPE_p_CvMemStorage swig_types[48]
-#define SWIGTYPE_p_CvMemStoragePos swig_types[49]
-#define SWIGTYPE_p_CvModule swig_types[50]
-#define SWIGTYPE_p_CvModuleInfo swig_types[51]
-#define SWIGTYPE_p_CvMoments swig_types[52]
-#define SWIGTYPE_p_CvMorphology swig_types[53]
-#define SWIGTYPE_p_CvNArrayIterator swig_types[54]
-#define SWIGTYPE_p_CvNextEdgeType swig_types[55]
-#define SWIGTYPE_p_CvPOSITObject swig_types[56]
-#define SWIGTYPE_p_CvPluginFuncInfo swig_types[57]
-#define SWIGTYPE_p_CvPoint swig_types[58]
-#define SWIGTYPE_p_CvPoint2D32f swig_types[59]
-#define SWIGTYPE_p_CvPoint2D64f swig_types[60]
-#define SWIGTYPE_p_CvPoint3D32f swig_types[61]
-#define SWIGTYPE_p_CvPoint3D64f swig_types[62]
-#define SWIGTYPE_p_CvQuadEdge2D swig_types[63]
-#define SWIGTYPE_p_CvRNG_Wrapper swig_types[64]
-#define SWIGTYPE_p_CvRandState swig_types[65]
-#define SWIGTYPE_p_CvRect swig_types[66]
-#define SWIGTYPE_p_CvSURFParams swig_types[67]
-#define SWIGTYPE_p_CvSURFPoint swig_types[68]
-#define SWIGTYPE_p_CvScalar swig_types[69]
-#define SWIGTYPE_p_CvSepFilter swig_types[70]
-#define SWIGTYPE_p_CvSeq swig_types[71]
-#define SWIGTYPE_p_CvSeqBlock swig_types[72]
-#define SWIGTYPE_p_CvSeqReader swig_types[73]
-#define SWIGTYPE_p_CvSeqWriter swig_types[74]
-#define SWIGTYPE_p_CvSet swig_types[75]
-#define SWIGTYPE_p_CvSetElem swig_types[76]
-#define SWIGTYPE_p_CvSize swig_types[77]
-#define SWIGTYPE_p_CvSize2D32f swig_types[78]
-#define SWIGTYPE_p_CvSlice swig_types[79]
-#define SWIGTYPE_p_CvSparseMat swig_types[80]
-#define SWIGTYPE_p_CvSparseMatIterator swig_types[81]
-#define SWIGTYPE_p_CvSparseNode swig_types[82]
-#define SWIGTYPE_p_CvStarDetectorParams swig_types[83]
-#define SWIGTYPE_p_CvStarKeypoint swig_types[84]
-#define SWIGTYPE_p_CvStereoBMState swig_types[85]
-#define SWIGTYPE_p_CvStereoGCState swig_types[86]
-#define SWIGTYPE_p_CvString swig_types[87]
-#define SWIGTYPE_p_CvStringHashNode swig_types[88]
-#define SWIGTYPE_p_CvSubdiv2D swig_types[89]
-#define SWIGTYPE_p_CvSubdiv2DEdge_Wrapper swig_types[90]
-#define SWIGTYPE_p_CvSubdiv2DPoint swig_types[91]
-#define SWIGTYPE_p_CvSubdiv2DPointLocation swig_types[92]
-#define SWIGTYPE_p_CvTermCriteria swig_types[93]
-#define SWIGTYPE_p_CvTreeNodeIterator swig_types[94]
-#define SWIGTYPE_p_CvTupleT_CvPoint_2_t swig_types[95]
-#define SWIGTYPE_p_CvTupleT_float_2_t swig_types[96]
-#define SWIGTYPE_p_CvTupleT_float_3_t swig_types[97]
-#define SWIGTYPE_p_CvType swig_types[98]
-#define SWIGTYPE_p_CvTypeInfo swig_types[99]
-#define SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t swig_types[100]
-#define SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t swig_types[101]
-#define SWIGTYPE_p_CvTypedSeqT_CvPoint_t swig_types[102]
-#define SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[103]
-#define SWIGTYPE_p_CvTypedSeqT_CvRect_t swig_types[104]
-#define SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t swig_types[105]
-#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[106]
-#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[107]
-#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[108]
-#define SWIGTYPE_p__CvContourScanner swig_types[109]
-#define SWIGTYPE_p__IplConvKernel swig_types[110]
-#define SWIGTYPE_p__IplConvKernelFP swig_types[111]
-#define SWIGTYPE_p__IplImage swig_types[112]
-#define SWIGTYPE_p__IplROI swig_types[113]
-#define SWIGTYPE_p__IplTileInfo swig_types[114]
-#define SWIGTYPE_p_a_2__float swig_types[115]
-#define SWIGTYPE_p_a_2__signed_char swig_types[116]
-#define SWIGTYPE_p_a_3__float swig_types[117]
-#define SWIGTYPE_p_allocator_type swig_types[118]
-#define SWIGTYPE_p_char swig_types[119]
-#define SWIGTYPE_p_difference_type swig_types[120]
-#define SWIGTYPE_p_double swig_types[121]
-#define SWIGTYPE_p_f_int_int_int_int_int__p__IplROI swig_types[122]
-#define SWIGTYPE_p_f_int_int_int_p_char_p_char_int_int_int_int_int_p_IplROI_p_IplImage_p_void_p_IplTileInfo__p__IplImage swig_types[123]
-#define SWIGTYPE_p_f_int_p_q_const__char_p_q_const__char_p_q_const__char_int_p_void__int swig_types[124]
-#define SWIGTYPE_p_f_p_CvFileStorage_p_CvFileNode__p_void swig_types[125]
-#define SWIGTYPE_p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void swig_types[126]
-#define SWIGTYPE_p_f_p__IplImage_int__void swig_types[127]
-#define SWIGTYPE_p_f_p__IplImage_int_int__void swig_types[128]
-#define SWIGTYPE_p_f_p_p_unsigned_char_p_unsigned_char_int_int_p_void__void swig_types[129]
-#define SWIGTYPE_p_f_p_p_void__void swig_types[130]
-#define SWIGTYPE_p_f_p_q_const__IplImage__p__IplImage swig_types[131]
-#define SWIGTYPE_p_f_p_q_const__char_int__p_CvMat swig_types[132]
-#define SWIGTYPE_p_f_p_q_const__char_int__p__IplImage swig_types[133]
-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__void__int swig_types[134]
-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__void__void swig_types[135]
-#define SWIGTYPE_p_f_p_q_const__float_p_q_const__float_p_void__float swig_types[136]
-#define SWIGTYPE_p_f_p_q_const__unsigned_char_p_unsigned_char_p_void__void swig_types[137]
-#define SWIGTYPE_p_f_p_q_const__void__int swig_types[138]
-#define SWIGTYPE_p_f_p_q_const__void__p_void swig_types[139]
-#define SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__int swig_types[140]
-#define SWIGTYPE_p_f_p_void_p_void__int swig_types[141]
-#define SWIGTYPE_p_f_size_t_p_void__p_void swig_types[142]
-#define SWIGTYPE_p_float swig_types[143]
-#define SWIGTYPE_p_int swig_types[144]
-#define SWIGTYPE_p_long_long swig_types[145]
-#define SWIGTYPE_p_p_CvConDensation swig_types[146]
-#define SWIGTYPE_p_p_CvFileStorage swig_types[147]
-#define SWIGTYPE_p_p_CvGraphEdge swig_types[148]
-#define SWIGTYPE_p_p_CvGraphScanner swig_types[149]
-#define SWIGTYPE_p_p_CvGraphVtx swig_types[150]
-#define SWIGTYPE_p_p_CvHaarClassifierCascade swig_types[151]
-#define SWIGTYPE_p_p_CvHistogram swig_types[152]
-#define SWIGTYPE_p_p_CvKalman swig_types[153]
-#define SWIGTYPE_p_p_CvMat swig_types[154]
-#define SWIGTYPE_p_p_CvMatND swig_types[155]
-#define SWIGTYPE_p_p_CvMemStorage swig_types[156]
-#define SWIGTYPE_p_p_CvPOSITObject swig_types[157]
-#define SWIGTYPE_p_p_CvPoint swig_types[158]
-#define SWIGTYPE_p_p_CvSeq swig_types[159]
-#define SWIGTYPE_p_p_CvSeqBlock swig_types[160]
-#define SWIGTYPE_p_p_CvSetElem swig_types[161]
-#define SWIGTYPE_p_p_CvSparseMat swig_types[162]
-#define SWIGTYPE_p_p_CvStereoBMState swig_types[163]
-#define SWIGTYPE_p_p_CvStereoGCState swig_types[164]
-#define SWIGTYPE_p_p_CvSubdiv2DPoint swig_types[165]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvConnectedComp_t swig_types[166]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvPoint2D32f_t swig_types[167]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvPoint_t swig_types[168]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[169]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvRect_t swig_types[170]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvSeq_p_t swig_types[171]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[172]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[173]
-#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[174]
-#define SWIGTYPE_p_p__CvContourScanner swig_types[175]
-#define SWIGTYPE_p_p__IplConvKernel swig_types[176]
-#define SWIGTYPE_p_p__IplImage swig_types[177]
-#define SWIGTYPE_p_p_char swig_types[178]
-#define SWIGTYPE_p_p_double swig_types[179]
-#define SWIGTYPE_p_p_float swig_types[180]
-#define SWIGTYPE_p_p_p_CvMat swig_types[181]
-#define SWIGTYPE_p_p_unsigned_char swig_types[182]
-#define SWIGTYPE_p_p_void swig_types[183]
-#define SWIGTYPE_p_short swig_types[184]
-#define SWIGTYPE_p_signed_char swig_types[185]
-#define SWIGTYPE_p_size_t swig_types[186]
-#define SWIGTYPE_p_size_type swig_types[187]
-#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t swig_types[188]
-#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type swig_types[189]
-#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type swig_types[190]
-#define SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t swig_types[191]
-#define SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type swig_types[192]
-#define SWIGTYPE_p_swig__OctSwigIterator swig_types[193]
-#define SWIGTYPE_p_unsigned_char swig_types[194]
-#define SWIGTYPE_p_unsigned_int swig_types[195]
-#define SWIGTYPE_p_unsigned_long_long swig_types[196]
-#define SWIGTYPE_p_unsigned_short swig_types[197]
-#define SWIGTYPE_p_value_type swig_types[198]
-#define SWIGTYPE_p_void swig_types[199]
-static swig_type_info *swig_types[201];
-static swig_module_info swig_module = {swig_types, 200, 0, 0, 0, 0};
+#define SWIGTYPE_p_CvBox2D swig_types[4]
+#define SWIGTYPE_p_CvChain swig_types[5]
+#define SWIGTYPE_p_CvChainPtReader swig_types[6]
+#define SWIGTYPE_p_CvConDensation swig_types[7]
+#define SWIGTYPE_p_CvConnectedComp swig_types[8]
+#define SWIGTYPE_p_CvContour swig_types[9]
+#define SWIGTYPE_p_CvContourTree swig_types[10]
+#define SWIGTYPE_p_CvConvexityDefect swig_types[11]
+#define SWIGTYPE_p_CvFeatureTree swig_types[12]
+#define SWIGTYPE_p_CvFileNode swig_types[13]
+#define SWIGTYPE_p_CvFileNode_data swig_types[14]
+#define SWIGTYPE_p_CvFileStorage swig_types[15]
+#define SWIGTYPE_p_CvFilter swig_types[16]
+#define SWIGTYPE_p_CvFont swig_types[17]
+#define SWIGTYPE_p_CvGenericHash swig_types[18]
+#define SWIGTYPE_p_CvGraph swig_types[19]
+#define SWIGTYPE_p_CvGraphEdge swig_types[20]
+#define SWIGTYPE_p_CvGraphScanner swig_types[21]
+#define SWIGTYPE_p_CvGraphVtx swig_types[22]
+#define SWIGTYPE_p_CvGraphVtx2D swig_types[23]
+#define SWIGTYPE_p_CvHaarClassifier swig_types[24]
+#define SWIGTYPE_p_CvHaarClassifierCascade swig_types[25]
+#define SWIGTYPE_p_CvHaarFeature swig_types[26]
+#define SWIGTYPE_p_CvHaarFeature_rect swig_types[27]
+#define SWIGTYPE_p_CvHaarStageClassifier swig_types[28]
+#define SWIGTYPE_p_CvHidHaarClassifierCascade swig_types[29]
+#define SWIGTYPE_p_CvHistogram swig_types[30]
+#define SWIGTYPE_p_CvHuMoments swig_types[31]
+#define SWIGTYPE_p_CvImage swig_types[32]
+#define SWIGTYPE_p_CvKalman swig_types[33]
+#define SWIGTYPE_p_CvLSH swig_types[34]
+#define SWIGTYPE_p_CvLSHOperations swig_types[35]
+#define SWIGTYPE_p_CvLineIterator swig_types[36]
+#define SWIGTYPE_p_CvMSERParams swig_types[37]
+#define SWIGTYPE_p_CvMat swig_types[38]
+#define SWIGTYPE_p_CvMatND swig_types[39]
+#define SWIGTYPE_p_CvMatND_data swig_types[40]
+#define SWIGTYPE_p_CvMatND_dim swig_types[41]
+#define SWIGTYPE_p_CvMat_data swig_types[42]
+#define SWIGTYPE_p_CvMatrix swig_types[43]
+#define SWIGTYPE_p_CvMatrix3 swig_types[44]
+#define SWIGTYPE_p_CvMemBlock swig_types[45]
+#define SWIGTYPE_p_CvMemStorage swig_types[46]
+#define SWIGTYPE_p_CvMemStoragePos swig_types[47]
+#define SWIGTYPE_p_CvModule swig_types[48]
+#define SWIGTYPE_p_CvModuleInfo swig_types[49]
+#define SWIGTYPE_p_CvMoments swig_types[50]
+#define SWIGTYPE_p_CvNArrayIterator swig_types[51]
+#define SWIGTYPE_p_CvNextEdgeType swig_types[52]
+#define SWIGTYPE_p_CvPOSITObject swig_types[53]
+#define SWIGTYPE_p_CvPluginFuncInfo swig_types[54]
+#define SWIGTYPE_p_CvPoint swig_types[55]
+#define SWIGTYPE_p_CvPoint2D32f swig_types[56]
+#define SWIGTYPE_p_CvPoint2D64f swig_types[57]
+#define SWIGTYPE_p_CvPoint3D32f swig_types[58]
+#define SWIGTYPE_p_CvPoint3D64f swig_types[59]
+#define SWIGTYPE_p_CvQuadEdge2D swig_types[60]
+#define SWIGTYPE_p_CvRNG_Wrapper swig_types[61]
+#define SWIGTYPE_p_CvRandState swig_types[62]
+#define SWIGTYPE_p_CvRect swig_types[63]
+#define SWIGTYPE_p_CvSURFParams swig_types[64]
+#define SWIGTYPE_p_CvSURFPoint swig_types[65]
+#define SWIGTYPE_p_CvScalar swig_types[66]
+#define SWIGTYPE_p_CvSeq swig_types[67]
+#define SWIGTYPE_p_CvSeqBlock swig_types[68]
+#define SWIGTYPE_p_CvSeqReader swig_types[69]
+#define SWIGTYPE_p_CvSeqWriter swig_types[70]
+#define SWIGTYPE_p_CvSet swig_types[71]
+#define SWIGTYPE_p_CvSetElem swig_types[72]
+#define SWIGTYPE_p_CvSize swig_types[73]
+#define SWIGTYPE_p_CvSize2D32f swig_types[74]
+#define SWIGTYPE_p_CvSlice swig_types[75]
+#define SWIGTYPE_p_CvSparseMat swig_types[76]
+#define SWIGTYPE_p_CvSparseMatIterator swig_types[77]
+#define SWIGTYPE_p_CvSparseNode swig_types[78]
+#define SWIGTYPE_p_CvStarDetectorParams swig_types[79]
+#define SWIGTYPE_p_CvStarKeypoint swig_types[80]
+#define SWIGTYPE_p_CvStereoBMState swig_types[81]
+#define SWIGTYPE_p_CvStereoGCState swig_types[82]
+#define SWIGTYPE_p_CvString swig_types[83]
+#define SWIGTYPE_p_CvStringHashNode swig_types[84]
+#define SWIGTYPE_p_CvSubdiv2D swig_types[85]
+#define SWIGTYPE_p_CvSubdiv2DEdge_Wrapper swig_types[86]
+#define SWIGTYPE_p_CvSubdiv2DPoint swig_types[87]
+#define SWIGTYPE_p_CvSubdiv2DPointLocation swig_types[88]
+#define SWIGTYPE_p_CvTermCriteria swig_types[89]
+#define SWIGTYPE_p_CvTreeNodeIterator swig_types[90]
+#define SWIGTYPE_p_CvTupleT_CvPoint_2_t swig_types[91]
+#define SWIGTYPE_p_CvTupleT_float_2_t swig_types[92]
+#define SWIGTYPE_p_CvTupleT_float_3_t swig_types[93]
+#define SWIGTYPE_p_CvType swig_types[94]
+#define SWIGTYPE_p_CvTypeInfo swig_types[95]
+#define SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t swig_types[96]
+#define SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t swig_types[97]
+#define SWIGTYPE_p_CvTypedSeqT_CvPoint_t swig_types[98]
+#define SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[99]
+#define SWIGTYPE_p_CvTypedSeqT_CvRect_t swig_types[100]
+#define SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t swig_types[101]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[102]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[103]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[104]
+#define SWIGTYPE_p__CvContourScanner swig_types[105]
+#define SWIGTYPE_p__IplConvKernel swig_types[106]
+#define SWIGTYPE_p__IplConvKernelFP swig_types[107]
+#define SWIGTYPE_p__IplImage swig_types[108]
+#define SWIGTYPE_p__IplROI swig_types[109]
+#define SWIGTYPE_p__IplTileInfo swig_types[110]
+#define SWIGTYPE_p_a_2__float swig_types[111]
+#define SWIGTYPE_p_a_2__signed_char swig_types[112]
+#define SWIGTYPE_p_a_3__float swig_types[113]
+#define SWIGTYPE_p_allocator_type swig_types[114]
+#define SWIGTYPE_p_char swig_types[115]
+#define SWIGTYPE_p_difference_type swig_types[116]
+#define SWIGTYPE_p_double swig_types[117]
+#define SWIGTYPE_p_f_int_int_int_int_int__p__IplROI swig_types[118]
+#define SWIGTYPE_p_f_int_int_int_p_char_p_char_int_int_int_int_int_p_IplROI_p_IplImage_p_void_p_IplTileInfo__p__IplImage swig_types[119]
+#define SWIGTYPE_p_f_int_p_q_const__char_p_q_const__char_p_q_const__char_int_p_void__int swig_types[120]
+#define SWIGTYPE_p_f_p_CvFileStorage_p_CvFileNode__p_void swig_types[121]
+#define SWIGTYPE_p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void swig_types[122]
+#define SWIGTYPE_p_f_p__IplImage_int__void swig_types[123]
+#define SWIGTYPE_p_f_p__IplImage_int_int__void swig_types[124]
+#define SWIGTYPE_p_f_p_p_void__void swig_types[125]
+#define SWIGTYPE_p_f_p_q_const__IplImage__p__IplImage swig_types[126]
+#define SWIGTYPE_p_f_p_q_const__char_int__p_CvMat swig_types[127]
+#define SWIGTYPE_p_f_p_q_const__char_int__p__IplImage swig_types[128]
+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__void__void swig_types[129]
+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__void_p_q_const__int__int swig_types[130]
+#define SWIGTYPE_p_f_p_q_const__float_p_q_const__float_p_void__float swig_types[131]
+#define SWIGTYPE_p_f_p_q_const__void__int swig_types[132]
+#define SWIGTYPE_p_f_p_q_const__void__p_void swig_types[133]
+#define SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__int swig_types[134]
+#define SWIGTYPE_p_f_p_void_p_void__int swig_types[135]
+#define SWIGTYPE_p_f_size_t_p_void__p_void swig_types[136]
+#define SWIGTYPE_p_float swig_types[137]
+#define SWIGTYPE_p_int swig_types[138]
+#define SWIGTYPE_p_long_long swig_types[139]
+#define SWIGTYPE_p_p_CvConDensation swig_types[140]
+#define SWIGTYPE_p_p_CvFileStorage swig_types[141]
+#define SWIGTYPE_p_p_CvGraphEdge swig_types[142]
+#define SWIGTYPE_p_p_CvGraphScanner swig_types[143]
+#define SWIGTYPE_p_p_CvGraphVtx swig_types[144]
+#define SWIGTYPE_p_p_CvHaarClassifierCascade swig_types[145]
+#define SWIGTYPE_p_p_CvHistogram swig_types[146]
+#define SWIGTYPE_p_p_CvKalman swig_types[147]
+#define SWIGTYPE_p_p_CvLSH swig_types[148]
+#define SWIGTYPE_p_p_CvMat swig_types[149]
+#define SWIGTYPE_p_p_CvMatND swig_types[150]
+#define SWIGTYPE_p_p_CvMemStorage swig_types[151]
+#define SWIGTYPE_p_p_CvPOSITObject swig_types[152]
+#define SWIGTYPE_p_p_CvPoint swig_types[153]
+#define SWIGTYPE_p_p_CvSeq swig_types[154]
+#define SWIGTYPE_p_p_CvSeqBlock swig_types[155]
+#define SWIGTYPE_p_p_CvSetElem swig_types[156]
+#define SWIGTYPE_p_p_CvSparseMat swig_types[157]
+#define SWIGTYPE_p_p_CvStereoBMState swig_types[158]
+#define SWIGTYPE_p_p_CvStereoGCState swig_types[159]
+#define SWIGTYPE_p_p_CvSubdiv2DPoint swig_types[160]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvConnectedComp_t swig_types[161]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvPoint2D32f_t swig_types[162]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvPoint_t swig_types[163]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[164]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvRect_t swig_types[165]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvSeq_p_t swig_types[166]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[167]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[168]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[169]
+#define SWIGTYPE_p_p__CvContourScanner swig_types[170]
+#define SWIGTYPE_p_p__IplConvKernel swig_types[171]
+#define SWIGTYPE_p_p__IplImage swig_types[172]
+#define SWIGTYPE_p_p_char swig_types[173]
+#define SWIGTYPE_p_p_float swig_types[174]
+#define SWIGTYPE_p_p_p_CvMat swig_types[175]
+#define SWIGTYPE_p_p_unsigned_char swig_types[176]
+#define SWIGTYPE_p_p_void swig_types[177]
+#define SWIGTYPE_p_short swig_types[178]
+#define SWIGTYPE_p_signed_char swig_types[179]
+#define SWIGTYPE_p_size_t swig_types[180]
+#define SWIGTYPE_p_size_type swig_types[181]
+#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t swig_types[182]
+#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type swig_types[183]
+#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type swig_types[184]
+#define SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t swig_types[185]
+#define SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type swig_types[186]
+#define SWIGTYPE_p_swig__OctSwigIterator swig_types[187]
+#define SWIGTYPE_p_unsigned_char swig_types[188]
+#define SWIGTYPE_p_unsigned_int swig_types[189]
+#define SWIGTYPE_p_unsigned_long_long swig_types[190]
+#define SWIGTYPE_p_unsigned_short swig_types[191]
+#define SWIGTYPE_p_value_type swig_types[192]
+#define SWIGTYPE_p_void swig_types[193]
+static swig_type_info *swig_types[195];
+static swig_module_info swig_module = {swig_types, 194, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 /* -------- TYPES TABLE (END) -------- */
 
 
-#define SWIGVERSION 0x010336 
+#define SWIGVERSION 0x010339 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2913,7 +3000,7 @@ namespace swig {
   struct traits_asptr {   
     static int asptr(const octave_value& obj, Type **val) {
       Type *p;
-      int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0;
+      int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
       if (SWIG_IsOK(res)) {
        if (val) *val = p;
       }
@@ -3402,7 +3489,7 @@ namespace swig
     
     operator T () const
     {
-      //      swig::PyObject_var item = OctSequence_GetItem(_seq, _index);
+      //      swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, _index);
       octave_value item; // * todo
       try {
        return swig::as<T>(item, true);
@@ -3608,7 +3695,7 @@ namespace swig
     {
       int s = size();
       for (int i = 0; i < s; ++i) {
-       //      swig::PyObject_var item = OctSequence_GetItem(_seq, i);
+       //      swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, i);
        octave_value item; // * todo
        if (!swig::check<value_type>(item)) {
          if (set_err) {
@@ -3808,10 +3895,10 @@ SWIGINTERN std::vector< float >::value_type std_vector_Sl_float_Sg__pop(std::vec
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< float >::value_type std_vector_Sl_float_Sg____paren(std::vector< float > *self,std::vector< float >::difference_type i){
+SWIGINTERN std::vector< float >::value_type std_vector_Sl_float_Sg____paren__(std::vector< float > *self,std::vector< float >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_float_Sg____paren_asgn(std::vector< float > *self,std::vector< float >::difference_type i,std::vector< float >::value_type x){
+SWIGINTERN void std_vector_Sl_float_Sg____paren_asgn__(std::vector< float > *self,std::vector< float >::difference_type i,std::vector< float >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
 SWIGINTERN void std_vector_Sl_float_Sg__append(std::vector< float > *self,std::vector< float >::value_type x){
@@ -3855,10 +3942,10 @@ SWIGINTERN std::vector< CvPoint >::value_type std_vector_Sl_CvPoint_Sg__pop(std:
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< CvPoint >::value_type std_vector_Sl_CvPoint_Sg____paren(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i){
+SWIGINTERN std::vector< CvPoint >::value_type std_vector_Sl_CvPoint_Sg____paren__(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_CvPoint_Sg____paren_asgn(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i,std::vector< CvPoint >::value_type x){
+SWIGINTERN void std_vector_Sl_CvPoint_Sg____paren_asgn__(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i,std::vector< CvPoint >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
 SWIGINTERN void std_vector_Sl_CvPoint_Sg__append(std::vector< CvPoint > *self,std::vector< CvPoint >::value_type x){
@@ -3919,6 +4006,16 @@ CvMat * cvCreateImageMat( CvSize size, int depth, int channels ){
 }
 #define cvCloneImageMat( mat ) cvCloneMat( mat )
 
+#ifdef WIN32
+
+CvModuleInfo *CvModule::first=0;
+CvModuleInfo *CvModule::last=0;
+CvTypeInfo *CvType::first=0;
+CvTypeInfo *CvType::last=0;
+
+#endif
+
+
 
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor(void)
@@ -4281,7 +4378,7 @@ SWIGINTERN octave_value IplImage___paren(IplImage *self,octave_value object){
        *s = cvGet2D( self, subrect.y, subrect.x );
        return SWIG_NewPointerObj( s, SWIGTYPE_p_CvScalar, 1 );
       }
-      switch(CV_MAT_DEPTH(type)){
+      switch(((type) & ((1 << 3) - 1))){
       case 0:
        return OctLong_FromUnsignedLong( CV_IMAGE_ELEM(self, uchar, subrect.y, subrect.x ) );
       case 1:
@@ -4693,7 +4790,7 @@ else{}
        *s = cvGet2D( self, subrect.y, subrect.x );
        return SWIG_NewPointerObj( s, SWIGTYPE_p_CvScalar, 1 );
       }
-      switch(CV_MAT_DEPTH(type)){
+      switch(((type) & ((1 << 3) - 1))){
       case 0:
        return OctLong_FromUnsignedLong( CV_MAT_ELEM(*self, uchar, subrect.y, subrect.x ) );
       case 1:
@@ -4929,38 +5026,72 @@ typedef struct {
 
 
 SWIGINTERN void delete_CvHaarClassifierCascade(CvHaarClassifierCascade *self){ CvHaarClassifierCascade * dummy = self; cvReleaseHaarClassifierCascade  (& dummy); }
+SWIGINTERN void delete_CvLSH(CvLSH *self){ CvLSH          * dummy = self; cvReleaseLSH                (& dummy); }
 
 int CvMat_cols_get(CvMat * m){
        return m->cols;
 }
+void CvMat_cols_set(CvMat * m, int cols){
+    m->cols = cols;
+}
 int CvMat_rows_get(CvMat *m){
        return m->rows;
 }
+void CvMat_rows_set(CvMat *m, int rows){
+    m->rows = rows;
+}
 int CvMat_width_get(CvMat * m){
        return m->cols;
 }
+void CvMat_width_set(CvMat * m, int width){
+    m->cols = width;
+}
 int CvMat_height_get(CvMat *m){
        return m->rows;
 }
+void CvMat_height_set(CvMat * m, int height){
+    m->rows = height;
+}
 int CvMat_depth_get(CvMat * m){
-       return cvCvToIplDepth(m->type);
+       return cvIplDepth(m->type);
+}
+void CvMat_depth_set(CvMat *m, int depth){
+    cvError(CV_StsNotImplemented, "CvMat_depth_set", "Not Implemented", __FILE__, __LINE__);
 }
 int CvMat_nChannels_get(CvMat * m){
        return CV_MAT_CN(m->type);
 }
+void CvMat_nChannels_set(CvMat *m, int nChannels){
+    int depth = CV_MAT_DEPTH(m->type);
+    m->type = CV_MAKETYPE(depth, nChannels);
+}
 int CvMat_origin_get(CvMat * m){
-       return 0;
+    /* Always 0 - top-left origin */
+    return 0;
+}
+void CvMat_origin_set(CvMat * m, int origin){
+    cvError(CV_StsNotImplemented, "CvMat_origin_get", "IplImage is replaced by CvMat in Python, so its fields are read-only", __FILE__, __LINE__);
 }
 int CvMat_dataOrder_get(CvMat * m){
-       return 0;
+    cvError(CV_StsNotImplemented, "CvMat_dataOrder_get", "Not Implemented", __FILE__, __LINE__);
+    return 0;
+}
+void CvMat_dataOrder_set(CvMat * m, int dataOrder){
+    cvError(CV_StsNotImplemented, "CvMat_dataOrder_get", "IplImage is replaced by CvMat in Python, so its fields are read-only", __FILE__, __LINE__);
 }
 int CvMat_imageSize_get(CvMat * m){
        int step = m->step ? m->step : CV_ELEM_SIZE(m->type) * m->cols;
        return step*m->rows;
 }
+void CvMat_imageSize_set(CvMat * m, int imageSize){
+    cvError(CV_StsNotImplemented, "CvMat_imageSize_set", "IplImage is not implemented in Python, so origin is read-only", __FILE__, __LINE__);
+}
 int CvMat_widthStep_get(CvMat * m){
        return m->step;
 }
+void CvMat_widthStep_set(CvMat *m, int widthStep){
+    m->step = widthStep;
+}
 
 
 
@@ -5096,10 +5227,6 @@ const char* _wrap_cvBoundingRect_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvBoundingRect (@var{points}, @var{update} = 0)\n\
 @var{points} is of type CvArr. @var{update} is of type int. @var{retval} is of type CvRect. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_get_kernel_size_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_kernel_size (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. @var{retval} is of type CvSize. \n\
-@end deftypefn";
 const char* _wrap_CV_MAT_ELEM_PTR_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_MAT_ELEM_PTR (@var{mat}, @var{row}, @var{col})\n\
 @var{mat} is of type CvMat. @var{row} is of type int. @var{col} is of type int. @var{retval} is of type void. \n\
@@ -5120,14 +5247,6 @@ const char* _wrap_cvReleaseImageHeader_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvReleaseImageHeader (@var{image})\n\
 @var{image} is of type . \n\
 @end deftypefn";
-const char* _wrap_CvLinearFilter_get_kernel_sparse_count_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_kernel_sparse_count (@var{self})\n\
-@var{self} is of type CvLinearFilter. @var{retval} is of type int. \n\
-@end deftypefn";
-const char* _wrap_CvMorphology_get_element_sparse_count_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_element_sparse_count (@var{self})\n\
-@var{self} is of type CvMorphology. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_cvClearND_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvClearND (@var{arr}, @var{idx})\n\
 @var{arr} is of type CvArr. @var{idx} is of type int. \n\
@@ -5184,10 +5303,6 @@ const char* _wrap_cvSeqPopFront_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvSeqPopFront (@var{seq}, @var{element} = nil)\n\
 @var{seq} is of type CvSeq. @var{element} is of type void. \n\
 @end deftypefn";
-const char* _wrap_CvLaplaceFilter_is_basic_laplacian_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = is_basic_laplacian (@var{self})\n\
-@var{self} is of type CvLaplaceFilter. @var{retval} is of type bool. \n\
-@end deftypefn";
 const char* _wrap_cvReshapeMatND_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvReshapeMatND (@var{arr}, @var{sizeof_header}, @var{header}, @var{new_cn}, @var{new_dims}, @var{new_sizes})\n\
 @var{arr} is of type CvArr. @var{sizeof_header} is of type int. @var{header} is of type CvArr. @var{new_cn} is of type int. @var{new_dims} is of type int. @var{new_sizes} is of type int. @var{retval} is of type CvArr. \n\
@@ -5220,10 +5335,6 @@ const char* _wrap_cvFindCornerSubPix_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvFindCornerSubPix (@var{image}, @var{corners}, @var{win}, @var{zero_zone}, @var{criteria})\n\
 @var{image} is of type CvArr. @var{corners} is of type CvPoint2D32f. @var{win} is of type CvSize. @var{zero_zone} is of type CvSize. @var{criteria} is of type CvTermCriteria. \n\
 @end deftypefn";
-const char* _wrap_CvMat___div_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator / (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_cvSeqPushFront_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvSeqPushFront (@var{seq}, @var{element} = nil)\n\
 @var{seq} is of type CvSeq. @var{element} is of type void. @var{retval} is of type schar. \n\
@@ -5280,9 +5391,9 @@ const char* _wrap_CvImage_step_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = step (@var{self})\n\
 @var{self} is of type CvImage. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvBoxFilter_get_scale_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_scale (@var{self})\n\
-@var{self} is of type CvBoxFilter. @var{retval} is of type double. \n\
+const char* _wrap_LSHSize_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = LSHSize (@var{lsh})\n\
+@var{lsh} is of type CvLSH. @var{retval} is of type unsigned int. \n\
 @end deftypefn";
 const char* _wrap_CV_IS_SEQ_INDEX_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_SEQ_INDEX (@var{seq})\n\
@@ -5325,8 +5436,8 @@ const char* _wrap_CvMat___ror___texinfo = "-*- texinfo -*-\n\
 @var{self} is of type CvMat. @var{arg} is of type double. @var{retval} is of type CvMat. \n\
 @end deftypefn";
 const char* _wrap_cvFindFeatures_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} cvFindFeatures (@var{tr}, @var{desc}, @var{results}, @var{dist}, @var{k} = 2, @var{emax} = 20)\n\
-@var{tr} is of type CvFeatureTree. @var{desc} is of type CvMat. @var{results} is of type CvMat. @var{dist} is of type CvMat. @var{k} is of type int. @var{emax} is of type int. \n\
+@deftypefn {Loadable Function} cvFindFeatures (@var{tr}, @var{query_points}, @var{indices}, @var{dist}, @var{k}, @var{emax} = 20)\n\
+@var{tr} is of type CvFeatureTree. @var{query_points} is of type CvMat. @var{indices} is of type CvMat. @var{dist} is of type CvMat. @var{k} is of type int. @var{emax} is of type int. \n\
 @end deftypefn";
 const char* _wrap_CvSeq_CvPoint2D32f_cast_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvTypedSeq<(CvPoint2D32f)>::cast (@var{seq})\n\
@@ -5444,18 +5555,30 @@ const char* _wrap_cvSobel_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvSobel (@var{src}, @var{dst}, @var{xorder}, @var{yorder}, @var{aperture_size} = 3)\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{xorder} is of type int. @var{yorder} is of type int. @var{aperture_size} is of type int. \n\
 @end deftypefn";
+const char* _wrap_IplImage___eq___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_CvSubdiv2DEdge_Wrapper___eq___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{x})\n\
+@var{self} is of type CvSubdiv2DEdge_Wrapper. @var{x} is of type CvSubdiv2DEdge_Wrapper. @var{retval} is of type bool. \n\
+@end deftypefn";
+const char* _wrap_CvRNG_Wrapper___eq___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{x})\n\
+@var{self} is of type CvRNG_Wrapper. @var{x} is of type CvRNG_Wrapper. @var{retval} is of type bool. \n\
+@end deftypefn";
+const char* _wrap_OctSwigIterator___eq___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{x})\n\
+@var{self} is of type OctSwigIterator. @var{x} is of type OctSwigIterator. @var{retval} is of type bool. \n\
+@end deftypefn";
+const char* _wrap_CvMat___eq___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvFloor_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvFloor (@var{value})\n\
 @var{value} is of type double. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvLevMarq_updateAlt_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = updateAlt (@var{self}, @var{param}, @var{JtJ}, @var{JtErr}, @var{errNorm})\n\
-@var{self} is of type CvLevMarq. @var{param} is of type CvMat. @var{JtJ} is of type CvMat. @var{JtErr} is of type CvMat. @var{errNorm} is of type double. @var{retval} is of type bool. \n\
-@end deftypefn";
-const char* _wrap_OctSwigIterator___decr_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator -- (@var{self})\n\
-@var{self} is of type OctSwigIterator. @var{retval} is of type OctSwigIterator. \n\
-@end deftypefn";
 const char* _wrap_cvMat_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvMat (@var{rows}, @var{cols}, @var{type})\n\
 @var{rows} is of type int. @var{cols} is of type int. @var{type} is of type int. @var{retval} is of type CvMat. \n\
@@ -5472,10 +5595,6 @@ const char* _wrap_FloatVector_begin_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = begin (@var{self})\n\
 @var{self} is of type FloatVector. @var{retval} is of type const_iterator. \n\
 @end deftypefn";
-const char* _wrap_CvMat___mul_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator * (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_cvMax_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvMax (@var{src1}, @var{src2}, @var{dst})\n\
 @var{src1} is of type CvArr. @var{src2} is of type CvArr. @var{dst} is of type CvArr. \n\
@@ -5500,10 +5619,6 @@ const char* _wrap_CvMat___rdiv___texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = __rdiv__ (@var{self}, @var{arg})\n\
 @var{self} is of type CvMat. @var{arg} is of type double. @var{retval} is of type CvArr. \n\
 @end deftypefn";
-const char* _wrap_IplImage___div_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator / (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_CvSeq_CvPoint2D32f_pop_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = pop (@var{self})\n\
 @var{self} is of type CvSeq_CvPoint2D32f. @var{retval} is of type CvPoint2D32f. \n\
@@ -5528,26 +5643,6 @@ const char* _wrap_delete_CvConvexityDefect_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvConvexityDefect::~CvConvexityDefect (@var{self})\n\
 @var{self} is of type CvConvexityDefect. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_init_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init (@var{self}, @var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_is_separable}, @var{_ksize})\n\
-@var{self} is of type CvBaseImageFilter. @var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_is_separable} is of type bool. @var{_ksize} is of type CvSize. \n\
-@end deftypefn";
-const char* _wrap_CvSepFilter_init_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init (@var{self}, @var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_is_separable}, @var{_ksize})\n\
-@var{self} is of type CvSepFilter. @var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_is_separable} is of type bool. @var{_ksize} is of type CvSize. \n\
-@end deftypefn";
-const char* _wrap_CvLinearFilter_init_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init (@var{self}, @var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_is_separable}, @var{_ksize})\n\
-@var{self} is of type CvLinearFilter. @var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_is_separable} is of type bool. @var{_ksize} is of type CvSize. \n\
-@end deftypefn";
-const char* _wrap_CvBoxFilter_init_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init (@var{self}, @var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_normalized}, @var{_ksize})\n\
-@var{self} is of type CvBoxFilter. @var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_normalized} is of type bool. @var{_ksize} is of type CvSize. \n\
-@end deftypefn";
-const char* _wrap_CvLaplaceFilter_init_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init (@var{self}, @var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_kx}, @var{_ky})\n\
-@var{self} is of type CvLaplaceFilter. @var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_kx} is of type CvMat. @var{_ky} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_OctSwigIterator_advance_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = advance (@var{self}, @var{n})\n\
 @var{self} is of type OctSwigIterator. @var{n} is of type ptrdiff_t. @var{retval} is of type OctSwigIterator. \n\
@@ -5565,13 +5660,25 @@ const char* _wrap_cvCheckArr_texinfo = "-*- texinfo -*-\n\
 @var{arr} is of type CvArr. @var{flags} is of type int. @var{min_val} is of type double. @var{max_val} is of type double. @var{retval} is of type int. \n\
 @end deftypefn";
 const char* _wrap_cvFindExtrinsicCameraParams2_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} cvFindExtrinsicCameraParams2 (@var{object_points}, @var{image_points}, @var{camera_matrix}, @var{distortion_coeffs}, @var{rotation_vector}, @var{translation_vector})\n\
-@var{object_points} is of type CvMat. @var{image_points} is of type CvMat. @var{camera_matrix} is of type CvMat. @var{distortion_coeffs} is of type CvMat. @var{rotation_vector} is of type CvMat. @var{translation_vector} is of type CvMat. \n\
+@deftypefn {Loadable Function} cvFindExtrinsicCameraParams2 (@var{object_points}, @var{image_points}, @var{camera_matrix}, @var{distortion_coeffs}, @var{rotation_vector}, @var{translation_vector}, @var{use_extrinsic_guess} = 0)\n\
+@var{object_points} is of type CvMat. @var{image_points} is of type CvMat. @var{camera_matrix} is of type CvMat. @var{distortion_coeffs} is of type CvMat. @var{rotation_vector} is of type CvMat. @var{translation_vector} is of type CvMat. @var{use_extrinsic_guess} is of type int. \n\
 @end deftypefn";
 const char* _wrap_cvWarpAffine_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvWarpAffine (@var{src}, @var{dst}, @var{map_matrix}, @var{flags} = 1+8, @var{fillval} = cvScalarAll(0))\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{map_matrix} is of type CvMat. @var{flags} is of type int. @var{fillval} is of type CvScalar. \n\
 @end deftypefn";
+const char* _wrap_IplImage___add___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator + (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type CvScalar. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_OctSwigIterator___add___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator + (@var{self}, @var{n})\n\
+@var{self} is of type OctSwigIterator. @var{n} is of type ptrdiff_t. @var{retval} is of type OctSwigIterator. \n\
+@end deftypefn";
+const char* _wrap_CvMat___add___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator + (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type CvScalar. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_CV_IS_HAAR_CLASSIFIER_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_HAAR_CLASSIFIER (@var{haar})\n\
 @var{haar} is of type void. @var{retval} is of type int. \n\
@@ -5612,6 +5719,10 @@ const char* _wrap_cvSetRemove_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvSetRemove (@var{set_header}, @var{index})\n\
 @var{set_header} is of type CvSet. @var{index} is of type int. \n\
 @end deftypefn";
+const char* _wrap_cvLSHRemove_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} cvLSHRemove (@var{lsh}, @var{indices})\n\
+@var{lsh} is of type CvLSH. @var{indices} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_CvPointVector_get_allocator_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = get_allocator (@var{self})\n\
 @var{self} is of type CvPointVector. @var{retval} is of type allocator_type. \n\
@@ -5688,10 +5799,6 @@ const char* _wrap_cvGetCols_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetCols (@var{arr}, @var{submat}, @var{start_col}, @var{end_col})\n\
 @var{arr} is of type CvArr. @var{submat} is of type CvMat. @var{start_col} is of type int. @var{end_col} is of type int. @var{retval} is of type CvMat. \n\
 @end deftypefn";
-const char* _wrap_IplImage___mul_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator * (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_CvImage_roi_row_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = roi_row (@var{self}, @var{y})\n\
 @var{self} is of type CvImage. @var{y} is of type int. @var{retval} is of type uchar. \n\
@@ -5740,18 +5847,6 @@ const char* _wrap_cvComposeRT_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvComposeRT (@var{_rvec1}, @var{_tvec1}, @var{_rvec2}, @var{_tvec2}, @var{_rvec3}, @var{_tvec3}, @var{dr3dr1} = 0, @var{dr3dt1} = 0, @var{dr3dr2} = 0, @var{dr3dt2} = 0, @var{dt3dr1} = 0, @var{dt3dt1} = 0, @var{dt3dr2} = 0, @var{dt3dt2} = 0)\n\
 @var{_rvec1} is of type CvMat. @var{_tvec1} is of type CvMat. @var{_rvec2} is of type CvMat. @var{_tvec2} is of type CvMat. @var{_rvec3} is of type CvMat. @var{_tvec3} is of type CvMat. @var{dr3dr1} is of type CvMat. @var{dr3dt1} is of type CvMat. @var{dr3dr2} is of type CvMat. @var{dr3dt2} is of type CvMat. @var{dt3dr1} is of type CvMat. @var{dt3dt1} is of type CvMat. @var{dt3dr2} is of type CvMat. @var{dt3dt2} is of type CvMat. \n\
 @end deftypefn";
-const char* _wrap_CvSubdiv2DEdge_Wrapper___ne_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{x})\n\
-@var{self} is of type CvSubdiv2DEdge_Wrapper. @var{x} is of type CvSubdiv2DEdge_Wrapper. @var{retval} is of type bool. \n\
-@end deftypefn";
-const char* _wrap_CvRNG_Wrapper___ne_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{x})\n\
-@var{self} is of type CvRNG_Wrapper. @var{x} is of type CvRNG_Wrapper. @var{retval} is of type bool. \n\
-@end deftypefn";
-const char* _wrap_OctSwigIterator___ne_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{x})\n\
-@var{self} is of type OctSwigIterator. @var{x} is of type OctSwigIterator. @var{retval} is of type bool. \n\
-@end deftypefn";
 const char* _wrap_cvFindType_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvFindType (@var{type_name})\n\
 @var{type_name} is of type char. @var{retval} is of type CvTypeInfo. \n\
@@ -5764,6 +5859,10 @@ const char* _wrap_cvAbsDiffS_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvAbsDiffS (@var{src}, @var{dst}, @var{value})\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{value} is of type CvScalar. \n\
 @end deftypefn";
+const char* _wrap_cvCorrectMatches_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} cvCorrectMatches (@var{F}, @var{points1}, @var{points2}, @var{new_points1}, @var{new_points2})\n\
+@var{F} is of type CvMat. @var{points1} is of type CvMat. @var{points2} is of type CvMat. @var{new_points1} is of type CvMat. @var{new_points2} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_CV_IS_SEQ_POLYLINE_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_SEQ_POLYLINE (@var{seq})\n\
 @var{seq} is of type CvSeq. @var{retval} is of type int. \n\
@@ -5824,22 +5923,6 @@ const char* _wrap_cvGetSize_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetSize (@var{arr})\n\
 @var{arr} is of type CvArr. @var{retval} is of type CvSize. \n\
 @end deftypefn";
-const char* _wrap_new_CvBaseImageFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = CvBaseImageFilter (@var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_is_separable}, @var{_ksize})\n\
-@var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_is_separable} is of type bool. @var{_ksize} is of type CvSize. @var{retval} is of type CvBaseImageFilter. \n\
-@end deftypefn";
-const char* _wrap_delete_CvBaseImageFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvBaseImageFilter (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. \n\
-@end deftypefn";
-const char* _wrap_new_CvLaplaceFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = CvLaplaceFilter (@var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_normalized}, @var{_ksize})\n\
-@var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_normalized} is of type bool. @var{_ksize} is of type int. @var{retval} is of type CvLaplaceFilter. \n\
-@end deftypefn";
-const char* _wrap_delete_CvLaplaceFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvLaplaceFilter (@var{self})\n\
-@var{self} is of type CvLaplaceFilter. \n\
-@end deftypefn";
 const char* _wrap_cvSeqSort_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvSeqSort (@var{seq}, @var{func}, @var{userdata} = nil)\n\
 @var{seq} is of type CvSeq. @var{func} is of type CvCmpFunc. @var{userdata} is of type void. \n\
@@ -5864,10 +5947,6 @@ const char* _wrap_cvPyrUp_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvPyrUp (@var{src}, @var{dst}, @var{filter} = CV_GAUSSIAN_5x5)\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{filter} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_process_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = process (@var{self}, @var{_src}, @var{_dst})\n\
-@var{self} is of type CvBaseImageFilter. @var{_src} is of type CvMat. @var{_dst} is of type CvMat. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_cvCalcOpticalFlowPyrLK_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvCalcOpticalFlowPyrLK (@var{prev}, @var{curr}, @var{prev_pyr}, @var{curr_pyr}, @var{prev_features}, @var{curr_features}, @var{win_size}, @var{level}, @var{status}, @var{track_error}, @var{criteria}, @var{flags})\n\
 @var{prev} is of type CvArr. @var{curr} is of type CvArr. @var{prev_pyr} is of type CvArr. @var{curr_pyr} is of type CvArr. @var{prev_features} is of type CvPoint2D32f. @var{curr_features} is of type CvPoint2D32f. @var{win_size} is of type CvSize. @var{level} is of type int. @var{status} is of type char. @var{track_error} is of type float. @var{criteria} is of type CvTermCriteria. @var{flags} is of type int. \n\
@@ -5888,6 +5967,10 @@ const char* _wrap_cvMixChannels_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvMixChannels (@var{src}, @var{src_count}, @var{dst}, @var{dst_count}, @var{from_to}, @var{pair_count})\n\
 @var{src} is of type CvArr. @var{src_count} is of type int. @var{dst} is of type CvArr. @var{dst_count} is of type int. @var{from_to} is of type int. @var{pair_count} is of type int. \n\
 @end deftypefn";
+const char* _wrap_cvLinearPolar_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} cvLinearPolar (@var{src}, @var{dst}, @var{center}, @var{maxRadius}, @var{flags} = 1+8)\n\
+@var{src} is of type CvArr. @var{dst} is of type CvArr. @var{center} is of type CvPoint2D32f. @var{maxRadius} is of type double. @var{flags} is of type int. \n\
+@end deftypefn";
 const char* _wrap_CvMatrix_write_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} write (@var{self}, @var{fs}, @var{matname})\n\
 @var{self} is of type CvMatrix. @var{fs} is of type CvFileStorage. @var{matname} is of type char. \n\
@@ -5956,22 +6039,10 @@ const char* _wrap_IplImage___paren_asgn_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} __paren_asgn (@var{self}, @var{object}, @var{arr})\n\
 @var{self} is of type . @var{object} is of type octave_value. @var{arr} is of type CvArr. \n\
 @end deftypefn";
-const char* _wrap_CvPointVector___paren_asgn_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} __paren_asgn (@var{self}, @var{i}, @var{x})\n\
-@var{self} is of type CvPointVector. @var{i} is of type difference_type. @var{x} is of type value_type. \n\
-@end deftypefn";
-const char* _wrap_FloatVector___paren_asgn_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} __paren_asgn (@var{self}, @var{i}, @var{x})\n\
-@var{self} is of type FloatVector. @var{i} is of type difference_type. @var{x} is of type value_type. \n\
-@end deftypefn";
 const char* _wrap_CvMat___paren_asgn_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} __paren_asgn (@var{self}, @var{object}, @var{arr})\n\
 @var{self} is of type CvMat. @var{object} is of type octave_value. @var{arr} is of type CvArr. \n\
 @end deftypefn";
-const char* _wrap_CvMorphology_get_operation_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_operation (@var{self})\n\
-@var{self} is of type CvMorphology. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_CvTuple_CvPoint_2___paren_asgn_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} __paren_asgn (@var{self}, @var{i}, @var{obj})\n\
 @var{self} is of type CvTuple_CvPoint_2. @var{i} is of type int. @var{obj} is of type CvPoint. \n\
@@ -6020,6 +6091,14 @@ const char* _wrap_CvSeq_float_3___paren_asgn_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} __paren_asgn (@var{self}, @var{i}, @var{obj})\n\
 @var{self} is of type CvSeq_float_3. @var{i} is of type int. @var{obj} is of type CvTuple_float_3. \n\
 @end deftypefn";
+const char* _wrap_IplImage___ge___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator >= (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_CvMat___ge___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator >= (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_CV_IS_SEQ_POINT_SET_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_SEQ_POINT_SET (@var{seq})\n\
 @var{seq} is of type CvSeq. @var{retval} is of type int. \n\
@@ -6064,30 +6143,6 @@ const char* _wrap_CV_IS_SUBDIV2D_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_SUBDIV2D (@var{seq})\n\
 @var{seq} is of type CvSeq. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_new_CvSepFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = CvSepFilter (@var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_kx}, @var{_ky})\n\
-@var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_kx} is of type CvMat. @var{_ky} is of type CvMat. @var{retval} is of type CvSepFilter. \n\
-@end deftypefn";
-const char* _wrap_delete_CvSepFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvSepFilter (@var{self})\n\
-@var{self} is of type CvSepFilter. \n\
-@end deftypefn";
-const char* _wrap_new_CvLinearFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = CvLinearFilter (@var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_kernel})\n\
-@var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_kernel} is of type CvMat. @var{retval} is of type CvLinearFilter. \n\
-@end deftypefn";
-const char* _wrap_delete_CvLinearFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvLinearFilter (@var{self})\n\
-@var{self} is of type CvLinearFilter. \n\
-@end deftypefn";
-const char* _wrap_new_CvBoxFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = CvBoxFilter (@var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_normalized}, @var{_ksize})\n\
-@var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_normalized} is of type bool. @var{_ksize} is of type CvSize. @var{retval} is of type CvBoxFilter. \n\
-@end deftypefn";
-const char* _wrap_delete_CvBoxFilter_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvBoxFilter (@var{self})\n\
-@var{self} is of type CvBoxFilter. \n\
-@end deftypefn";
 const char* _wrap_new_CvStarKeypoint_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvStarKeypoint::CvStarKeypoint ()\n\
 @var{retval} is of type CvStarKeypoint. \n\
@@ -6112,10 +6167,6 @@ const char* _wrap_cvSolveCubic_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvSolveCubic (@var{coeffs}, @var{roots})\n\
 @var{coeffs} is of type CvMat. @var{roots} is of type CvMat. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvMat___xor_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator ^ (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type CvScalar. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_CvImage_asIplImage_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = operator IplImage* (@var{self})\n\
 @var{self} is of type CvImage. @var{retval} is of type . \n\
@@ -6148,10 +6199,6 @@ const char* _wrap_CV_IS_SEQ_HOLE_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_SEQ_HOLE (@var{seq})\n\
 @var{seq} is of type CvSeq. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_OctSwigIterator___incr_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator ++ (@var{self})\n\
-@var{self} is of type OctSwigIterator. @var{retval} is of type OctSwigIterator. \n\
-@end deftypefn";
 const char* _wrap_cvWriteComment_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvWriteComment (@var{fs}, @var{comment}, @var{eol_comment})\n\
 @var{fs} is of type CvFileStorage. @var{comment} is of type char. @var{eol_comment} is of type int. \n\
@@ -6168,14 +6215,6 @@ const char* _wrap_cvReadChainPoint_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvReadChainPoint (@var{reader})\n\
 @var{reader} is of type CvChainPtReader. @var{retval} is of type CvPoint. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_get_x_filter_func_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_x_filter_func (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. @var{retval} is of type CvRowFilterFunc. \n\
-@end deftypefn";
-const char* _wrap_CvBaseImageFilter_get_y_filter_func_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_y_filter_func (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. @var{retval} is of type CvColumnFilterFunc. \n\
-@end deftypefn";
 const char* _wrap_cvMinEnclosingCircle_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvMinEnclosingCircle (@var{points}, @var{center})\n\
 @var{points} is of type CvArr. @var{center} is of type CvPoint2D32f. @var{retval} is of type int. \n\
@@ -6204,14 +6243,6 @@ const char* _wrap_IplImage___paren_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = __paren (@var{self}, @var{object})\n\
 @var{self} is of type . @var{object} is of type octave_value. @var{retval} is of type octave_value. \n\
 @end deftypefn";
-const char* _wrap_CvPointVector___paren_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = __paren (@var{self}, @var{i})\n\
-@var{self} is of type CvPointVector. @var{i} is of type difference_type. @var{retval} is of type value_type. \n\
-@end deftypefn";
-const char* _wrap_FloatVector___paren_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = __paren (@var{self}, @var{i})\n\
-@var{self} is of type FloatVector. @var{i} is of type difference_type. @var{retval} is of type value_type. \n\
-@end deftypefn";
 const char* _wrap_CvMat___paren_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = __paren (@var{self}, @var{object})\n\
 @var{self} is of type CvMat. @var{object} is of type octave_value. @var{retval} is of type octave_value. \n\
@@ -6312,10 +6343,6 @@ const char* _wrap_cvSize2D32f_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvSize2D32f (@var{width}, @var{height})\n\
 @var{width} is of type double. @var{height} is of type double. @var{retval} is of type CvSize2D32f. \n\
 @end deftypefn";
-const char* _wrap_CvSepFilter_init_deriv_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init_deriv (@var{self}, @var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{dx}, @var{dy}, @var{aperture_size})\n\
-@var{self} is of type CvSepFilter. @var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{dx} is of type int. @var{dy} is of type int. @var{aperture_size} is of type int. \n\
-@end deftypefn";
 const char* _wrap_cvAttrList_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvAttrList ()\n\
 @var{retval} is of type CvAttrList. \n\
@@ -6396,10 +6423,6 @@ const char* _wrap_cvConvertPointsHomogeneous_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvConvertPointsHomogeneous (@var{src}, @var{dst})\n\
 @var{src} is of type CvMat. @var{dst} is of type CvMat. \n\
 @end deftypefn";
-const char* _wrap_IplImage___xor_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator ^ (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type CvScalar. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_new_CvStereoGCState_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvStereoGCState::CvStereoGCState ()\n\
 @var{retval} is of type CvStereoGCState. \n\
@@ -6529,8 +6552,8 @@ const char* _wrap_delete_CvMatND_texinfo = "-*- texinfo -*-\n\
 @var{self} is of type CvMatND. \n\
 @end deftypefn";
 const char* _wrap_cvFindFeaturesBoxed_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = cvFindFeaturesBoxed (@var{tr}, @var{bounds_min}, @var{bounds_max}, @var{results})\n\
-@var{tr} is of type CvFeatureTree. @var{bounds_min} is of type CvMat. @var{bounds_max} is of type CvMat. @var{results} is of type CvMat. @var{retval} is of type int. \n\
+@deftypefn {Loadable Function} @var{retval} = cvFindFeaturesBoxed (@var{tr}, @var{bounds_min}, @var{bounds_max}, @var{out_indices})\n\
+@var{tr} is of type CvFeatureTree. @var{bounds_min} is of type CvMat. @var{bounds_max} is of type CvMat. @var{out_indices} is of type CvMat. @var{retval} is of type int. \n\
 @end deftypefn";
 const char* _wrap_CvImage_set_coi_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} set_coi (@var{self}, @var{coi})\n\
@@ -6672,10 +6695,6 @@ const char* _wrap_CV_SEQ_ELTYPE_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_SEQ_ELTYPE (@var{seq})\n\
 @var{seq} is of type CvSeq. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvMatrix_row_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = row (@var{self}, @var{i})\n\
-@var{self} is of type CvMatrix. @var{i} is of type int. @var{retval} is of type uchar. \n\
-@end deftypefn";
 const char* _wrap_CvPointVector_end_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = end (@var{self})\n\
 @var{self} is of type CvPointVector. @var{retval} is of type const_iterator. \n\
@@ -6684,6 +6703,10 @@ const char* _wrap_FloatVector_end_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = end (@var{self})\n\
 @var{self} is of type FloatVector. @var{retval} is of type const_iterator. \n\
 @end deftypefn";
+const char* _wrap_CvMatrix_row_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = row (@var{self}, @var{i})\n\
+@var{self} is of type CvMatrix. @var{i} is of type int. @var{retval} is of type uchar. \n\
+@end deftypefn";
 const char* _wrap_delete_Cv32suf_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} Cv32suf::~Cv32suf (@var{self})\n\
 @var{self} is of type Cv32suf. \n\
@@ -6748,13 +6771,9 @@ const char* _wrap_cvRepeat_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvRepeat (@var{src}, @var{dst})\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. \n\
 @end deftypefn";
-const char* _wrap_new_CvLevMarq_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = CvLevMarq (@var{nparams}, @var{nerrs})\n\
-@var{nparams} is of type int. @var{nerrs} is of type int. @var{retval} is of type CvLevMarq. \n\
-@end deftypefn";
-const char* _wrap_delete_CvLevMarq_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvLevMarq (@var{self})\n\
-@var{self} is of type CvLevMarq. \n\
+const char* _wrap_cvReleaseLSH_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} cvReleaseLSH (@var{lsh})\n\
+@var{lsh} is of type CvLSH. \n\
 @end deftypefn";
 const char* _wrap_cvCalcSubdivVoronoi2D_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvCalcSubdivVoronoi2D (@var{subdiv})\n\
@@ -6852,6 +6871,14 @@ const char* _wrap_cvScaleAdd_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvScaleAdd (@var{src1}, @var{scale}, @var{src2}, @var{dst})\n\
 @var{src1} is of type CvArr. @var{scale} is of type CvScalar. @var{src2} is of type CvArr. @var{dst} is of type CvArr. \n\
 @end deftypefn";
+const char* _wrap_IplImage___div___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator / (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_CvMat___div___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator / (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvUndistort2_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvUndistort2 (@var{src}, @var{dst}, @var{camera_matrix}, @var{distortion_coeffs})\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{camera_matrix} is of type CvMat. @var{distortion_coeffs} is of type CvMat. \n\
@@ -6868,17 +6895,13 @@ const char* _wrap_FloatVector_clear_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} clear (@var{self})\n\
 @var{self} is of type FloatVector. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_clear_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} clear (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. \n\
-@end deftypefn";
-const char* _wrap_CvSepFilter_clear_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} clear (@var{self})\n\
-@var{self} is of type CvSepFilter. \n\
+const char* _wrap_CvPointVector___paren_asgn___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} __paren_asgn__ (@var{self}, @var{i}, @var{x})\n\
+@var{self} is of type CvPointVector. @var{i} is of type difference_type. @var{x} is of type value_type. \n\
 @end deftypefn";
-const char* _wrap_CvLinearFilter_clear_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} clear (@var{self})\n\
-@var{self} is of type CvLinearFilter. \n\
+const char* _wrap_FloatVector___paren_asgn___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} __paren_asgn__ (@var{self}, @var{i}, @var{x})\n\
+@var{self} is of type FloatVector. @var{i} is of type difference_type. @var{x} is of type value_type. \n\
 @end deftypefn";
 const char* _wrap_cvReadReal_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvReadReal (@var{node}, @var{default_value} = 0.)\n\
@@ -6904,14 +6927,14 @@ const char* _wrap_cvCartToPolar_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvCartToPolar (@var{x}, @var{y}, @var{magnitude}, @var{angle} = nil, @var{angle_in_degrees} = 0)\n\
 @var{x} is of type CvArr. @var{y} is of type CvArr. @var{magnitude} is of type CvArr. @var{angle} is of type CvArr. @var{angle_in_degrees} is of type int. \n\
 @end deftypefn";
-const char* _wrap_delete_CvType_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvType (@var{self})\n\
-@var{self} is of type CvType. \n\
-@end deftypefn";
 const char* _wrap_new_CvType_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvType (@var{type_name}, @var{is_instance})\n\
 @var{type_name} is of type char. @var{is_instance} is of type CvIsInstanceFunc. @var{retval} is of type CvType. \n\
 @end deftypefn";
+const char* _wrap_delete_CvType_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} CvType (@var{self})\n\
+@var{self} is of type CvType. \n\
+@end deftypefn";
 const char* _wrap_cvDrawContours_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvDrawContours (@var{img}, @var{contour}, @var{external_color}, @var{hole_color}, @var{max_level}, @var{thickness} = 1, @var{line_type} = 8, @var{offset} = cvPoint(0,0))\n\
 @var{img} is of type CvArr. @var{contour} is of type CvSeq. @var{external_color} is of type CvScalar. @var{hole_color} is of type CvScalar. @var{max_level} is of type int. @var{thickness} is of type int. @var{line_type} is of type int. @var{offset} is of type CvPoint. \n\
@@ -6940,6 +6963,10 @@ const char* _wrap_cvAXPY_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvAXPY (@var{A}, @var{real_scalar}, @var{B}, @var{C})\n\
 @var{A} is of type CvArr. @var{real_scalar} is of type double. @var{B} is of type CvArr. @var{C} is of type CvArr. \n\
 @end deftypefn";
+const char* _wrap_cvExtractMSER_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} cvExtractMSER (@var{_img}, @var{_mask}, @var{contours}, @var{storage}, @var{params})\n\
+@var{_img} is of type CvArr. @var{_mask} is of type CvArr. @var{contours} is of type CvSeq. @var{storage} is of type CvMemStorage. @var{params} is of type CvMSERParams. \n\
+@end deftypefn";
 const char* _wrap_cvRandInt_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvRandInt (@var{rng})\n\
 @var{rng} is of type CvRNG. @var{retval} is of type unsigned int. \n\
@@ -7056,14 +7083,6 @@ const char* _wrap_cvPoint3D32f_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvPoint3D32f (@var{x}, @var{y}, @var{z})\n\
 @var{x} is of type double. @var{y} is of type double. @var{z} is of type double. @var{retval} is of type CvPoint3D32f. \n\
 @end deftypefn";
-const char* _wrap_CvMorphology_clear_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} clear (@var{self})\n\
-@var{self} is of type CvMorphology. \n\
-@end deftypefn";
-const char* _wrap_CvLevMarq_clear_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} clear (@var{self})\n\
-@var{self} is of type CvLevMarq. \n\
-@end deftypefn";
 const char* _wrap_CV_NEXT_GRAPH_EDGE_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_NEXT_GRAPH_EDGE (@var{edge}, @var{vertex})\n\
 @var{edge} is of type CvGraphEdge. @var{vertex} is of type CvGraphVtx. @var{retval} is of type CvGraphEdge. \n\
@@ -7108,14 +7127,6 @@ const char* _wrap_cvStartWriteSeq_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvStartWriteSeq (@var{seq_flags}, @var{header_size}, @var{elem_size}, @var{storage}, @var{writer})\n\
 @var{seq_flags} is of type int. @var{header_size} is of type int. @var{elem_size} is of type int. @var{storage} is of type CvMemStorage. @var{writer} is of type CvSeqWriter. \n\
 @end deftypefn";
-const char* _wrap_CvLinearFilter_get_kernel_sparse_buf_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_kernel_sparse_buf (@var{self})\n\
-@var{self} is of type CvLinearFilter. @var{retval} is of type uchar. \n\
-@end deftypefn";
-const char* _wrap_CvMorphology_get_element_sparse_buf_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_element_sparse_buf (@var{self})\n\
-@var{self} is of type CvMorphology. @var{retval} is of type uchar. \n\
-@end deftypefn";
 const char* _wrap_cvRectToROI_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvRectToROI (@var{rect}, @var{coi})\n\
 @var{rect} is of type CvRect. @var{coi} is of type int. @var{retval} is of type . \n\
@@ -7132,18 +7143,10 @@ const char* _wrap_CvMat___rxor___texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = __rxor__ (@var{self}, @var{arg})\n\
 @var{self} is of type CvMat. @var{arg} is of type double. @var{retval} is of type CvMat. \n\
 @end deftypefn";
-const char* _wrap_CvMat___eq_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_cvLogPolar_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvLogPolar (@var{src}, @var{dst}, @var{center}, @var{M}, @var{flags} = 1+8)\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{center} is of type CvPoint2D32f. @var{M} is of type double. @var{flags} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvBoxFilter_get_sum_count_ptr_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_sum_count_ptr (@var{self})\n\
-@var{self} is of type CvBoxFilter. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_cvCvtSeqToArray_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvCvtSeqToArray_Shadow (@var{seq}, @var{elements})\n\
 @var{seq} is of type CvSeq. @var{elements} is of type CvArr. @var{retval} is of type CvArr. \n\
@@ -7292,10 +7295,6 @@ const char* _wrap_new_CvSeqReader_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvSeqReader::CvSeqReader ()\n\
 @var{retval} is of type CvSeqReader. \n\
 @end deftypefn";
-const char* _wrap_CvMat___ge_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator >= (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_CV_IS_IMAGE_HDR_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_IMAGE_HDR (@var{img})\n\
 @var{img} is of type CvArr. @var{retval} is of type int. \n\
@@ -7316,6 +7315,14 @@ const char* _wrap_FloatVector_size_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = size (@var{self})\n\
 @var{self} is of type FloatVector. @var{retval} is of type size_type. \n\
 @end deftypefn";
+const char* _wrap_IplImage___gt___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator > (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_CvMat___gt___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator > (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_new_CvSURFParams_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvSURFParams::CvSURFParams ()\n\
 @var{retval} is of type CvSURFParams. \n\
@@ -7328,6 +7335,18 @@ const char* _wrap_cvSURFParams_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvSURFParams (@var{hessianThreshold}, @var{extended} = 0)\n\
 @var{hessianThreshold} is of type double. @var{extended} is of type int. @var{retval} is of type CvSURFParams. \n\
 @end deftypefn";
+const char* _wrap_new_CvMSERParams_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = CvMSERParams::CvMSERParams ()\n\
+@var{retval} is of type CvMSERParams. \n\
+@end deftypefn";
+const char* _wrap_delete_CvMSERParams_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} CvMSERParams::~CvMSERParams (@var{self})\n\
+@var{self} is of type CvMSERParams. \n\
+@end deftypefn";
+const char* _wrap_cvMSERParams_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvMSERParams (@var{delta} = 5, @var{min_area} = 60, @var{max_area} = 14400, @var{max_variation} = .25, @var{min_diversity} = .2, @var{max_evolution} = 200, @var{area_threshold} = 1.01, @var{min_margin} = .003, @var{edge_blur_size} = 5)\n\
+@var{delta} is of type int. @var{min_area} is of type int. @var{max_area} is of type int. @var{max_variation} is of type float. @var{min_diversity} is of type float. @var{max_evolution} is of type int. @var{area_threshold} is of type double. @var{min_margin} is of type double. @var{edge_blur_size} is of type int. @var{retval} is of type CvMSERParams. \n\
+@end deftypefn";
 const char* _wrap_new_CvStarDetectorParams_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvStarDetectorParams::CvStarDetectorParams ()\n\
 @var{retval} is of type CvStarDetectorParams. \n\
@@ -7388,14 +7407,6 @@ const char* _wrap_new_CvSet_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvSet::CvSet ()\n\
 @var{retval} is of type CvSet. \n\
 @end deftypefn";
-const char* _wrap_CvLevMarq_update_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = update (@var{self}, @var{param}, @var{J}, @var{err})\n\
-@var{self} is of type CvLevMarq. @var{param} is of type CvMat. @var{J} is of type CvMat. @var{err} is of type CvMat. @var{retval} is of type bool. \n\
-@end deftypefn";
-const char* _wrap_CvMat___gt_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator > (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_CV_NODE_IDX_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_NODE_IDX (@var{mat}, @var{node})\n\
 @var{mat} is of type CvSparseMat. @var{node} is of type CvSparseNode. @var{retval} is of type int. \n\
@@ -7528,10 +7539,6 @@ const char* _wrap_cvGetThreadNum_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetThreadNum ()\n\
 @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvMorphology_get_element_shape_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_element_shape (@var{self})\n\
-@var{self} is of type CvMorphology. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_cvGetSeqElem_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetSeqElem (@var{seq}, @var{index})\n\
 @var{seq} is of type CvSeq. @var{index} is of type int. @var{retval} is of type schar. \n\
@@ -7664,14 +7671,6 @@ const char* _wrap_cvNormalize_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvNormalize (@var{src}, @var{dst}, @var{a} = 1., @var{b} = 0., @var{norm_type} = 4, @var{mask} = nil)\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{a} is of type double. @var{b} is of type double. @var{norm_type} is of type int. @var{mask} is of type CvArr. \n\
 @end deftypefn";
-const char* _wrap_CvBoxFilter_get_sum_buf_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_sum_buf (@var{self})\n\
-@var{self} is of type CvBoxFilter. @var{retval} is of type uchar. \n\
-@end deftypefn";
-const char* _wrap_CvSepFilter_init_gaussian_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init_gaussian (@var{self}, @var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{gaussian_size}, @var{sigma})\n\
-@var{self} is of type CvSepFilter. @var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{gaussian_size} is of type int. @var{sigma} is of type double. \n\
-@end deftypefn";
 const char* _wrap_cvSize_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvSize (@var{width}, @var{height})\n\
 @var{width} is of type int. @var{height} is of type int. @var{retval} is of type CvSize. \n\
@@ -7728,10 +7727,6 @@ const char* _wrap_cvCalibrateCamera2_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvCalibrateCamera2 (@var{object_points}, @var{image_points}, @var{point_counts}, @var{image_size}, @var{camera_matrix}, @var{distortion_coeffs}, @var{rotation_vectors} = nil, @var{translation_vectors} = nil, @var{flags} = 0)\n\
 @var{object_points} is of type CvMat. @var{image_points} is of type CvMat. @var{point_counts} is of type CvMat. @var{image_size} is of type CvSize. @var{camera_matrix} is of type CvMat. @var{distortion_coeffs} is of type CvMat. @var{rotation_vectors} is of type CvMat. @var{translation_vectors} is of type CvMat. @var{flags} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_get_work_type_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_work_type (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_CV_NODE_IS_EMPTY_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_NODE_IS_EMPTY (@var{flags})\n\
 @var{flags} is of type int. @var{retval} is of type int. \n\
@@ -7772,18 +7767,18 @@ const char* _wrap_CvImage_read_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = read (@var{self}, @var{fs}, @var{seqname}, @var{idx})\n\
 @var{self} is of type CvImage. @var{fs} is of type CvFileStorage. @var{seqname} is of type char. @var{idx} is of type int. @var{retval} is of type bool. \n\
 @end deftypefn";
+const char* _wrap_IplImage___le___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator <= (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_CvMat___le___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator <= (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvAlloc_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvAlloc (@var{size})\n\
 @var{size} is of type size_t. @var{retval} is of type void. \n\
 @end deftypefn";
-const char* _wrap_CvBoxFilter_is_normalized_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = is_normalized (@var{self})\n\
-@var{self} is of type CvBoxFilter. @var{retval} is of type bool. \n\
-@end deftypefn";
-const char* _wrap_CvLaplaceFilter_is_normalized_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = is_normalized (@var{self})\n\
-@var{self} is of type CvLaplaceFilter. @var{retval} is of type bool. \n\
-@end deftypefn";
 const char* _wrap_cvKalmanCorrect_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvKalmanCorrect (@var{kalman}, @var{measurement})\n\
 @var{kalman} is of type CvKalman. @var{measurement} is of type CvMat. @var{retval} is of type CvMat. \n\
@@ -7816,10 +7811,6 @@ const char* _wrap_new_CvGraphVtx2D_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvGraphVtx2D::CvGraphVtx2D ()\n\
 @var{retval} is of type CvGraphVtx2D. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_get_src_type_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_src_type (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_CvSeq_CvRect_cast_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvTypedSeq<(CvRect)>::cast (@var{seq})\n\
 @var{seq} is of type CvSeq. @var{retval} is of type CvSeq_CvRect. \n\
@@ -7844,13 +7835,9 @@ const char* _wrap_cvPtrND_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvPtrND (@var{arr}, @var{idx}, @var{type} = nil, @var{create_node} = 1, @var{precalc_hashval} = nil)\n\
 @var{arr} is of type CvArr. @var{idx} is of type int. @var{type} is of type int. @var{create_node} is of type int. @var{precalc_hashval} is of type unsigned int. @var{retval} is of type uchar. \n\
 @end deftypefn";
-const char* _wrap_OctSwigIterator___sub_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator - (@var{self}, @var{x})\n\
-@var{self} is of type OctSwigIterator. @var{x} is of type OctSwigIterator. @var{retval} is of type ptrdiff_t. \n\
-@end deftypefn";
-const char* _wrap_CvMat___sub_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator - (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type CvScalar. @var{retval} is of type CvMat. \n\
+const char* _wrap_OctSwigIterator___decr___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator -- (@var{self})\n\
+@var{self} is of type OctSwigIterator. @var{retval} is of type OctSwigIterator. \n\
 @end deftypefn";
 const char* _wrap_new_CvAvgComp_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvAvgComp::CvAvgComp ()\n\
@@ -7932,10 +7919,6 @@ const char* _wrap_cvReadInt_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvReadInt (@var{node}, @var{default_value} = 0)\n\
 @var{node} is of type CvFileNode. @var{default_value} is of type int. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvMat___le_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator <= (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_cvCamShift_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvCamShift (@var{prob_image}, @var{window}, @var{criteria}, @var{comp}, @var{box} = nil)\n\
 @var{prob_image} is of type CvArr. @var{window} is of type CvRect. @var{criteria} is of type CvTermCriteria. @var{comp} is of type CvConnectedComp. @var{box} is of type CvBox2D. @var{retval} is of type int. \n\
@@ -7960,10 +7943,6 @@ const char* _wrap_CvSeq_float_3_pop_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = pop (@var{self})\n\
 @var{self} is of type CvSeq_float_3. @var{retval} is of type CvTuple_float_3. \n\
 @end deftypefn";
-const char* _wrap_CvMat___lt_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator < (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_CV_ARE_SIZES_EQ_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_ARE_SIZES_EQ (@var{mat1}, @var{mat2})\n\
 @var{mat1} is of type CvMat. @var{mat2} is of type CvMat. @var{retval} is of type int. \n\
@@ -7976,45 +7955,13 @@ const char* _wrap_delete_IplConvKernel_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} IplConvKernel (@var{self})\n\
 @var{self} is of type . \n\
 @end deftypefn";
-const char* _wrap_CvSepFilter_get_x_kernel_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_x_kernel (@var{self})\n\
-@var{self} is of type CvSepFilter. @var{retval} is of type CvMat. \n\
-@end deftypefn";
-const char* _wrap_CvSepFilter_get_y_kernel_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_y_kernel (@var{self})\n\
-@var{self} is of type CvSepFilter. @var{retval} is of type CvMat. \n\
-@end deftypefn";
-const char* _wrap_CvSepFilter_init_gaussian_kernel_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvSepFilter::init_gaussian_kernel (@var{kernel})\n\
-@var{kernel} is of type CvMat. \n\
-@end deftypefn";
-const char* _wrap_CvSepFilter_init_sobel_kernel_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvSepFilter::init_sobel_kernel (@var{_kx}, @var{_ky}, @var{dx}, @var{dy})\n\
-@var{_kx} is of type CvMat. @var{_ky} is of type CvMat. @var{dx} is of type int. @var{dy} is of type int. \n\
-@end deftypefn";
-const char* _wrap_CvSepFilter_init_scharr_kernel_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvSepFilter::init_scharr_kernel (@var{_kx}, @var{_ky}, @var{dx}, @var{dy})\n\
-@var{_kx} is of type CvMat. @var{_ky} is of type CvMat. @var{dx} is of type int. @var{dy} is of type int. \n\
-@end deftypefn";
-const char* _wrap_CvLinearFilter_get_kernel_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_kernel (@var{self})\n\
-@var{self} is of type CvLinearFilter. @var{retval} is of type CvMat. \n\
-@end deftypefn";
-const char* _wrap_new_CvMorphology_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = CvMorphology (@var{_operation}, @var{_max_width}, @var{_src_dst_type}, @var{_element_shape}, @var{_element})\n\
-@var{_operation} is of type int. @var{_max_width} is of type int. @var{_src_dst_type} is of type int. @var{_element_shape} is of type int. @var{_element} is of type CvMat. @var{retval} is of type CvMorphology. \n\
-@end deftypefn";
-const char* _wrap_delete_CvMorphology_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvMorphology (@var{self})\n\
-@var{self} is of type CvMorphology. \n\
-@end deftypefn";
 const char* _wrap_CvMatrix_addref_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} addref (@var{self})\n\
 @var{self} is of type CvMatrix. \n\
 @end deftypefn";
 const char* _wrap_cvSolvePoly_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} cvSolvePoly (@var{coeffs}, @var{roots}, @var{maxiter} = 0, @var{fig} = 0)\n\
-@var{coeffs} is of type CvMat. @var{roots} is of type CvMat. @var{maxiter} is of type int. @var{fig} is of type int. \n\
+@deftypefn {Loadable Function} cvSolvePoly (@var{coeffs}, @var{roots2}, @var{maxiter} = 20, @var{fig} = 100)\n\
+@var{coeffs} is of type CvMat. @var{roots2} is of type CvMat. @var{maxiter} is of type int. @var{fig} is of type int. \n\
 @end deftypefn";
 const char* _wrap_cvSet2D_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvSet2D (@var{arr}, @var{idx0}, @var{idx1}, @var{value})\n\
@@ -8108,10 +8055,6 @@ const char* _wrap_CV_RGB_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_RGB (@var{r}, @var{g}, @var{b})\n\
 @var{r} is of type double. @var{g} is of type double. @var{b} is of type int. @var{retval} is of type CvScalar. \n\
 @end deftypefn";
-const char* _wrap_IplImage___sub_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator - (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type CvScalar. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_cvInRange_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvInRange (@var{src}, @var{lower}, @var{upper}, @var{dst})\n\
 @var{src} is of type CvArr. @var{lower} is of type CvArr. @var{upper} is of type CvArr. @var{dst} is of type CvArr. \n\
@@ -8152,22 +8095,10 @@ const char* _wrap_cvLog_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvLog (@var{src}, @var{dst})\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. \n\
 @end deftypefn";
-const char* _wrap_CvMat___ne_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_CvImage_load_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = load (@var{self}, @var{filename})\n\
 @var{self} is of type CvImage. @var{filename} is of type char. @var{retval} is of type bool. \n\
 @end deftypefn";
-const char* _wrap_OctSwigIterator___add_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator + (@var{self}, @var{n})\n\
-@var{self} is of type OctSwigIterator. @var{n} is of type ptrdiff_t. @var{retval} is of type OctSwigIterator. \n\
-@end deftypefn";
-const char* _wrap_CvMat___add_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator + (@var{self}, @var{val})\n\
-@var{self} is of type CvMat. @var{val} is of type CvScalar. @var{retval} is of type CvMat. \n\
-@end deftypefn";
 const char* _wrap_cvSet3D_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvSet3D (@var{arr}, @var{idx0}, @var{idx1}, @var{idx2}, @var{value})\n\
 @var{arr} is of type CvArr. @var{idx0} is of type int. @var{idx1} is of type int. @var{idx2} is of type int. @var{value} is of type CvScalar. \n\
@@ -8189,8 +8120,8 @@ const char* _wrap_cvCloneMat_texinfo = "-*- texinfo -*-\n\
 @var{mat} is of type CvMat. @var{retval} is of type CvMat. \n\
 @end deftypefn";
 const char* _wrap_cvExtractSURF_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} cvExtractSURF (@var{img}, @var{mask}, @var{keypoints}, @var{descriptors}, @var{storage}, @var{params})\n\
-@var{img} is of type CvArr. @var{mask} is of type CvArr. @var{keypoints} is of type CvSeq. @var{descriptors} is of type CvSeq. @var{storage} is of type CvMemStorage. @var{params} is of type CvSURFParams. \n\
+@deftypefn {Loadable Function} cvExtractSURF (@var{img}, @var{mask}, @var{keypoints}, @var{descriptors}, @var{storage}, @var{params}, @var{useProvidedKeyPts} = 0)\n\
+@var{img} is of type CvArr. @var{mask} is of type CvArr. @var{keypoints} is of type CvSeq. @var{descriptors} is of type CvSeq. @var{storage} is of type CvMemStorage. @var{params} is of type CvSURFParams. @var{useProvidedKeyPts} is of type int. \n\
 @end deftypefn";
 const char* _wrap_cvRectangle_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvRectangle (@var{img}, @var{pt1}, @var{pt2}, @var{color}, @var{thickness} = 1, @var{line_type} = 8, @var{shift} = 0)\n\
@@ -8244,10 +8175,6 @@ const char* _wrap_CV_IS_SEQ_POINT_SUBSET_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_SEQ_POINT_SUBSET (@var{seq})\n\
 @var{seq} is of type CvSeq. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_CvMatrix_set_data_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} set_data (@var{self}, @var{data})\n\
-@var{self} is of type CvMatrix. @var{data} is of type void. \n\
-@end deftypefn";
 const char* _wrap_new_CvMat_data_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvMat_data::CvMat_data ()\n\
 @var{retval} is of type CvMat_data. \n\
@@ -8256,6 +8183,10 @@ const char* _wrap_delete_CvMat_data_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvMat_data::~CvMat_data (@var{self})\n\
 @var{self} is of type CvMat_data. \n\
 @end deftypefn";
+const char* _wrap_CvMatrix_set_data_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} set_data (@var{self}, @var{data})\n\
+@var{self} is of type CvMatrix. @var{data} is of type void. \n\
+@end deftypefn";
 const char* _wrap_CV_IS_SEQ_CLOSED_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_SEQ_CLOSED (@var{seq})\n\
 @var{seq} is of type CvSeq. @var{retval} is of type int. \n\
@@ -8308,6 +8239,10 @@ const char* _wrap_cvLaplace_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvLaplace (@var{src}, @var{dst}, @var{aperture_size} = 3)\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{aperture_size} is of type int. \n\
 @end deftypefn";
+const char* _wrap_cvLSHQuery_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} cvLSHQuery (@var{lsh}, @var{query_points}, @var{indices}, @var{dist}, @var{k}, @var{emax})\n\
+@var{lsh} is of type CvLSH. @var{query_points} is of type CvMat. @var{indices} is of type CvMat. @var{dist} is of type CvMat. @var{k} is of type int. @var{emax} is of type int. \n\
+@end deftypefn";
 const char* _wrap_cvSetNew_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvSetNew (@var{set_header})\n\
 @var{set_header} is of type CvSet. @var{retval} is of type CvSetElem. \n\
@@ -8368,10 +8303,6 @@ const char* _wrap_cvRodrigues2_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvRodrigues2 (@var{src}, @var{dst}, @var{jacobian} = 0)\n\
 @var{src} is of type CvMat. @var{dst} is of type CvMat. @var{jacobian} is of type CvMat. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_IplImage___add_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator + (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type CvScalar. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_cvNormalizeHist_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvNormalizeHist (@var{hist}, @var{factor})\n\
 @var{hist} is of type CvHistogram. @var{factor} is of type double. \n\
@@ -8424,10 +8355,6 @@ const char* _wrap_cvCompareHist_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvCompareHist (@var{hist1}, @var{hist2}, @var{method})\n\
 @var{hist1} is of type CvHistogram. @var{hist2} is of type CvHistogram. @var{method} is of type int. @var{retval} is of type double. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_get_anchor_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_anchor (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. @var{retval} is of type CvPoint. \n\
-@end deftypefn";
 const char* _wrap_cvMerge_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvMerge (@var{src0}, @var{src1}, @var{src2}, @var{src3}, @var{dst})\n\
 @var{src0} is of type CvArr. @var{src1} is of type CvArr. @var{src2} is of type CvArr. @var{src3} is of type CvArr. @var{dst} is of type CvArr. \n\
@@ -8436,18 +8363,30 @@ const char* _wrap_OctSwigIterator_value_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = value (@var{self})\n\
 @var{self} is of type OctSwigIterator. @var{retval} is of type octave_value. \n\
 @end deftypefn";
-const char* _wrap_IplImage___eq_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_cvGetDims_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetDims (@var{arr})\n\
 @var{arr} is of type CvArr. @var{retval} is of type int. \n\
 @end deftypefn";
+const char* _wrap_CvPointVector___paren___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = __paren__ (@var{self}, @var{i})\n\
+@var{self} is of type CvPointVector. @var{i} is of type difference_type. @var{retval} is of type value_type. \n\
+@end deftypefn";
+const char* _wrap_FloatVector___paren___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = __paren__ (@var{self}, @var{i})\n\
+@var{self} is of type FloatVector. @var{i} is of type difference_type. @var{retval} is of type value_type. \n\
+@end deftypefn";
 const char* _wrap_cvInitIntrinsicParams2D_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvInitIntrinsicParams2D (@var{object_points}, @var{image_points}, @var{npoints}, @var{image_size}, @var{camera_matrix}, @var{aspect_ratio} = 1.)\n\
 @var{object_points} is of type CvMat. @var{image_points} is of type CvMat. @var{npoints} is of type CvMat. @var{image_size} is of type CvSize. @var{camera_matrix} is of type CvMat. @var{aspect_ratio} is of type double. \n\
 @end deftypefn";
+const char* _wrap_IplImage___xor___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator ^ (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type CvScalar. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_CvMat___xor___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator ^ (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type CvScalar. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvReadString_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvReadString (@var{node}, @var{default_value} = nil)\n\
 @var{node} is of type CvFileNode. @var{default_value} is of type char. @var{retval} is of type char. \n\
@@ -8488,10 +8427,6 @@ const char* _wrap_cvSubdiv2DSymEdge_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvSubdiv2DSymEdge (@var{edge})\n\
 @var{edge} is of type CvSubdiv2DEdge. @var{retval} is of type CvSubdiv2DEdge. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_get_width_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_width (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_cvPerspectiveTransform_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvPerspectiveTransform (@var{src}, @var{dst}, @var{mat})\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{mat} is of type CvMat. \n\
@@ -8500,6 +8435,26 @@ const char* _wrap_cvTransform_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvTransform (@var{src}, @var{dst}, @var{transmat}, @var{shiftvec} = nil)\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{transmat} is of type CvMat. @var{shiftvec} is of type CvMat. \n\
 @end deftypefn";
+const char* _wrap_IplImage___ne___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_CvSubdiv2DEdge_Wrapper___ne___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{x})\n\
+@var{self} is of type CvSubdiv2DEdge_Wrapper. @var{x} is of type CvSubdiv2DEdge_Wrapper. @var{retval} is of type bool. \n\
+@end deftypefn";
+const char* _wrap_CvRNG_Wrapper___ne___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{x})\n\
+@var{self} is of type CvRNG_Wrapper. @var{x} is of type CvRNG_Wrapper. @var{retval} is of type bool. \n\
+@end deftypefn";
+const char* _wrap_OctSwigIterator___ne___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{x})\n\
+@var{self} is of type OctSwigIterator. @var{x} is of type OctSwigIterator. @var{retval} is of type bool. \n\
+@end deftypefn";
+const char* _wrap_CvMat___ne___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvGetAffineTransform_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetAffineTransform (@var{src}, @var{dst}, @var{map_matrix})\n\
 @var{src} is of type CvPoint2D32f. @var{dst} is of type CvPoint2D32f. @var{map_matrix} is of type CvMat. @var{retval} is of type CvMat. \n\
@@ -8592,6 +8547,10 @@ const char* _wrap_delete_CvSubdiv2DPoint_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvSubdiv2DPoint::~CvSubdiv2DPoint (@var{self})\n\
 @var{self} is of type CvSubdiv2DPoint. \n\
 @end deftypefn";
+const char* _wrap_cvLSHAdd_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} cvLSHAdd (@var{lsh}, @var{data}, @var{indices} = 0)\n\
+@var{lsh} is of type CvLSH. @var{data} is of type CvMat. @var{indices} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvAddWeighted_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvAddWeighted (@var{src1}, @var{alpha}, @var{src2}, @var{beta}, @var{gamma}, @var{dst})\n\
 @var{src1} is of type CvArr. @var{alpha} is of type double. @var{src2} is of type CvArr. @var{beta} is of type double. @var{gamma} is of type double. @var{dst} is of type CvArr. \n\
@@ -8612,10 +8571,6 @@ const char* _wrap_cvCalcProbDensity_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvCalcProbDensity (@var{hist1}, @var{hist2}, @var{dst_hist}, @var{scale} = 255)\n\
 @var{hist1} is of type CvHistogram. @var{hist2} is of type CvHistogram. @var{dst_hist} is of type CvHistogram. @var{scale} is of type double. \n\
 @end deftypefn";
-const char* _wrap_IplImage___ge_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator >= (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_delete_CvChain_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvChain::~CvChain (@var{self})\n\
 @var{self} is of type CvChain. \n\
@@ -8680,14 +8635,22 @@ const char* _wrap_cvMulSpectrums_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvMulSpectrums (@var{src1}, @var{src2}, @var{dst}, @var{flags})\n\
 @var{src1} is of type CvArr. @var{src2} is of type CvArr. @var{dst} is of type CvArr. @var{flags} is of type int. \n\
 @end deftypefn";
-const char* _wrap_IplImage___gt_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator > (@var{self}, @var{val})\n\
+const char* _wrap_IplImage___mul___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator * (@var{self}, @var{val})\n\
 @var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
 @end deftypefn";
+const char* _wrap_CvMat___mul___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator * (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvRunningAvg_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvRunningAvg (@var{image}, @var{acc}, @var{alpha}, @var{mask} = nil)\n\
 @var{image} is of type CvArr. @var{acc} is of type CvArr. @var{alpha} is of type double. @var{mask} is of type CvArr. \n\
 @end deftypefn";
+const char* _wrap_delete_CvLSH_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} CvLSH (@var{self})\n\
+@var{self} is of type CvLSH. \n\
+@end deftypefn";
 const char* _wrap_new_CvMemBlock_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvMemBlock::CvMemBlock ()\n\
 @var{retval} is of type CvMemBlock. \n\
@@ -8728,6 +8691,10 @@ const char* _wrap_delete_CvMatND_dim_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvMatND_dim::~CvMatND_dim (@var{self})\n\
 @var{self} is of type CvMatND_dim. \n\
 @end deftypefn";
+const char* _wrap_cvCreateLSH_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvCreateLSH (@var{ops}, @var{d}, @var{L} = 10, @var{k} = 10, @var{type} = (((6) &((1 << 3) -1)) +(((1) -1) << 3)), @var{r} = 4, @var{seed} = -1)\n\
+@var{ops} is of type CvLSHOperations. @var{d} is of type int. @var{L} is of type int. @var{k} is of type int. @var{type} is of type int. @var{r} is of type double. @var{seed} is of type int64. @var{retval} is of type CvLSH. \n\
+@end deftypefn";
 const char* _wrap_CvImage_width_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = width (@var{self})\n\
 @var{self} is of type CvImage. @var{retval} is of type int. \n\
@@ -8740,10 +8707,6 @@ const char* _wrap_cvReadRawDataSlice_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvReadRawDataSlice (@var{fs}, @var{reader}, @var{count}, @var{dst}, @var{dt})\n\
 @var{fs} is of type CvFileStorage. @var{reader} is of type CvSeqReader. @var{count} is of type int. @var{dst} is of type void. @var{dt} is of type char. \n\
 @end deftypefn";
-const char* _wrap_CvLevMarq_init_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init (@var{self}, @var{nparams}, @var{nerrs})\n\
-@var{self} is of type CvLevMarq. @var{nparams} is of type int. @var{nerrs} is of type int. \n\
-@end deftypefn";
 const char* _wrap_cvErrorStr_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvErrorStr (@var{status})\n\
 @var{status} is of type int. @var{retval} is of type char. \n\
@@ -8872,10 +8835,6 @@ const char* _wrap_cvSetIdentity_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvSetIdentity (@var{mat}, @var{value} = cvRealScalar(1))\n\
 @var{mat} is of type CvArr. @var{value} is of type CvScalar. \n\
 @end deftypefn";
-const char* _wrap_CvMorphology_init_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} init (@var{self}, @var{_max_width}, @var{_src_type}, @var{_dst_type}, @var{_is_separable}, @var{_ksize})\n\
-@var{self} is of type CvMorphology. @var{_max_width} is of type int. @var{_src_type} is of type int. @var{_dst_type} is of type int. @var{_is_separable} is of type bool. @var{_ksize} is of type CvSize. \n\
-@end deftypefn";
 const char* _wrap_cvCmp_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvCmp (@var{src1}, @var{src2}, @var{dst}, @var{cmp_op})\n\
 @var{src1} is of type CvArr. @var{src2} is of type CvArr. @var{dst} is of type CvArr. @var{cmp_op} is of type int. \n\
@@ -8900,6 +8859,10 @@ const char* _wrap_new_CvFileNode_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvFileNode::CvFileNode ()\n\
 @var{retval} is of type CvFileNode. \n\
 @end deftypefn";
+const char* _wrap_OctSwigIterator___incr___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator ++ (@var{self})\n\
+@var{self} is of type OctSwigIterator. @var{retval} is of type OctSwigIterator. \n\
+@end deftypefn";
 const char* _wrap_CV_NODE_TYPE_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_NODE_TYPE (@var{flags})\n\
 @var{flags} is of type int. @var{retval} is of type int. \n\
@@ -8924,14 +8887,6 @@ const char* _wrap_cvFree_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvFree (@var{ptr})\n\
 @var{ptr} is of type void. \n\
 @end deftypefn";
-const char* _wrap_CvSepFilter_get_x_kernel_flags_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_x_kernel_flags (@var{self})\n\
-@var{self} is of type CvSepFilter. @var{retval} is of type int. \n\
-@end deftypefn";
-const char* _wrap_CvSepFilter_get_y_kernel_flags_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_y_kernel_flags (@var{self})\n\
-@var{self} is of type CvSepFilter. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_CvMatrix_set_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} set (@var{self}, @var{m}, @var{add_ref})\n\
 @var{self} is of type CvMatrix. @var{m} is of type CvMat. @var{add_ref} is of type bool. \n\
@@ -9044,10 +8999,6 @@ const char* _wrap_delete_CvSetElem_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvSetElem::~CvSetElem (@var{self})\n\
 @var{self} is of type CvSetElem. \n\
 @end deftypefn";
-const char* _wrap_CvBaseImageFilter_get_dst_type_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_dst_type (@var{self})\n\
-@var{self} is of type CvBaseImageFilter. @var{retval} is of type int. \n\
-@end deftypefn";
 const char* _wrap_CvMatrix_save_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} save (@var{self}, @var{filename}, @var{matname})\n\
 @var{self} is of type CvMatrix. @var{filename} is of type char. @var{matname} is of type char. \n\
@@ -9064,6 +9015,14 @@ const char* _wrap_cvSetAdd_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvSetAdd (@var{set_header}, @var{elem} = nil, @var{inserted_elem} = nil)\n\
 @var{set_header} is of type CvSet. @var{elem} is of type CvSetElem. @var{inserted_elem} is of type CvSetElem. @var{retval} is of type int. \n\
 @end deftypefn";
+const char* _wrap_IplImage___lt___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator < (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_CvMat___lt___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator < (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type double. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvGetElemType_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetElemType (@var{arr})\n\
 @var{arr} is of type CvArr. @var{retval} is of type int. \n\
@@ -9072,10 +9031,6 @@ const char* _wrap_cvIntegral_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvIntegral (@var{image}, @var{sum}, @var{sqsum} = nil, @var{tilted_sum} = nil)\n\
 @var{image} is of type CvArr. @var{sum} is of type CvArr. @var{sqsum} is of type CvArr. @var{tilted_sum} is of type CvArr. \n\
 @end deftypefn";
-const char* _wrap_IplImage___le_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator <= (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_cvReprojectImageTo3D_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvReprojectImageTo3D (@var{disparityImage}, @var{_3dImage}, @var{Q}, @var{handleMissingValues} = 0)\n\
 @var{disparityImage} is of type CvArr. @var{_3dImage} is of type CvArr. @var{Q} is of type CvMat. @var{handleMissingValues} is of type int. \n\
@@ -9128,10 +9083,6 @@ const char* _wrap_delete_CvMat_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvMat (@var{self})\n\
 @var{self} is of type CvMat. \n\
 @end deftypefn";
-const char* _wrap_IplImage___lt_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator < (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
-@end deftypefn";
 const char* _wrap_new_CvRect_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CvRect::CvRect ()\n\
 @var{retval} is of type CvRect. \n\
@@ -9200,6 +9151,10 @@ const char* _wrap_cvCreateMat_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvCreateMat (@var{rows}, @var{cols}, @var{type})\n\
 @var{rows} is of type int. @var{cols} is of type int. @var{type} is of type int. @var{retval} is of type CvMat. \n\
 @end deftypefn";
+const char* _wrap_cvCreateMemoryLSH_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvCreateMemoryLSH (@var{d}, @var{n}, @var{L} = 10, @var{k} = 10, @var{type} = (((6) &((1 << 3) -1)) +(((1) -1) << 3)), @var{r} = 4, @var{seed} = -1)\n\
+@var{d} is of type int. @var{n} is of type int. @var{L} is of type int. @var{k} is of type int. @var{type} is of type int. @var{r} is of type double. @var{seed} is of type int64. @var{retval} is of type CvLSH. \n\
+@end deftypefn";
 const char* _wrap_delete_CvContour_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvContour::~CvContour (@var{self})\n\
 @var{self} is of type CvContour. \n\
@@ -9264,6 +9219,18 @@ const char* _wrap_CV_IS_SPARSE_HIST_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = CV_IS_SPARSE_HIST (@var{hist})\n\
 @var{hist} is of type CvHistogram. @var{retval} is of type int. \n\
 @end deftypefn";
+const char* _wrap_IplImage___sub___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator - (@var{self}, @var{val})\n\
+@var{self} is of type . @var{val} is of type CvScalar. @var{retval} is of type . \n\
+@end deftypefn";
+const char* _wrap_OctSwigIterator___sub___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator - (@var{self}, @var{x})\n\
+@var{self} is of type OctSwigIterator. @var{x} is of type OctSwigIterator. @var{retval} is of type ptrdiff_t. \n\
+@end deftypefn";
+const char* _wrap_CvMat___sub___texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = operator - (@var{self}, @var{val})\n\
+@var{self} is of type CvMat. @var{val} is of type CvScalar. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvSeqInvert_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvSeqInvert (@var{seq})\n\
 @var{seq} is of type CvSeq. \n\
@@ -9272,14 +9239,6 @@ const char* _wrap_cvGraphAddVtx_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGraphAddVtx (@var{graph}, @var{vtx} = nil, @var{inserted_vtx} = nil)\n\
 @var{graph} is of type CvGraph. @var{vtx} is of type CvGraphVtx. @var{inserted_vtx} is of type CvGraphVtx. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_delete_CvModule_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvModule (@var{self})\n\
-@var{self} is of type CvModule. \n\
-@end deftypefn";
-const char* _wrap_new_CvModule_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = CvModule (@var{_info})\n\
-@var{_info} is of type CvModuleInfo. @var{retval} is of type CvModule. \n\
-@end deftypefn";
 const char* _wrap_cvRegisterModule_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvRegisterModule (@var{module_info})\n\
 @var{module_info} is of type CvModuleInfo. @var{retval} is of type int. \n\
@@ -9288,9 +9247,13 @@ const char* _wrap_cvGraphEdgeIdx_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGraphEdgeIdx (@var{graph}, @var{edge})\n\
 @var{graph} is of type CvGraph. @var{edge} is of type CvGraphEdge. @var{retval} is of type int. \n\
 @end deftypefn";
-const char* _wrap_IplImage___ne_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator != (@var{self}, @var{val})\n\
-@var{self} is of type . @var{val} is of type double. @var{retval} is of type . \n\
+const char* _wrap_new_CvModule_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = CvModule (@var{_info})\n\
+@var{_info} is of type CvModuleInfo. @var{retval} is of type CvModule. \n\
+@end deftypefn";
+const char* _wrap_delete_CvModule_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} CvModule (@var{self})\n\
+@var{self} is of type CvModule. \n\
 @end deftypefn";
 const char* _wrap_IplImage___pow___texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = __pow__ (@var{self}, @var{arg})\n\
@@ -9300,6 +9263,10 @@ const char* _wrap_CvMat___pow___texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = __pow__ (@var{self}, @var{arg})\n\
 @var{self} is of type CvMat. @var{arg} is of type double. @var{retval} is of type CvMat. \n\
 @end deftypefn";
+const char* _wrap_cvTriangulatePoints_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} cvTriangulatePoints (@var{projMatr1}, @var{projMatr2}, @var{projPoints1}, @var{projPoints2}, @var{points4D})\n\
+@var{projMatr1} is of type CvMat. @var{projMatr2} is of type CvMat. @var{projPoints1} is of type CvMat. @var{projPoints2} is of type CvMat. @var{points4D} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvMahalanobis_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvMahalanobis (@var{vec1}, @var{vec2}, @var{mat})\n\
 @var{vec1} is of type CvArr. @var{vec2} is of type CvArr. @var{mat} is of type CvArr. @var{retval} is of type double. \n\
@@ -9308,14 +9275,6 @@ const char* _wrap_cvReleaseStructuringElement_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvReleaseStructuringElement (@var{element})\n\
 @var{element} is of type . \n\
 @end deftypefn";
-const char* _wrap_CvMorphology_get_element_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = get_element (@var{self})\n\
-@var{self} is of type CvMorphology. @var{retval} is of type CvMat. \n\
-@end deftypefn";
-const char* _wrap_CvMorphology_init_binary_element_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} CvMorphology::init_binary_element (@var{_element}, @var{_element_shape})\n\
-@var{_element} is of type CvMat. @var{_element_shape} is of type int. \n\
-@end deftypefn";
 const char* _wrap_delete_CvSubdiv2DEdge_Wrapper_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} CvSubdiv2DEdge_Wrapper::~CvSubdiv2DEdge_Wrapper (@var{self})\n\
 @var{self} is of type CvSubdiv2DEdge_Wrapper. \n\
@@ -9400,18 +9359,6 @@ const char* _wrap_CvImage_data_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = data (@var{self})\n\
 @var{self} is of type CvImage. @var{retval} is of type uchar. \n\
 @end deftypefn";
-const char* _wrap_CvSubdiv2DEdge_Wrapper___eq_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{x})\n\
-@var{self} is of type CvSubdiv2DEdge_Wrapper. @var{x} is of type CvSubdiv2DEdge_Wrapper. @var{retval} is of type bool. \n\
-@end deftypefn";
-const char* _wrap_CvRNG_Wrapper___eq_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{x})\n\
-@var{self} is of type CvRNG_Wrapper. @var{x} is of type CvRNG_Wrapper. @var{retval} is of type bool. \n\
-@end deftypefn";
-const char* _wrap_OctSwigIterator___eq_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = operator == (@var{self}, @var{x})\n\
-@var{self} is of type OctSwigIterator. @var{x} is of type OctSwigIterator. @var{retval} is of type bool. \n\
-@end deftypefn";
 const char* _wrap_CvMatrix_cols_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cols (@var{self})\n\
 @var{self} is of type CvMatrix. @var{retval} is of type int. \n\
@@ -9536,10 +9483,6 @@ const char* _wrap_cvMulTransposed_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvMulTransposed (@var{src}, @var{dst}, @var{order}, @var{delta} = nil, @var{scale} = 1.)\n\
 @var{src} is of type CvArr. @var{dst} is of type CvArr. @var{order} is of type int. @var{delta} is of type CvArr. @var{scale} is of type double. \n\
 @end deftypefn";
-const char* _wrap_CvLevMarq_step_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} step (@var{self})\n\
-@var{self} is of type CvLevMarq. \n\
-@end deftypefn";
 const char* _wrap_CvMatrix_pix_size_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = pix_size (@var{self})\n\
 @var{self} is of type CvMatrix. @var{retval} is of type int. \n\
@@ -9556,8 +9499,8 @@ const char* _wrap_CvMatrix_show_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} show (@var{self}, @var{window_name})\n\
 @var{self} is of type CvMatrix. @var{window_name} is of type char. \n\
 @end deftypefn";
-const char* _wrap_cvCvToIplDepth_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = cvCvToIplDepth (@var{type})\n\
+const char* _wrap_cvIplDepth_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvIplDepth (@var{type})\n\
 @var{type} is of type int. @var{retval} is of type int. \n\
 @end deftypefn";
 const char* _wrap_new_CvConnectedComp_texinfo = "-*- texinfo -*-\n\
@@ -9714,10 +9657,7 @@ static octave_value_list _wrap_CvRNG_Wrapper_ref (const octave_value_list& args,
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper_ref" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
-  {
-    CvRNG &_result_ref = (arg1)->ref();
-    result = (CvRNG *) &_result_ref;
-  }
+  result = (CvRNG *) &(arg1)->ref();
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_long_long, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -9725,7 +9665,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRNG_Wrapper___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRNG_Wrapper___eq__ (const octave_value_list& args, int nargout) {
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -9737,20 +9677,20 @@ static octave_value_list _wrap_CvRNG_Wrapper___eq (const octave_value_list& args
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRNG_Wrapper___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRNG_Wrapper___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___eq" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___eq__" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvRNG_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___eq" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___eq__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___eq" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___eq__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   arg2 = (CvRNG_Wrapper *)(argp2);
   result = (bool)(arg1)->operator ==((CvRNG_Wrapper const &)*arg2);
@@ -9761,7 +9701,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRNG_Wrapper___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRNG_Wrapper___ne__ (const octave_value_list& args, int nargout) {
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -9773,20 +9713,20 @@ static octave_value_list _wrap_CvRNG_Wrapper___ne (const octave_value_list& args
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRNG_Wrapper___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRNG_Wrapper___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___ne" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___ne__" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvRNG_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___ne" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___ne__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___ne" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___ne__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   arg2 = (CvRNG_Wrapper *)(argp2);
   result = (bool)(arg1)->operator !=((CvRNG_Wrapper const &)*arg2);
@@ -9832,8 +9772,8 @@ fail:
 static swig_octave_member swig_CvRNG_Wrapper_members[] = {
 {"ptr",_wrap_CvRNG_Wrapper_ptr,0,0,0,0},
 {"ref",_wrap_CvRNG_Wrapper_ref,0,0,0,0},
-{"__eq",_wrap_CvRNG_Wrapper___eq,0,0,0,0},
-{"__ne",_wrap_CvRNG_Wrapper___ne,0,0,0,0},
+{"__eq__",_wrap_CvRNG_Wrapper___eq__,0,0,0,0},
+{"__ne__",_wrap_CvRNG_Wrapper___ne__,0,0,0,0},
 {0,0,0,0}
 };
 static const char *swig_CvRNG_Wrapper_base_names[] = {0};
@@ -9909,10 +9849,7 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper_ref (const octave_value_li
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper_ref" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
-  {
-    CvSubdiv2DEdge &_result_ref = (arg1)->ref();
-    result = (CvSubdiv2DEdge *) &_result_ref;
-  }
+  result = (CvSubdiv2DEdge *) &(arg1)->ref();
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_size_t, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -9920,7 +9857,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq__ (const octave_value_list& args, int nargout) {
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -9932,20 +9869,20 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq (const octave_value_l
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSubdiv2DEdge_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   arg2 = (CvSubdiv2DEdge_Wrapper *)(argp2);
   result = (bool)(arg1)->operator ==((CvSubdiv2DEdge_Wrapper const &)*arg2);
@@ -9956,7 +9893,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne__ (const octave_value_list& args, int nargout) {
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -9968,20 +9905,20 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne (const octave_value_l
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSubdiv2DEdge_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   arg2 = (CvSubdiv2DEdge_Wrapper *)(argp2);
   result = (bool)(arg1)->operator !=((CvSubdiv2DEdge_Wrapper const &)*arg2);
@@ -10027,8 +9964,8 @@ fail:
 static swig_octave_member swig_CvSubdiv2DEdge_Wrapper_members[] = {
 {"ptr",_wrap_CvSubdiv2DEdge_Wrapper_ptr,0,0,0,0},
 {"ref",_wrap_CvSubdiv2DEdge_Wrapper_ref,0,0,0,0},
-{"__eq",_wrap_CvSubdiv2DEdge_Wrapper___eq,0,0,0,0},
-{"__ne",_wrap_CvSubdiv2DEdge_Wrapper___ne,0,0,0,0},
+{"__eq__",_wrap_CvSubdiv2DEdge_Wrapper___eq__,0,0,0,0},
+{"__ne__",_wrap_CvSubdiv2DEdge_Wrapper___ne__,0,0,0,0},
 {0,0,0,0}
 };
 static const char *swig_CvSubdiv2DEdge_Wrapper_base_names[] = {0};
@@ -10536,7 +10473,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_OctSwigIterator___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_OctSwigIterator___eq__ (const octave_value_list& args, int nargout) {
   swig::OctSwigIterator *arg1 = (swig::OctSwigIterator *) 0 ;
   swig::OctSwigIterator *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -10548,20 +10485,20 @@ static octave_value_list _wrap_OctSwigIterator___eq (const octave_value_list& ar
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("OctSwigIterator___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("OctSwigIterator___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_swig__OctSwigIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___eq" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___eq__" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
   }
   arg1 = (swig::OctSwigIterator *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_swig__OctSwigIterator,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OctSwigIterator___eq" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OctSwigIterator___eq__" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OctSwigIterator___eq" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OctSwigIterator___eq__" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
   }
   arg2 = (swig::OctSwigIterator *)(argp2);
   result = (bool)((swig::OctSwigIterator const *)arg1)->operator ==((swig::OctSwigIterator const &)*arg2);
@@ -10572,7 +10509,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_OctSwigIterator___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_OctSwigIterator___ne__ (const octave_value_list& args, int nargout) {
   swig::OctSwigIterator *arg1 = (swig::OctSwigIterator *) 0 ;
   swig::OctSwigIterator *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -10584,20 +10521,20 @@ static octave_value_list _wrap_OctSwigIterator___ne (const octave_value_list& ar
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("OctSwigIterator___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("OctSwigIterator___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_swig__OctSwigIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___ne" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___ne__" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
   }
   arg1 = (swig::OctSwigIterator *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_swig__OctSwigIterator,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OctSwigIterator___ne" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OctSwigIterator___ne__" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OctSwigIterator___ne" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OctSwigIterator___ne__" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
   }
   arg2 = (swig::OctSwigIterator *)(argp2);
   result = (bool)((swig::OctSwigIterator const *)arg1)->operator !=((swig::OctSwigIterator const &)*arg2);
@@ -10608,7 +10545,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_OctSwigIterator___incr (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_OctSwigIterator___incr__ (const octave_value_list& args, int nargout) {
   swig::OctSwigIterator *arg1 = (swig::OctSwigIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10617,12 +10554,12 @@ static octave_value_list _wrap_OctSwigIterator___incr (const octave_value_list&
   octave_value _outv;
   swig::OctSwigIterator *result = 0 ;
   
-  if (!SWIG_check_num_args("OctSwigIterator___incr",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("OctSwigIterator___incr__",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_swig__OctSwigIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___incr" "', argument " "1"" of type '" "swig::OctSwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___incr__" "', argument " "1"" of type '" "swig::OctSwigIterator *""'"); 
   }
   arg1 = (swig::OctSwigIterator *)(argp1);
   result = (swig::OctSwigIterator *)(arg1)->operator ++();
@@ -10633,7 +10570,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_OctSwigIterator___decr (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_OctSwigIterator___decr__ (const octave_value_list& args, int nargout) {
   swig::OctSwigIterator *arg1 = (swig::OctSwigIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10642,12 +10579,12 @@ static octave_value_list _wrap_OctSwigIterator___decr (const octave_value_list&
   octave_value _outv;
   swig::OctSwigIterator *result = 0 ;
   
-  if (!SWIG_check_num_args("OctSwigIterator___decr",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("OctSwigIterator___decr__",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_swig__OctSwigIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___decr" "', argument " "1"" of type '" "swig::OctSwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___decr__" "', argument " "1"" of type '" "swig::OctSwigIterator *""'"); 
   }
   arg1 = (swig::OctSwigIterator *)(argp1);
   result = (swig::OctSwigIterator *)(arg1)->operator --();
@@ -10658,7 +10595,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_OctSwigIterator___add (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_OctSwigIterator___add__ (const octave_value_list& args, int nargout) {
   swig::OctSwigIterator *arg1 = (swig::OctSwigIterator *) 0 ;
   ptrdiff_t arg2 ;
   void *argp1 = 0 ;
@@ -10670,17 +10607,17 @@ static octave_value_list _wrap_OctSwigIterator___add (const octave_value_list& a
   octave_value _outv;
   swig::OctSwigIterator *result = 0 ;
   
-  if (!SWIG_check_num_args("OctSwigIterator___add",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("OctSwigIterator___add__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_swig__OctSwigIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___add" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___add__" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
   }
   arg1 = (swig::OctSwigIterator *)(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "OctSwigIterator___add" "', argument " "2"" of type '" "ptrdiff_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "OctSwigIterator___add__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = (ptrdiff_t)(val2);
   try {
@@ -10700,7 +10637,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_OctSwigIterator___sub__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_OctSwigIterator___sub____SWIG_0 (const octave_value_list& args, int nargout) {
   swig::OctSwigIterator *arg1 = (swig::OctSwigIterator *) 0 ;
   ptrdiff_t arg2 ;
   void *argp1 = 0 ;
@@ -10712,17 +10649,17 @@ static octave_value_list _wrap_OctSwigIterator___sub__SWIG_0 (const octave_value
   octave_value _outv;
   swig::OctSwigIterator *result = 0 ;
   
-  if (!SWIG_check_num_args("OctSwigIterator___sub",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("OctSwigIterator___sub__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_swig__OctSwigIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___sub" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___sub__" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
   }
   arg1 = (swig::OctSwigIterator *)(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "OctSwigIterator___sub" "', argument " "2"" of type '" "ptrdiff_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "OctSwigIterator___sub__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = (ptrdiff_t)(val2);
   try {
@@ -10742,7 +10679,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_OctSwigIterator___sub__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_OctSwigIterator___sub____SWIG_1 (const octave_value_list& args, int nargout) {
   swig::OctSwigIterator *arg1 = (swig::OctSwigIterator *) 0 ;
   swig::OctSwigIterator *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -10754,20 +10691,20 @@ static octave_value_list _wrap_OctSwigIterator___sub__SWIG_1 (const octave_value
   octave_value _outv;
   ptrdiff_t result;
   
-  if (!SWIG_check_num_args("OctSwigIterator___sub",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("OctSwigIterator___sub__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_swig__OctSwigIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___sub" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OctSwigIterator___sub__" "', argument " "1"" of type '" "swig::OctSwigIterator const *""'"); 
   }
   arg1 = (swig::OctSwigIterator *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_swig__OctSwigIterator,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OctSwigIterator___sub" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OctSwigIterator___sub__" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OctSwigIterator___sub" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OctSwigIterator___sub__" "', argument " "2"" of type '" "swig::OctSwigIterator const &""'"); 
   }
   arg2 = (swig::OctSwigIterator *)(argp2);
   result = ((swig::OctSwigIterator const *)arg1)->operator -((swig::OctSwigIterator const &)*arg2);
@@ -10778,7 +10715,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_OctSwigIterator___sub (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_OctSwigIterator___sub__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -10794,7 +10731,7 @@ static octave_value_list _wrap_OctSwigIterator___sub (const octave_value_list& a
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_swig__OctSwigIterator, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_OctSwigIterator___sub__SWIG_1(args, nargout);
+        return _wrap_OctSwigIterator___sub____SWIG_1(args, nargout);
       }
     }
   }
@@ -10809,7 +10746,7 @@ static octave_value_list _wrap_OctSwigIterator___sub (const octave_value_list& a
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_OctSwigIterator___sub__SWIG_0(args, nargout);
+        return _wrap_OctSwigIterator___sub____SWIG_0(args, nargout);
       }
     }
   }
@@ -10829,12 +10766,12 @@ static swig_octave_member swig_OctSwigIterator_members[] = {
 {"next",_wrap_OctSwigIterator_next,0,0,0,0},
 {"previous",_wrap_OctSwigIterator_previous,0,0,0,0},
 {"advance",_wrap_OctSwigIterator_advance,0,0,0,0},
-{"__eq",_wrap_OctSwigIterator___eq,0,0,0,0},
-{"__ne",_wrap_OctSwigIterator___ne,0,0,0,0},
-{"__incr",_wrap_OctSwigIterator___incr,0,0,0,0},
-{"__decr",_wrap_OctSwigIterator___decr,0,0,0,0},
-{"__add",_wrap_OctSwigIterator___add,0,0,0,0},
-{"__sub",_wrap_OctSwigIterator___sub,0,0,0,0},
+{"__eq__",_wrap_OctSwigIterator___eq__,0,0,0,0},
+{"__ne__",_wrap_OctSwigIterator___ne__,0,0,0,0},
+{"__incr__",_wrap_OctSwigIterator___incr__,0,0,0,0},
+{"__decr__",_wrap_OctSwigIterator___decr__,0,0,0,0},
+{"__add__",_wrap_OctSwigIterator___add__,0,0,0,0},
+{"__sub__",_wrap_OctSwigIterator___sub__,0,0,0,0},
 {0,0,0,0}
 };
 static const char *swig_OctSwigIterator_base_names[] = {0};
@@ -10872,7 +10809,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_FloatVector___paren (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_FloatVector___paren__ (const octave_value_list& args, int nargout) {
   std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   std::vector< float >::difference_type arg2 ;
   void *argp1 = 0 ;
@@ -10884,21 +10821,21 @@ static octave_value_list _wrap_FloatVector___paren (const octave_value_list& arg
   octave_value _outv;
   std::vector< float >::value_type result;
   
-  if (!SWIG_check_num_args("FloatVector___paren",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("FloatVector___paren__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___paren" "', argument " "1"" of type '" "std::vector< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___paren__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
   arg1 = (std::vector< float > *)(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___paren" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___paren__" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
   } 
   arg2 = (std::vector< float >::difference_type)(val2);
   try {
-    result = (std::vector< float >::value_type)std_vector_Sl_float_Sg____paren(arg1,arg2);
+    result = (std::vector< float >::value_type)std_vector_Sl_float_Sg____paren__(arg1,arg2);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -10911,7 +10848,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_FloatVector___paren_asgn (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_FloatVector___paren_asgn__ (const octave_value_list& args, int nargout) {
   std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   std::vector< float >::difference_type arg2 ;
   std::vector< float >::value_type arg3 ;
@@ -10925,26 +10862,26 @@ static octave_value_list _wrap_FloatVector___paren_asgn (const octave_value_list
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("FloatVector___paren_asgn",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("FloatVector___paren_asgn__",args.length(),3,3,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___paren_asgn" "', argument " "1"" of type '" "std::vector< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___paren_asgn__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
   arg1 = (std::vector< float > *)(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___paren_asgn" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___paren_asgn__" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
   } 
   arg2 = (std::vector< float >::difference_type)(val2);
   ecode3 = SWIG_AsVal_float(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___paren_asgn" "', argument " "3"" of type '" "std::vector< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___paren_asgn__" "', argument " "3"" of type '" "std::vector< float >::value_type""'");
   } 
   arg3 = (std::vector< float >::value_type)(val3);
   try {
-    std_vector_Sl_float_Sg____paren_asgn(arg1,arg2,arg3);
+    std_vector_Sl_float_Sg____paren_asgn__(arg1,arg2,arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -11628,10 +11565,7 @@ static octave_value_list _wrap_FloatVector_front (const octave_value_list& args,
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_front" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
   arg1 = (std::vector< float > *)(argp1);
-  {
-    std::vector< float >::value_type const &_result_ref = ((std::vector< float > const *)arg1)->front();
-    result = (std::vector< float >::value_type *) &_result_ref;
-  }
+  result = (std::vector< float >::value_type *) &((std::vector< float > const *)arg1)->front();
   _outv = SWIG_From_float((float)(*result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -11656,10 +11590,7 @@ static octave_value_list _wrap_FloatVector_back (const octave_value_list& args,
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_back" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
   arg1 = (std::vector< float > *)(argp1);
-  {
-    std::vector< float >::value_type const &_result_ref = ((std::vector< float > const *)arg1)->back();
-    result = (std::vector< float >::value_type *) &_result_ref;
-  }
+  result = (std::vector< float >::value_type *) &((std::vector< float > const *)arg1)->back();
   _outv = SWIG_From_float((float)(*result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -12050,8 +11981,8 @@ fail:
 
 static swig_octave_member swig_FloatVector_members[] = {
 {"pop",_wrap_FloatVector_pop,0,0,0,0},
-{"__paren",_wrap_FloatVector___paren,0,0,0,0},
-{"__paren_asgn",_wrap_FloatVector___paren_asgn,0,0,0,0},
+{"__paren__",_wrap_FloatVector___paren__,0,0,0,0},
+{"__paren_asgn__",_wrap_FloatVector___paren_asgn__,0,0,0,0},
 {"append",_wrap_FloatVector_append,0,0,0,0},
 {"empty",_wrap_FloatVector_empty,0,0,0,0},
 {"size",_wrap_FloatVector_size,0,0,0,0},
@@ -12109,7 +12040,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvPointVector___paren (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvPointVector___paren__ (const octave_value_list& args, int nargout) {
   std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   std::vector< CvPoint >::difference_type arg2 ;
   void *argp1 = 0 ;
@@ -12121,21 +12052,21 @@ static octave_value_list _wrap_CvPointVector___paren (const octave_value_list& a
   octave_value _outv;
   std::vector< CvPoint >::value_type result;
   
-  if (!SWIG_check_num_args("CvPointVector___paren",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvPointVector___paren__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___paren" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___paren__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
   arg1 = (std::vector< CvPoint > *)(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___paren" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___paren__" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
   arg2 = (std::vector< CvPoint >::difference_type)(val2);
   try {
-    result = std_vector_Sl_CvPoint_Sg____paren(arg1,arg2);
+    result = std_vector_Sl_CvPoint_Sg____paren__(arg1,arg2);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -12148,7 +12079,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvPointVector___paren_asgn (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvPointVector___paren_asgn__ (const octave_value_list& args, int nargout) {
   std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   std::vector< CvPoint >::difference_type arg2 ;
   std::vector< CvPoint >::value_type arg3 ;
@@ -12160,24 +12091,24 @@ static octave_value_list _wrap_CvPointVector___paren_asgn (const octave_value_li
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvPointVector___paren_asgn",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvPointVector___paren_asgn__",args.length(),3,3,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___paren_asgn" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___paren_asgn__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
   arg1 = (std::vector< CvPoint > *)(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___paren_asgn" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___paren_asgn__" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
   arg2 = (std::vector< CvPoint >::difference_type)(val2);
   {
     arg3 = OctObject_to_CvPoint(args(2));
   }
   try {
-    std_vector_Sl_CvPoint_Sg____paren_asgn(arg1,arg2,arg3);
+    std_vector_Sl_CvPoint_Sg____paren_asgn__(arg1,arg2,arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -12858,10 +12789,7 @@ static octave_value_list _wrap_CvPointVector_front (const octave_value_list& arg
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_front" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
   arg1 = (std::vector< CvPoint > *)(argp1);
-  {
-    std::vector< CvPoint >::value_type const &_result_ref = ((std::vector< CvPoint > const *)arg1)->front();
-    result = (std::vector< CvPoint >::value_type *) &_result_ref;
-  }
+  result = (std::vector< CvPoint >::value_type *) &((std::vector< CvPoint > const *)arg1)->front();
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -12886,10 +12814,7 @@ static octave_value_list _wrap_CvPointVector_back (const octave_value_list& args
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_back" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
   arg1 = (std::vector< CvPoint > *)(argp1);
-  {
-    std::vector< CvPoint >::value_type const &_result_ref = ((std::vector< CvPoint > const *)arg1)->back();
-    result = (std::vector< CvPoint >::value_type *) &_result_ref;
-  }
+  result = (std::vector< CvPoint >::value_type *) &((std::vector< CvPoint > const *)arg1)->back();
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -13281,8 +13206,8 @@ fail:
 
 static swig_octave_member swig_CvPointVector_members[] = {
 {"pop",_wrap_CvPointVector_pop,0,0,0,0},
-{"__paren",_wrap_CvPointVector___paren,0,0,0,0},
-{"__paren_asgn",_wrap_CvPointVector___paren_asgn,0,0,0,0},
+{"__paren__",_wrap_CvPointVector___paren__,0,0,0,0},
+{"__paren_asgn__",_wrap_CvPointVector___paren_asgn__,0,0,0,0},
 {"append",_wrap_CvPointVector_append,0,0,0,0},
 {"empty",_wrap_CvPointVector_empty,0,0,0,0},
 {"size",_wrap_CvPointVector_size,0,0,0,0},
@@ -15760,6 +15685,31 @@ fail:
 }
 
 
+static octave_value_list _wrap_CV_MAT_DEPTH (const octave_value_list& args, int nargout) {
+  int arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CV_MAT_DEPTH",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_int(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "CV_MAT_DEPTH" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  result = (int)CV_MAT_DEPTH(arg1);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CV_MAKETYPE (const octave_value_list& args, int nargout) {
   int arg1 ;
   int arg2 ;
@@ -15993,31 +15943,6 @@ fail:
 }
 
 
-static octave_value_list _wrap_CV_MAT_DEPTH (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CV_MAT_DEPTH",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "CV_MAT_DEPTH" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  result = (int)CV_MAT_DEPTH(arg1);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
 static octave_value_list _wrap_CV_MAT_TYPE (const octave_value_list& args, int nargout) {
   int arg1 ;
   int val1 ;
@@ -20347,7 +20272,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___add__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___add____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -20357,7 +20282,7 @@ static octave_value_list _wrap_IplImage___add__SWIG_0 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___add",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___add__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20397,7 +20322,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___mul__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___mul____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -20407,7 +20332,7 @@ static octave_value_list _wrap_IplImage___mul__SWIG_0 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___mul",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___mul__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20447,7 +20372,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___sub__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___sub____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -20457,7 +20382,7 @@ static octave_value_list _wrap_IplImage___sub__SWIG_0 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___sub",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___sub__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20497,7 +20422,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___div__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___div____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -20507,7 +20432,7 @@ static octave_value_list _wrap_IplImage___div__SWIG_0 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___div",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___div__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20547,7 +20472,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___xor__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___xor____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -20557,7 +20482,7 @@ static octave_value_list _wrap_IplImage___xor__SWIG_0 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___xor",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___xor__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20597,7 +20522,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___add__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___add____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
   IplImage header1 ;
@@ -20606,7 +20531,7 @@ static octave_value_list _wrap_IplImage___add__SWIG_1 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___add",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___add__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20640,7 +20565,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___add (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___add__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -20665,7 +20590,7 @@ static octave_value_list _wrap_IplImage___add (const octave_value_list& args, in
         }
       }
       if (_v) {
-        return _wrap_IplImage___add__SWIG_0(args, nargout);
+        return _wrap_IplImage___add____SWIG_0(args, nargout);
       }
     }
   }
@@ -20679,7 +20604,7 @@ static octave_value_list _wrap_IplImage___add (const octave_value_list& args, in
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvScalar, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IplImage___add__SWIG_1(args, nargout);
+        return _wrap_IplImage___add____SWIG_1(args, nargout);
       }
     }
   }
@@ -20689,7 +20614,7 @@ static octave_value_list _wrap_IplImage___add (const octave_value_list& args, in
 }
 
 
-static octave_value_list _wrap_IplImage___xor__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___xor____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
   IplImage header1 ;
@@ -20698,7 +20623,7 @@ static octave_value_list _wrap_IplImage___xor__SWIG_1 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___xor",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___xor__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20732,7 +20657,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___xor (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___xor__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -20757,7 +20682,7 @@ static octave_value_list _wrap_IplImage___xor (const octave_value_list& args, in
         }
       }
       if (_v) {
-        return _wrap_IplImage___xor__SWIG_0(args, nargout);
+        return _wrap_IplImage___xor____SWIG_0(args, nargout);
       }
     }
   }
@@ -20771,7 +20696,7 @@ static octave_value_list _wrap_IplImage___xor (const octave_value_list& args, in
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvScalar, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IplImage___xor__SWIG_1(args, nargout);
+        return _wrap_IplImage___xor____SWIG_1(args, nargout);
       }
     }
   }
@@ -20781,7 +20706,7 @@ static octave_value_list _wrap_IplImage___xor (const octave_value_list& args, in
 }
 
 
-static octave_value_list _wrap_IplImage___sub__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___sub____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
   IplImage header1 ;
@@ -20790,7 +20715,7 @@ static octave_value_list _wrap_IplImage___sub__SWIG_1 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___sub",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___sub__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20824,7 +20749,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___sub (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___sub__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -20849,7 +20774,7 @@ static octave_value_list _wrap_IplImage___sub (const octave_value_list& args, in
         }
       }
       if (_v) {
-        return _wrap_IplImage___sub__SWIG_0(args, nargout);
+        return _wrap_IplImage___sub____SWIG_0(args, nargout);
       }
     }
   }
@@ -20863,7 +20788,7 @@ static octave_value_list _wrap_IplImage___sub (const octave_value_list& args, in
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvScalar, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_IplImage___sub__SWIG_1(args, nargout);
+        return _wrap_IplImage___sub____SWIG_1(args, nargout);
       }
     }
   }
@@ -20873,7 +20798,7 @@ static octave_value_list _wrap_IplImage___sub (const octave_value_list& args, in
 }
 
 
-static octave_value_list _wrap_IplImage___ge__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___ge____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -20883,7 +20808,7 @@ static octave_value_list _wrap_IplImage___ge__SWIG_0 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___ge",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___ge__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20923,7 +20848,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___ge__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___ge____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
   IplImage header1 ;
@@ -20934,7 +20859,7 @@ static octave_value_list _wrap_IplImage___ge__SWIG_1 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___ge",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___ge__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -20948,7 +20873,7 @@ static octave_value_list _wrap_IplImage___ge__SWIG_1 (const octave_value_list& a
   }
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___ge" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___ge__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -20970,7 +20895,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___ge (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___ge__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -20995,7 +20920,7 @@ static octave_value_list _wrap_IplImage___ge (const octave_value_list& args, int
         }
       }
       if (_v) {
-        return _wrap_IplImage___ge__SWIG_0(args, nargout);
+        return _wrap_IplImage___ge____SWIG_0(args, nargout);
       }
     }
   }
@@ -21010,7 +20935,7 @@ static octave_value_list _wrap_IplImage___ge (const octave_value_list& args, int
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IplImage___ge__SWIG_1(args, nargout);
+        return _wrap_IplImage___ge____SWIG_1(args, nargout);
       }
     }
   }
@@ -21020,7 +20945,7 @@ static octave_value_list _wrap_IplImage___ge (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_IplImage___eq__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___eq____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -21030,7 +20955,7 @@ static octave_value_list _wrap_IplImage___eq__SWIG_0 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21070,7 +20995,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___eq__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___eq____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
   IplImage header1 ;
@@ -21081,7 +21006,7 @@ static octave_value_list _wrap_IplImage___eq__SWIG_1 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21095,7 +21020,7 @@ static octave_value_list _wrap_IplImage___eq__SWIG_1 (const octave_value_list& a
   }
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___eq" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___eq__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -21117,7 +21042,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___eq__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -21142,7 +21067,7 @@ static octave_value_list _wrap_IplImage___eq (const octave_value_list& args, int
         }
       }
       if (_v) {
-        return _wrap_IplImage___eq__SWIG_0(args, nargout);
+        return _wrap_IplImage___eq____SWIG_0(args, nargout);
       }
     }
   }
@@ -21157,7 +21082,7 @@ static octave_value_list _wrap_IplImage___eq (const octave_value_list& args, int
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IplImage___eq__SWIG_1(args, nargout);
+        return _wrap_IplImage___eq____SWIG_1(args, nargout);
       }
     }
   }
@@ -21167,7 +21092,7 @@ static octave_value_list _wrap_IplImage___eq (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_IplImage___le__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___le____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -21177,7 +21102,7 @@ static octave_value_list _wrap_IplImage___le__SWIG_0 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___le",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___le__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21217,7 +21142,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___le__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___le____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
   IplImage header1 ;
@@ -21228,7 +21153,7 @@ static octave_value_list _wrap_IplImage___le__SWIG_1 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___le",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___le__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21242,7 +21167,7 @@ static octave_value_list _wrap_IplImage___le__SWIG_1 (const octave_value_list& a
   }
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___le" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___le__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -21264,7 +21189,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___le (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___le__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -21289,7 +21214,7 @@ static octave_value_list _wrap_IplImage___le (const octave_value_list& args, int
         }
       }
       if (_v) {
-        return _wrap_IplImage___le__SWIG_0(args, nargout);
+        return _wrap_IplImage___le____SWIG_0(args, nargout);
       }
     }
   }
@@ -21304,7 +21229,7 @@ static octave_value_list _wrap_IplImage___le (const octave_value_list& args, int
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IplImage___le__SWIG_1(args, nargout);
+        return _wrap_IplImage___le____SWIG_1(args, nargout);
       }
     }
   }
@@ -21314,7 +21239,7 @@ static octave_value_list _wrap_IplImage___le (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_IplImage___ne__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___ne____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -21324,7 +21249,7 @@ static octave_value_list _wrap_IplImage___ne__SWIG_0 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21364,7 +21289,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___ne__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___ne____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
   IplImage header1 ;
@@ -21375,7 +21300,7 @@ static octave_value_list _wrap_IplImage___ne__SWIG_1 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21389,7 +21314,7 @@ static octave_value_list _wrap_IplImage___ne__SWIG_1 (const octave_value_list& a
   }
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___ne" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___ne__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -21411,7 +21336,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___ne__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -21436,7 +21361,7 @@ static octave_value_list _wrap_IplImage___ne (const octave_value_list& args, int
         }
       }
       if (_v) {
-        return _wrap_IplImage___ne__SWIG_0(args, nargout);
+        return _wrap_IplImage___ne____SWIG_0(args, nargout);
       }
     }
   }
@@ -21451,7 +21376,7 @@ static octave_value_list _wrap_IplImage___ne (const octave_value_list& args, int
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IplImage___ne__SWIG_1(args, nargout);
+        return _wrap_IplImage___ne____SWIG_1(args, nargout);
       }
     }
   }
@@ -21461,7 +21386,7 @@ static octave_value_list _wrap_IplImage___ne (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_IplImage___lt__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___lt____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -21471,7 +21396,7 @@ static octave_value_list _wrap_IplImage___lt__SWIG_0 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___lt",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___lt__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21511,7 +21436,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___lt__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___lt____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
   IplImage header1 ;
@@ -21522,7 +21447,7 @@ static octave_value_list _wrap_IplImage___lt__SWIG_1 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___lt",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___lt__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21536,7 +21461,7 @@ static octave_value_list _wrap_IplImage___lt__SWIG_1 (const octave_value_list& a
   }
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___lt" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___lt__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -21558,7 +21483,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___lt (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___lt__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -21583,7 +21508,7 @@ static octave_value_list _wrap_IplImage___lt (const octave_value_list& args, int
         }
       }
       if (_v) {
-        return _wrap_IplImage___lt__SWIG_0(args, nargout);
+        return _wrap_IplImage___lt____SWIG_0(args, nargout);
       }
     }
   }
@@ -21598,7 +21523,7 @@ static octave_value_list _wrap_IplImage___lt (const octave_value_list& args, int
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IplImage___lt__SWIG_1(args, nargout);
+        return _wrap_IplImage___lt____SWIG_1(args, nargout);
       }
     }
   }
@@ -21608,7 +21533,7 @@ static octave_value_list _wrap_IplImage___lt (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_IplImage___gt__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___gt____SWIG_0 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   IplImage header1 ;
@@ -21618,7 +21543,7 @@ static octave_value_list _wrap_IplImage___gt__SWIG_0 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___gt",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___gt__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21658,7 +21583,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___gt__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___gt____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
   IplImage header1 ;
@@ -21669,7 +21594,7 @@ static octave_value_list _wrap_IplImage___gt__SWIG_1 (const octave_value_list& a
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___gt",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___gt__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21683,7 +21608,7 @@ static octave_value_list _wrap_IplImage___gt__SWIG_1 (const octave_value_list& a
   }
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___gt" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___gt__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -21705,7 +21630,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___gt (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___gt__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -21730,7 +21655,7 @@ static octave_value_list _wrap_IplImage___gt (const octave_value_list& args, int
         }
       }
       if (_v) {
-        return _wrap_IplImage___gt__SWIG_0(args, nargout);
+        return _wrap_IplImage___gt____SWIG_0(args, nargout);
       }
     }
   }
@@ -21745,7 +21670,7 @@ static octave_value_list _wrap_IplImage___gt (const octave_value_list& args, int
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IplImage___gt__SWIG_1(args, nargout);
+        return _wrap_IplImage___gt____SWIG_1(args, nargout);
       }
     }
   }
@@ -21755,7 +21680,7 @@ static octave_value_list _wrap_IplImage___gt (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_IplImage___mul__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___mul____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
   IplImage header1 ;
@@ -21766,7 +21691,7 @@ static octave_value_list _wrap_IplImage___mul__SWIG_1 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___mul",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___mul__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21780,7 +21705,7 @@ static octave_value_list _wrap_IplImage___mul__SWIG_1 (const octave_value_list&
   }
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___mul" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___mul__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -21802,7 +21727,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___mul (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___mul__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -21827,7 +21752,7 @@ static octave_value_list _wrap_IplImage___mul (const octave_value_list& args, in
         }
       }
       if (_v) {
-        return _wrap_IplImage___mul__SWIG_0(args, nargout);
+        return _wrap_IplImage___mul____SWIG_0(args, nargout);
       }
     }
   }
@@ -21842,7 +21767,7 @@ static octave_value_list _wrap_IplImage___mul (const octave_value_list& args, in
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IplImage___mul__SWIG_1(args, nargout);
+        return _wrap_IplImage___mul____SWIG_1(args, nargout);
       }
     }
   }
@@ -21852,7 +21777,7 @@ static octave_value_list _wrap_IplImage___mul (const octave_value_list& args, in
 }
 
 
-static octave_value_list _wrap_IplImage___div__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___div____SWIG_1 (const octave_value_list& args, int nargout) {
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
   IplImage header1 ;
@@ -21863,7 +21788,7 @@ static octave_value_list _wrap_IplImage___div__SWIG_1 (const octave_value_list&
   octave_value _outv;
   IplImage *result = 0 ;
   
-  if (!SWIG_check_num_args("IplImage___div",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("IplImage___div__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   {
@@ -21877,7 +21802,7 @@ static octave_value_list _wrap_IplImage___div__SWIG_1 (const octave_value_list&
   }
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___div" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IplImage___div__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -21899,7 +21824,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_IplImage___div (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_IplImage___div__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -21924,7 +21849,7 @@ static octave_value_list _wrap_IplImage___div (const octave_value_list& args, in
         }
       }
       if (_v) {
-        return _wrap_IplImage___div__SWIG_0(args, nargout);
+        return _wrap_IplImage___div____SWIG_0(args, nargout);
       }
     }
   }
@@ -21939,7 +21864,7 @@ static octave_value_list _wrap_IplImage___div (const octave_value_list& args, in
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_IplImage___div__SWIG_1(args, nargout);
+        return _wrap_IplImage___div____SWIG_1(args, nargout);
       }
     }
   }
@@ -23758,17 +23683,17 @@ static swig_octave_member swig_IplImage_members[] = {
 {"roi",0,_wrap_IplImage_roi_get,_wrap_IplImage_roi_set,0,0},
 {"imageSize",0,_wrap_IplImage_imageSize_get,_wrap_IplImage_imageSize_set,0,0},
 {"widthStep",0,_wrap_IplImage_widthStep_get,_wrap_IplImage_widthStep_set,0,0},
-{"__add",_wrap_IplImage___add,0,0,0,0},
-{"__xor",_wrap_IplImage___xor,0,0,0,0},
-{"__sub",_wrap_IplImage___sub,0,0,0,0},
-{"__ge",_wrap_IplImage___ge,0,0,0,0},
-{"__eq",_wrap_IplImage___eq,0,0,0,0},
-{"__le",_wrap_IplImage___le,0,0,0,0},
-{"__ne",_wrap_IplImage___ne,0,0,0,0},
-{"__lt",_wrap_IplImage___lt,0,0,0,0},
-{"__gt",_wrap_IplImage___gt,0,0,0,0},
-{"__mul",_wrap_IplImage___mul,0,0,0,0},
-{"__div",_wrap_IplImage___div,0,0,0,0},
+{"__add__",_wrap_IplImage___add__,0,0,0,0},
+{"__xor__",_wrap_IplImage___xor__,0,0,0,0},
+{"__sub__",_wrap_IplImage___sub__,0,0,0,0},
+{"__ge__",_wrap_IplImage___ge__,0,0,0,0},
+{"__eq__",_wrap_IplImage___eq__,0,0,0,0},
+{"__le__",_wrap_IplImage___le__,0,0,0,0},
+{"__ne__",_wrap_IplImage___ne__,0,0,0,0},
+{"__lt__",_wrap_IplImage___lt__,0,0,0,0},
+{"__gt__",_wrap_IplImage___gt__,0,0,0,0},
+{"__mul__",_wrap_IplImage___mul__,0,0,0,0},
+{"__div__",_wrap_IplImage___div__,0,0,0,0},
 {"__radd__",_wrap_IplImage___radd__,0,0,0,0},
 {"__rsub__",_wrap_IplImage___rsub__,0,0,0,0},
 {"__rmul__",_wrap_IplImage___rmul__,0,0,0,0},
@@ -25172,6 +25097,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_depth_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_depth_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_depth_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_depth_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_depth_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_depth_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25205,6 +25170,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_nChannels_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_nChannels_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_nChannels_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_nChannels_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_nChannels_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_nChannels_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25238,6 +25243,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_dataOrder_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_dataOrder_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_dataOrder_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_dataOrder_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_dataOrder_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_dataOrder_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25271,6 +25316,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_origin_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_origin_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_origin_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_origin_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_origin_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_origin_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25304,6 +25389,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_width_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_width_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_width_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_width_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_width_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_width_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25337,6 +25462,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_height_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_height_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_height_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_height_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_height_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_height_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25370,6 +25535,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_imageSize_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_imageSize_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_imageSize_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_imageSize_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_imageSize_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_imageSize_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25403,6 +25608,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_widthStep_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_widthStep_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_widthStep_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_widthStep_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_widthStep_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_widthStep_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25436,6 +25681,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_rows_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_rows_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_rows_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_rows_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_rows_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_rows_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25469,6 +25754,46 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMat_cols_set (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMat_cols_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat_cols_set" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat_cols_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      CvMat_cols_set(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvMat_cols_get (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -25502,7 +25827,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___add__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___add____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -25513,12 +25838,12 @@ static octave_value_list _wrap_CvMat___add__SWIG_0 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___add",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___add__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___add" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___add__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -25546,7 +25871,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___mul__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___mul____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -25557,12 +25882,12 @@ static octave_value_list _wrap_CvMat___mul__SWIG_0 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___mul",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___mul__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___mul" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___mul__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -25590,7 +25915,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___sub__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___sub____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -25601,12 +25926,12 @@ static octave_value_list _wrap_CvMat___sub__SWIG_0 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___sub",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___sub__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___sub" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___sub__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -25634,7 +25959,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___div__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___div____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -25645,12 +25970,12 @@ static octave_value_list _wrap_CvMat___div__SWIG_0 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___div",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___div__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___div" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___div__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -25678,7 +26003,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___xor__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___xor____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -25689,12 +26014,12 @@ static octave_value_list _wrap_CvMat___xor__SWIG_0 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___xor",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___xor__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___xor" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___xor__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -25722,7 +26047,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___add__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___add____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
   void *argp1 = 0 ;
@@ -25732,12 +26057,12 @@ static octave_value_list _wrap_CvMat___add__SWIG_1 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___add",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___add__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___add" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___add__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -25759,7 +26084,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___add (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___add__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -25784,7 +26109,7 @@ static octave_value_list _wrap_CvMat___add (const octave_value_list& args, int n
         }
       }
       if (_v) {
-        return _wrap_CvMat___add__SWIG_0(args, nargout);
+        return _wrap_CvMat___add____SWIG_0(args, nargout);
       }
     }
   }
@@ -25798,7 +26123,7 @@ static octave_value_list _wrap_CvMat___add (const octave_value_list& args, int n
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvScalar, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_CvMat___add__SWIG_1(args, nargout);
+        return _wrap_CvMat___add____SWIG_1(args, nargout);
       }
     }
   }
@@ -25808,7 +26133,7 @@ static octave_value_list _wrap_CvMat___add (const octave_value_list& args, int n
 }
 
 
-static octave_value_list _wrap_CvMat___xor__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___xor____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
   void *argp1 = 0 ;
@@ -25818,12 +26143,12 @@ static octave_value_list _wrap_CvMat___xor__SWIG_1 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___xor",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___xor__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___xor" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___xor__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -25845,7 +26170,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___xor (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___xor__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -25870,7 +26195,7 @@ static octave_value_list _wrap_CvMat___xor (const octave_value_list& args, int n
         }
       }
       if (_v) {
-        return _wrap_CvMat___xor__SWIG_0(args, nargout);
+        return _wrap_CvMat___xor____SWIG_0(args, nargout);
       }
     }
   }
@@ -25884,7 +26209,7 @@ static octave_value_list _wrap_CvMat___xor (const octave_value_list& args, int n
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvScalar, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_CvMat___xor__SWIG_1(args, nargout);
+        return _wrap_CvMat___xor____SWIG_1(args, nargout);
       }
     }
   }
@@ -25894,7 +26219,7 @@ static octave_value_list _wrap_CvMat___xor (const octave_value_list& args, int n
 }
 
 
-static octave_value_list _wrap_CvMat___sub__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___sub____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
   void *argp1 = 0 ;
@@ -25904,12 +26229,12 @@ static octave_value_list _wrap_CvMat___sub__SWIG_1 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___sub",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___sub__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___sub" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___sub__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -25931,7 +26256,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___sub (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___sub__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -25956,7 +26281,7 @@ static octave_value_list _wrap_CvMat___sub (const octave_value_list& args, int n
         }
       }
       if (_v) {
-        return _wrap_CvMat___sub__SWIG_0(args, nargout);
+        return _wrap_CvMat___sub____SWIG_0(args, nargout);
       }
     }
   }
@@ -25970,7 +26295,7 @@ static octave_value_list _wrap_CvMat___sub (const octave_value_list& args, int n
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvScalar, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_CvMat___sub__SWIG_1(args, nargout);
+        return _wrap_CvMat___sub____SWIG_1(args, nargout);
       }
     }
   }
@@ -25980,7 +26305,7 @@ static octave_value_list _wrap_CvMat___sub (const octave_value_list& args, int n
 }
 
 
-static octave_value_list _wrap_CvMat___ge__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___ge____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -25991,12 +26316,12 @@ static octave_value_list _wrap_CvMat___ge__SWIG_0 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___ge",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___ge__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___ge" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___ge__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -26024,7 +26349,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___ge__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___ge____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -26036,17 +26361,17 @@ static octave_value_list _wrap_CvMat___ge__SWIG_1 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___ge",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___ge__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___ge" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___ge__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___ge" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___ge__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -26065,7 +26390,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___ge (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___ge__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -26090,7 +26415,7 @@ static octave_value_list _wrap_CvMat___ge (const octave_value_list& args, int na
         }
       }
       if (_v) {
-        return _wrap_CvMat___ge__SWIG_0(args, nargout);
+        return _wrap_CvMat___ge____SWIG_0(args, nargout);
       }
     }
   }
@@ -26105,7 +26430,7 @@ static octave_value_list _wrap_CvMat___ge (const octave_value_list& args, int na
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_CvMat___ge__SWIG_1(args, nargout);
+        return _wrap_CvMat___ge____SWIG_1(args, nargout);
       }
     }
   }
@@ -26115,7 +26440,7 @@ static octave_value_list _wrap_CvMat___ge (const octave_value_list& args, int na
 }
 
 
-static octave_value_list _wrap_CvMat___eq__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___eq____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -26126,12 +26451,12 @@ static octave_value_list _wrap_CvMat___eq__SWIG_0 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___eq" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___eq__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -26159,7 +26484,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___eq__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___eq____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -26171,17 +26496,17 @@ static octave_value_list _wrap_CvMat___eq__SWIG_1 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___eq" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___eq__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___eq" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___eq__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -26200,7 +26525,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___eq__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -26225,7 +26550,7 @@ static octave_value_list _wrap_CvMat___eq (const octave_value_list& args, int na
         }
       }
       if (_v) {
-        return _wrap_CvMat___eq__SWIG_0(args, nargout);
+        return _wrap_CvMat___eq____SWIG_0(args, nargout);
       }
     }
   }
@@ -26240,7 +26565,7 @@ static octave_value_list _wrap_CvMat___eq (const octave_value_list& args, int na
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_CvMat___eq__SWIG_1(args, nargout);
+        return _wrap_CvMat___eq____SWIG_1(args, nargout);
       }
     }
   }
@@ -26250,7 +26575,7 @@ static octave_value_list _wrap_CvMat___eq (const octave_value_list& args, int na
 }
 
 
-static octave_value_list _wrap_CvMat___le__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___le____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -26261,12 +26586,12 @@ static octave_value_list _wrap_CvMat___le__SWIG_0 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___le",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___le__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___le" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___le__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -26294,7 +26619,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___le__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___le____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -26306,17 +26631,17 @@ static octave_value_list _wrap_CvMat___le__SWIG_1 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___le",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___le__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___le" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___le__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___le" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___le__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -26335,7 +26660,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___le (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___le__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -26360,7 +26685,7 @@ static octave_value_list _wrap_CvMat___le (const octave_value_list& args, int na
         }
       }
       if (_v) {
-        return _wrap_CvMat___le__SWIG_0(args, nargout);
+        return _wrap_CvMat___le____SWIG_0(args, nargout);
       }
     }
   }
@@ -26375,7 +26700,7 @@ static octave_value_list _wrap_CvMat___le (const octave_value_list& args, int na
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_CvMat___le__SWIG_1(args, nargout);
+        return _wrap_CvMat___le____SWIG_1(args, nargout);
       }
     }
   }
@@ -26385,7 +26710,7 @@ static octave_value_list _wrap_CvMat___le (const octave_value_list& args, int na
 }
 
 
-static octave_value_list _wrap_CvMat___ne__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___ne____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -26396,12 +26721,12 @@ static octave_value_list _wrap_CvMat___ne__SWIG_0 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___ne" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___ne__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -26429,7 +26754,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___ne__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___ne____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -26441,17 +26766,17 @@ static octave_value_list _wrap_CvMat___ne__SWIG_1 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___ne" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___ne__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___ne" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___ne__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -26470,7 +26795,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___ne__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -26495,7 +26820,7 @@ static octave_value_list _wrap_CvMat___ne (const octave_value_list& args, int na
         }
       }
       if (_v) {
-        return _wrap_CvMat___ne__SWIG_0(args, nargout);
+        return _wrap_CvMat___ne____SWIG_0(args, nargout);
       }
     }
   }
@@ -26510,7 +26835,7 @@ static octave_value_list _wrap_CvMat___ne (const octave_value_list& args, int na
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_CvMat___ne__SWIG_1(args, nargout);
+        return _wrap_CvMat___ne____SWIG_1(args, nargout);
       }
     }
   }
@@ -26520,7 +26845,7 @@ static octave_value_list _wrap_CvMat___ne (const octave_value_list& args, int na
 }
 
 
-static octave_value_list _wrap_CvMat___lt__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___lt____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -26531,12 +26856,12 @@ static octave_value_list _wrap_CvMat___lt__SWIG_0 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___lt",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___lt__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___lt" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___lt__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -26564,7 +26889,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___lt__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___lt____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -26576,17 +26901,17 @@ static octave_value_list _wrap_CvMat___lt__SWIG_1 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___lt",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___lt__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___lt" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___lt__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___lt" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___lt__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -26605,7 +26930,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___lt (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___lt__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -26630,7 +26955,7 @@ static octave_value_list _wrap_CvMat___lt (const octave_value_list& args, int na
         }
       }
       if (_v) {
-        return _wrap_CvMat___lt__SWIG_0(args, nargout);
+        return _wrap_CvMat___lt____SWIG_0(args, nargout);
       }
     }
   }
@@ -26645,7 +26970,7 @@ static octave_value_list _wrap_CvMat___lt (const octave_value_list& args, int na
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_CvMat___lt__SWIG_1(args, nargout);
+        return _wrap_CvMat___lt____SWIG_1(args, nargout);
       }
     }
   }
@@ -26655,7 +26980,7 @@ static octave_value_list _wrap_CvMat___lt (const octave_value_list& args, int na
 }
 
 
-static octave_value_list _wrap_CvMat___gt__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___gt____SWIG_0 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   void *argp1 = 0 ;
@@ -26666,12 +26991,12 @@ static octave_value_list _wrap_CvMat___gt__SWIG_0 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___gt",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___gt__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___gt" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___gt__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   {
@@ -26699,7 +27024,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___gt__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___gt____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -26711,17 +27036,17 @@ static octave_value_list _wrap_CvMat___gt__SWIG_1 (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___gt",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___gt__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___gt" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___gt__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___gt" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___gt__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -26740,7 +27065,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___gt (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___gt__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -26765,7 +27090,7 @@ static octave_value_list _wrap_CvMat___gt (const octave_value_list& args, int na
         }
       }
       if (_v) {
-        return _wrap_CvMat___gt__SWIG_0(args, nargout);
+        return _wrap_CvMat___gt____SWIG_0(args, nargout);
       }
     }
   }
@@ -26780,7 +27105,7 @@ static octave_value_list _wrap_CvMat___gt (const octave_value_list& args, int na
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_CvMat___gt__SWIG_1(args, nargout);
+        return _wrap_CvMat___gt____SWIG_1(args, nargout);
       }
     }
   }
@@ -26790,7 +27115,7 @@ static octave_value_list _wrap_CvMat___gt (const octave_value_list& args, int na
 }
 
 
-static octave_value_list _wrap_CvMat___mul__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___mul____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -26802,17 +27127,17 @@ static octave_value_list _wrap_CvMat___mul__SWIG_1 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___mul",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___mul__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___mul" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___mul__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___mul" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___mul__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -26831,7 +27156,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___mul (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___mul__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -26856,7 +27181,7 @@ static octave_value_list _wrap_CvMat___mul (const octave_value_list& args, int n
         }
       }
       if (_v) {
-        return _wrap_CvMat___mul__SWIG_0(args, nargout);
+        return _wrap_CvMat___mul____SWIG_0(args, nargout);
       }
     }
   }
@@ -26871,7 +27196,7 @@ static octave_value_list _wrap_CvMat___mul (const octave_value_list& args, int n
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_CvMat___mul__SWIG_1(args, nargout);
+        return _wrap_CvMat___mul____SWIG_1(args, nargout);
       }
     }
   }
@@ -26881,7 +27206,7 @@ static octave_value_list _wrap_CvMat___mul (const octave_value_list& args, int n
 }
 
 
-static octave_value_list _wrap_CvMat___div__SWIG_1 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___div____SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -26893,17 +27218,17 @@ static octave_value_list _wrap_CvMat___div__SWIG_1 (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMat___div",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMat___div__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___div" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMat___div__" "', argument " "1"" of type '" "CvMat *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___div" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMat___div__" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = (double)(val2);
   {
@@ -26922,7 +27247,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMat___div (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMat___div__ (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[2]={
     octave_value_ref(args,0),octave_value_ref(args,1)
@@ -26947,7 +27272,7 @@ static octave_value_list _wrap_CvMat___div (const octave_value_list& args, int n
         }
       }
       if (_v) {
-        return _wrap_CvMat___div__SWIG_0(args, nargout);
+        return _wrap_CvMat___div____SWIG_0(args, nargout);
       }
     }
   }
@@ -26962,7 +27287,7 @@ static octave_value_list _wrap_CvMat___div (const octave_value_list& args, int n
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_CvMat___div__SWIG_1(args, nargout);
+        return _wrap_CvMat___div____SWIG_1(args, nargout);
       }
     }
   }
@@ -28707,27 +29032,27 @@ static swig_octave_member swig_CvMat_members[] = {
 {"refcount",0,_wrap_CvMat_refcount_get,_wrap_CvMat_refcount_set,0,0},
 {"hdr_refcount",0,_wrap_CvMat_hdr_refcount_get,_wrap_CvMat_hdr_refcount_set,0,0},
 {"data",0,_wrap_CvMat_data_get,octave_set_immutable,0,0},
-{"depth",0,_wrap_CvMat_depth_get,octave_set_immutable,0,0},
-{"nChannels",0,_wrap_CvMat_nChannels_get,octave_set_immutable,0,0},
-{"dataOrder",0,_wrap_CvMat_dataOrder_get,octave_set_immutable,0,0},
-{"origin",0,_wrap_CvMat_origin_get,octave_set_immutable,0,0},
-{"width",0,_wrap_CvMat_width_get,octave_set_immutable,0,0},
-{"height",0,_wrap_CvMat_height_get,octave_set_immutable,0,0},
-{"imageSize",0,_wrap_CvMat_imageSize_get,octave_set_immutable,0,0},
-{"widthStep",0,_wrap_CvMat_widthStep_get,octave_set_immutable,0,0},
-{"rows",0,_wrap_CvMat_rows_get,octave_set_immutable,0,0},
-{"cols",0,_wrap_CvMat_cols_get,octave_set_immutable,0,0},
-{"__add",_wrap_CvMat___add,0,0,0,0},
-{"__xor",_wrap_CvMat___xor,0,0,0,0},
-{"__sub",_wrap_CvMat___sub,0,0,0,0},
-{"__ge",_wrap_CvMat___ge,0,0,0,0},
-{"__eq",_wrap_CvMat___eq,0,0,0,0},
-{"__le",_wrap_CvMat___le,0,0,0,0},
-{"__ne",_wrap_CvMat___ne,0,0,0,0},
-{"__lt",_wrap_CvMat___lt,0,0,0,0},
-{"__gt",_wrap_CvMat___gt,0,0,0,0},
-{"__mul",_wrap_CvMat___mul,0,0,0,0},
-{"__div",_wrap_CvMat___div,0,0,0,0},
+{"depth",0,_wrap_CvMat_depth_get,_wrap_CvMat_depth_set,0,0},
+{"nChannels",0,_wrap_CvMat_nChannels_get,_wrap_CvMat_nChannels_set,0,0},
+{"dataOrder",0,_wrap_CvMat_dataOrder_get,_wrap_CvMat_dataOrder_set,0,0},
+{"origin",0,_wrap_CvMat_origin_get,_wrap_CvMat_origin_set,0,0},
+{"width",0,_wrap_CvMat_width_get,_wrap_CvMat_width_set,0,0},
+{"height",0,_wrap_CvMat_height_get,_wrap_CvMat_height_set,0,0},
+{"imageSize",0,_wrap_CvMat_imageSize_get,_wrap_CvMat_imageSize_set,0,0},
+{"widthStep",0,_wrap_CvMat_widthStep_get,_wrap_CvMat_widthStep_set,0,0},
+{"rows",0,_wrap_CvMat_rows_get,_wrap_CvMat_rows_set,0,0},
+{"cols",0,_wrap_CvMat_cols_get,_wrap_CvMat_cols_set,0,0},
+{"__add__",_wrap_CvMat___add__,0,0,0,0},
+{"__xor__",_wrap_CvMat___xor__,0,0,0,0},
+{"__sub__",_wrap_CvMat___sub__,0,0,0,0},
+{"__ge__",_wrap_CvMat___ge__,0,0,0,0},
+{"__eq__",_wrap_CvMat___eq__,0,0,0,0},
+{"__le__",_wrap_CvMat___le__,0,0,0,0},
+{"__ne__",_wrap_CvMat___ne__,0,0,0,0},
+{"__lt__",_wrap_CvMat___lt__,0,0,0,0},
+{"__gt__",_wrap_CvMat___gt__,0,0,0,0},
+{"__mul__",_wrap_CvMat___mul__,0,0,0,0},
+{"__div__",_wrap_CvMat___div__,0,0,0,0},
 {"__radd__",_wrap_CvMat___radd__,0,0,0,0},
 {"__rsub__",_wrap_CvMat___rsub__,0,0,0,0},
 {"__rmul__",_wrap_CvMat___rmul__,0,0,0,0},
@@ -29376,7 +29701,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvCvToIplDepth (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvIplDepth (const octave_value_list& args, int nargout) {
   int arg1 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -29385,17 +29710,17 @@ static octave_value_list _wrap_cvCvToIplDepth (const octave_value_list& args, in
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("cvCvToIplDepth",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvIplDepth",args.length(),1,1,0)) {
     SWIG_fail;
   }
   ecode1 = SWIG_AsVal_int(args(0), &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCvToIplDepth" "', argument " "1"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvIplDepth" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = (int)(val1);
   {
     try {
-      result = (int)cvCvToIplDepth(arg1); 
+      result = (int)cvIplDepth(arg1); 
     } 
     catch (...) 
     {
@@ -53516,8 +53841,8 @@ fail:
 static octave_value_list _wrap_cvSolvePoly (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 = (int) 0 ;
-  int arg4 = (int) 0 ;
+  int arg3 = (int) 20 ;
+  int arg4 = (int) 100 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -54953,7 +55278,7 @@ static octave_value_list _wrap_cvMahalanobis (const octave_value_list& args, int
   }
   {
     try {
-      result = (double)cvMahalanobis((void const *)arg1,(void const *)arg2,arg3); 
+      result = (double)cvMahalanobis((void const *)arg1,(void const *)arg2,(void const *)arg3); 
     } 
     catch (...) 
     {
@@ -56197,12 +56522,12 @@ static octave_value_list _wrap_cvSeqPush (const octave_value_list& args, int nar
   if (1<args.length()) {
     res2 = SWIG_ConvertPtr(args(1),SWIG_as_voidptrptr(&arg2), 0, 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPush" "', argument " "2"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPush" "', argument " "2"" of type '" "void const *""'"); 
     }
   }
   {
     try {
-      result = (schar *)cvSeqPush(arg1,arg2); 
+      result = (schar *)cvSeqPush(arg1,(void const *)arg2); 
     } 
     catch (...) 
     {
@@ -56246,12 +56571,12 @@ static octave_value_list _wrap_cvSeqPushFront (const octave_value_list& args, in
   if (1<args.length()) {
     res2 = SWIG_ConvertPtr(args(1),SWIG_as_voidptrptr(&arg2), 0, 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPushFront" "', argument " "2"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPushFront" "', argument " "2"" of type '" "void const *""'"); 
     }
   }
   {
     try {
-      result = (schar *)cvSeqPushFront(arg1,arg2); 
+      result = (schar *)cvSeqPushFront(arg1,(void const *)arg2); 
     } 
     catch (...) 
     {
@@ -56395,7 +56720,7 @@ static octave_value_list _wrap_cvSeqPushMulti (const octave_value_list& args, in
   }
   res2 = SWIG_ConvertPtr(args(1),SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPushMulti" "', argument " "2"" of type '" "void *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPushMulti" "', argument " "2"" of type '" "void const *""'"); 
   }
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
@@ -56411,7 +56736,7 @@ static octave_value_list _wrap_cvSeqPushMulti (const octave_value_list& args, in
   }
   {
     try {
-      cvSeqPushMulti(arg1,arg2,arg3,arg4); 
+      cvSeqPushMulti(arg1,(void const *)arg2,arg3,arg4); 
     } 
     catch (...) 
     {
@@ -56459,7 +56784,7 @@ static octave_value_list _wrap_cvSeqPopMulti (const octave_value_list& args, int
   }
   res2 = SWIG_ConvertPtr(args(1),SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPopMulti" "', argument " "2"" of type '" "void *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPopMulti" "', argument " "2"" of type '" "void const *""'"); 
   }
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
@@ -56475,7 +56800,7 @@ static octave_value_list _wrap_cvSeqPopMulti (const octave_value_list& args, int
   }
   {
     try {
-      cvSeqPopMulti(arg1,arg2,arg3,arg4); 
+      cvSeqPopMulti(arg1,(void const *)arg2,arg3,arg4); 
     } 
     catch (...) 
     {
@@ -56527,12 +56852,12 @@ static octave_value_list _wrap_cvSeqInsert (const octave_value_list& args, int n
   if (2<args.length()) {
     res3 = SWIG_ConvertPtr(args(2),SWIG_as_voidptrptr(&arg3), 0, 0);
     if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvSeqInsert" "', argument " "3"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvSeqInsert" "', argument " "3"" of type '" "void const *""'"); 
     }
   }
   {
     try {
-      result = (schar *)cvSeqInsert(arg1,arg2,arg3); 
+      result = (schar *)cvSeqInsert(arg1,arg2,(void const *)arg3); 
     } 
     catch (...) 
     {
@@ -64857,7 +65182,7 @@ static octave_value_list _wrap_cvSetImageIOFunctions (const octave_value_list& a
     }
   }
   {
-    int res = SWIG_ConvertFunctionPtr(args(2), (void**)(&arg3), SWIGTYPE_p_f_p_q_const__char_p_q_const__void__int);
+    int res = SWIG_ConvertFunctionPtr(args(2), (void**)(&arg3), SWIGTYPE_p_f_p_q_const__char_p_q_const__void_p_q_const__int__int);
     if (!SWIG_IsOK(res)) {
       SWIG_exception_fail(SWIG_ArgError(res), "in method '" "cvSetImageIOFunctions" "', argument " "3"" of type '" "CvSaveImageFunc""'"); 
     }
@@ -66164,7 +66489,67 @@ static octave_value_list _wrap_CvImage_read (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_CvImage_save (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvImage_save__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvImage *arg1 = (CvImage *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int *arg4 = (int *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvImage_save",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvImage_save" "', argument " "1"" of type '" "CvImage *""'"); 
+  }
+  arg1 = (CvImage *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(args(1), &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvImage_save" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = (char *)(buf2);
+  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvImage_save" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = (char *)(buf3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvImage_save" "', argument " "4"" of type '" "int const *""'"); 
+  }
+  arg4 = (int *)(argp4);
+  {
+    try {
+      (arg1)->save((char const *)arg2,(char const *)arg3,(int const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvImage_save__SWIG_1 (const octave_value_list& args, int nargout) {
   CvImage *arg1 = (CvImage *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -66216,6 +66601,57 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvImage_save (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[4]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
+  };
+  
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvImage, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvImage_save__SWIG_1(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvImage, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_int, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvImage_save__SWIG_0(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
 static octave_value_list _wrap_CvImage_write (const octave_value_list& args, int nargout) {
   CvImage *arg1 = (CvImage *) 0 ;
   CvFileStorage *arg2 = (CvFileStorage *) 0 ;
@@ -68936,7 +69372,67 @@ static octave_value_list _wrap_CvMatrix_read (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_CvMatrix_save (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvMatrix_save__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvMatrix *arg1 = (CvMatrix *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int *arg4 = (int *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvMatrix_save",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMatrix_save" "', argument " "1"" of type '" "CvMatrix *""'"); 
+  }
+  arg1 = (CvMatrix *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(args(1), &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvMatrix_save" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = (char *)(buf2);
+  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvMatrix_save" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = (char *)(buf3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvMatrix_save" "', argument " "4"" of type '" "int const *""'"); 
+  }
+  arg4 = (int *)(argp4);
+  {
+    try {
+      (arg1)->save((char const *)arg2,(char const *)arg3,(int const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvMatrix_save__SWIG_1 (const octave_value_list& args, int nargout) {
   CvMatrix *arg1 = (CvMatrix *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -68988,6 +69484,57 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvMatrix_save (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[4]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
+  };
+  
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMatrix, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvMatrix_save__SWIG_1(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMatrix, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_int, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvMatrix_save__SWIG_0(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
 static octave_value_list _wrap_CvMatrix_write (const octave_value_list& args, int nargout) {
   CvMatrix *arg1 = (CvMatrix *) 0 ;
   CvFileStorage *arg2 = (CvFileStorage *) 0 ;
@@ -82390,6 +82937,74 @@ fail:
 }
 
 
+static octave_value_list _wrap_cvLinearPolar (const octave_value_list& args, int nargout) {
+  CvArr *arg1 = (CvArr *) 0 ;
+  CvArr *arg2 = (CvArr *) 0 ;
+  CvPoint2D32f arg3 ;
+  double arg4 ;
+  int arg5 = (int) 1+8 ;
+  bool freearg1 = false ;
+  bool freearg2 = false ;
+  double val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("cvLinearPolar",args.length(),5,4,0)) {
+    SWIG_fail;
+  }
+  {
+    arg1 = OctObject_to_CvArr(args(0), &freearg1);
+  }
+  {
+    arg2 = OctObject_to_CvArr(args(1), &freearg2);
+  }
+  {
+    arg3 = OctObject_to_CvPoint2D32f(args(2));
+  }
+  ecode4 = SWIG_AsVal_double(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvLinearPolar" "', argument " "4"" of type '" "double""'");
+  } 
+  arg4 = (double)(val4);
+  if (4<args.length()) {
+    ecode5 = SWIG_AsVal_int(args(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvLinearPolar" "', argument " "5"" of type '" "int""'");
+    } 
+    arg5 = (int)(val5);
+  }
+  {
+    try {
+      cvLinearPolar((void const *)arg1,arg2,arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    if(arg1!=NULL && freearg1){
+      cvReleaseData( arg1 );
+      cvFree(&(arg1));
+    }
+  }
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_cvCreateStructuringElementEx (const octave_value_list& args, int nargout) {
   int arg1 ;
   int arg2 ;
@@ -89612,7 +90227,7 @@ static octave_value_list _wrap_cvFindFeatures (const octave_value_list& args, in
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  int arg5 = (int) 2 ;
+  int arg5 ;
   int arg6 = (int) 20 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -89630,7 +90245,7 @@ static octave_value_list _wrap_cvFindFeatures (const octave_value_list& args, in
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvFindFeatures",args.length(),6,4,0)) {
+  if (!SWIG_check_num_args("cvFindFeatures",args.length(),6,5,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvFeatureTree, 0 |  0 );
@@ -89640,7 +90255,7 @@ static octave_value_list _wrap_cvFindFeatures (const octave_value_list& args, in
   arg1 = (CvFeatureTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvFindFeatures" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvFindFeatures" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
@@ -89653,13 +90268,11 @@ static octave_value_list _wrap_cvFindFeatures (const octave_value_list& args, in
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvFindFeatures" "', argument " "4"" of type '" "CvMat *""'"); 
   }
   arg4 = (CvMat *)(argp4);
-  if (4<args.length()) {
-    ecode5 = SWIG_AsVal_int(args(4), &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvFindFeatures" "', argument " "5"" of type '" "int""'");
-    } 
-    arg5 = (int)(val5);
-  }
+  ecode5 = SWIG_AsVal_int(args(4), &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvFindFeatures" "', argument " "5"" of type '" "int""'");
+  } 
+  arg5 = (int)(val5);
   if (5<args.length()) {
     ecode6 = SWIG_AsVal_int(args(5), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -89669,7 +90282,7 @@ static octave_value_list _wrap_cvFindFeatures (const octave_value_list& args, in
   }
   {
     try {
-      cvFindFeatures(arg1,arg2,arg3,arg4,arg5,arg6); 
+      cvFindFeatures(arg1,(CvMat const *)arg2,arg3,arg4,arg5,arg6); 
     } 
     catch (...) 
     {
@@ -89740,6 +90353,415 @@ fail:
 }
 
 
+static octave_value_list _wrap_cvCreateLSH (const octave_value_list& args, int nargout) {
+  CvLSHOperations *arg1 = (CvLSHOperations *) 0 ;
+  int arg2 ;
+  int arg3 = (int) 10 ;
+  int arg4 = (int) 10 ;
+  int arg5 = (int) (((6) &((1 << 3) -1)) +(((1) -1) << 3)) ;
+  double arg6 = (double) 4 ;
+  int64 arg7 = (int64) -1 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  double val6 ;
+  int ecode6 = 0 ;
+  long long val7 ;
+  int ecode7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvLSH *result = 0 ;
+  
+  if (!SWIG_check_num_args("cvCreateLSH",args.length(),7,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLSHOperations, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCreateLSH" "', argument " "1"" of type '" "CvLSHOperations *""'"); 
+  }
+  arg1 = (CvLSHOperations *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvCreateLSH" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (2<args.length()) {
+    ecode3 = SWIG_AsVal_int(args(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvCreateLSH" "', argument " "3"" of type '" "int""'");
+    } 
+    arg3 = (int)(val3);
+  }
+  if (3<args.length()) {
+    ecode4 = SWIG_AsVal_int(args(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvCreateLSH" "', argument " "4"" of type '" "int""'");
+    } 
+    arg4 = (int)(val4);
+  }
+  if (4<args.length()) {
+    ecode5 = SWIG_AsVal_int(args(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvCreateLSH" "', argument " "5"" of type '" "int""'");
+    } 
+    arg5 = (int)(val5);
+  }
+  if (5<args.length()) {
+    ecode6 = SWIG_AsVal_double(args(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvCreateLSH" "', argument " "6"" of type '" "double""'");
+    } 
+    arg6 = (double)(val6);
+  }
+  if (6<args.length()) {
+    ecode7 = SWIG_AsVal_long_SS_long(args(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "cvCreateLSH" "', argument " "7"" of type '" "int64""'");
+    } 
+    arg7 = (int64)(val7);
+  }
+  {
+    try {
+      result = (CvLSH *)cvCreateLSH(arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLSH, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_cvCreateMemoryLSH (const octave_value_list& args, int nargout) {
+  int arg1 ;
+  int arg2 ;
+  int arg3 = (int) 10 ;
+  int arg4 = (int) 10 ;
+  int arg5 = (int) (((6) &((1 << 3) -1)) +(((1) -1) << 3)) ;
+  double arg6 = (double) 4 ;
+  int64 arg7 = (int64) -1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  double val6 ;
+  int ecode6 = 0 ;
+  long long val7 ;
+  int ecode7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvLSH *result = 0 ;
+  
+  if (!SWIG_check_num_args("cvCreateMemoryLSH",args.length(),7,2,0)) {
+    SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_int(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCreateMemoryLSH" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvCreateMemoryLSH" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (2<args.length()) {
+    ecode3 = SWIG_AsVal_int(args(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvCreateMemoryLSH" "', argument " "3"" of type '" "int""'");
+    } 
+    arg3 = (int)(val3);
+  }
+  if (3<args.length()) {
+    ecode4 = SWIG_AsVal_int(args(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvCreateMemoryLSH" "', argument " "4"" of type '" "int""'");
+    } 
+    arg4 = (int)(val4);
+  }
+  if (4<args.length()) {
+    ecode5 = SWIG_AsVal_int(args(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvCreateMemoryLSH" "', argument " "5"" of type '" "int""'");
+    } 
+    arg5 = (int)(val5);
+  }
+  if (5<args.length()) {
+    ecode6 = SWIG_AsVal_double(args(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvCreateMemoryLSH" "', argument " "6"" of type '" "double""'");
+    } 
+    arg6 = (double)(val6);
+  }
+  if (6<args.length()) {
+    ecode7 = SWIG_AsVal_long_SS_long(args(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "cvCreateMemoryLSH" "', argument " "7"" of type '" "int64""'");
+    } 
+    arg7 = (int64)(val7);
+  }
+  {
+    try {
+      result = (CvLSH *)cvCreateMemoryLSH(arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLSH, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_cvReleaseLSH (const octave_value_list& args, int nargout) {
+  CvLSH **arg1 = (CvLSH **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("cvReleaseLSH",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvLSH, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleaseLSH" "', argument " "1"" of type '" "CvLSH **""'"); 
+  }
+  arg1 = (CvLSH **)(argp1);
+  {
+    try {
+      cvReleaseLSH(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_LSHSize (const octave_value_list& args, int nargout) {
+  CvLSH *arg1 = (CvLSH *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  unsigned int result;
+  
+  if (!SWIG_check_num_args("LSHSize",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLSH, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LSHSize" "', argument " "1"" of type '" "CvLSH *""'"); 
+  }
+  arg1 = (CvLSH *)(argp1);
+  {
+    try {
+      result = (unsigned int)LSHSize(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_unsigned_SS_int((unsigned int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_cvLSHAdd (const octave_value_list& args, int nargout) {
+  CvLSH *arg1 = (CvLSH *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("cvLSHAdd",args.length(),3,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLSH, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvLSHAdd" "', argument " "1"" of type '" "CvLSH *""'"); 
+  }
+  arg1 = (CvLSH *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvLSHAdd" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  if (2<args.length()) {
+    res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvLSHAdd" "', argument " "3"" of type '" "CvMat *""'"); 
+    }
+    arg3 = (CvMat *)(argp3);
+  }
+  {
+    try {
+      cvLSHAdd(arg1,(CvMat const *)arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_cvLSHRemove (const octave_value_list& args, int nargout) {
+  CvLSH *arg1 = (CvLSH *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("cvLSHRemove",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLSH, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvLSHRemove" "', argument " "1"" of type '" "CvLSH *""'"); 
+  }
+  arg1 = (CvLSH *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvLSHRemove" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  {
+    try {
+      cvLSHRemove(arg1,(CvMat const *)arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_cvLSHQuery (const octave_value_list& args, int nargout) {
+  CvLSH *arg1 = (CvLSH *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  int arg5 ;
+  int arg6 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("cvLSHQuery",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLSH, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvLSHQuery" "', argument " "1"" of type '" "CvLSH *""'"); 
+  }
+  arg1 = (CvLSH *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvLSHQuery" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvLSHQuery" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvLSHQuery" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  ecode5 = SWIG_AsVal_int(args(4), &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvLSHQuery" "', argument " "5"" of type '" "int""'");
+  } 
+  arg5 = (int)(val5);
+  ecode6 = SWIG_AsVal_int(args(5), &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvLSHQuery" "', argument " "6"" of type '" "int""'");
+  } 
+  arg6 = (int)(val6);
+  {
+    try {
+      cvLSHQuery(arg1,(CvMat const *)arg2,arg3,arg4,arg5,arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvSURFPoint_pt_set (const octave_value_list& args, int nargout) {
   CvSURFPoint *arg1 = (CvSURFPoint *) 0 ;
   CvPoint2D32f *arg2 = (CvPoint2D32f *) 0 ;
@@ -90505,6 +91527,7 @@ static octave_value_list _wrap_cvExtractSURF (const octave_value_list& args, int
   CvSeq **arg4 = (CvSeq **) 0 ;
   CvMemStorage *arg5 = (CvMemStorage *) 0 ;
   CvSURFParams arg6 ;
+  int arg7 = (int) 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   void *vptr3 ;
@@ -90515,11 +91538,13 @@ static octave_value_list _wrap_cvExtractSURF (const octave_value_list& args, int
   int res5 = 0 ;
   void *argp6 ;
   int res6 = 0 ;
+  int val7 ;
+  int ecode7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvExtractSURF",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("cvExtractSURF",args.length(),7,6,0)) {
     SWIG_fail;
   }
   {
@@ -90558,9 +91583,16 @@ static octave_value_list _wrap_cvExtractSURF (const octave_value_list& args, int
       arg6 = *((CvSURFParams *)(argp6));
     }
   }
+  if (6<args.length()) {
+    ecode7 = SWIG_AsVal_int(args(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "cvExtractSURF" "', argument " "7"" of type '" "int""'");
+    } 
+    arg7 = (int)(val7);
+  }
   {
     try {
-      cvExtractSURF((void const *)arg1,(void const *)arg2,arg3,arg4,arg5,arg6); 
+      cvExtractSURF((void const *)arg1,(void const *)arg2,arg3,arg4,arg5,arg6,arg7); 
     } 
     catch (...) 
     {
@@ -90586,31 +91618,31 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarKeypoint_pt_set (const octave_value_list& args, int nargout) {
-  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
-  CvPoint *arg2 = (CvPoint *) 0 ;
+static octave_value_list _wrap_CvMSERParams_delta_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStarKeypoint_pt_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_delta_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_pt_set" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
-  }
-  arg1 = (CvStarKeypoint *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvPoint, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStarKeypoint_pt_set" "', argument " "2"" of type '" "CvPoint *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_delta_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg2 = (CvPoint *)(argp2);
-  if (arg1) (arg1)->pt = *arg2;
+  arg1 = (CvMSERParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_delta_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->delta = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -90618,33 +91650,33 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarKeypoint_pt_get (const octave_value_list& args, int nargout) {
-  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
+static octave_value_list _wrap_CvMSERParams_delta_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvPoint *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvStarKeypoint_pt_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_delta_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_pt_get" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_delta_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarKeypoint *)(argp1);
-  result = (CvPoint *)& ((arg1)->pt);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvPoint, 0 |  0 );
+  arg1 = (CvMSERParams *)(argp1);
+  result = (int) ((arg1)->delta);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStarKeypoint_size_set (const octave_value_list& args, int nargout) {
-  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
+static octave_value_list _wrap_CvMSERParams_maxArea_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -90654,20 +91686,20 @@ static octave_value_list _wrap_CvStarKeypoint_size_set (const octave_value_list&
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStarKeypoint_size_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_maxArea_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_size_set" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_maxArea_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarKeypoint *)(argp1);
+  arg1 = (CvMSERParams *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarKeypoint_size_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_maxArea_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->size = arg2;
+  if (arg1) (arg1)->maxArea = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -90675,8 +91707,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarKeypoint_size_get (const octave_value_list& args, int nargout) {
-  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
+static octave_value_list _wrap_CvMSERParams_maxArea_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -90684,15 +91716,15 @@ static octave_value_list _wrap_CvStarKeypoint_size_get (const octave_value_list&
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvStarKeypoint_size_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_maxArea_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_size_get" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_maxArea_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarKeypoint *)(argp1);
-  result = (int) ((arg1)->size);
+  arg1 = (CvMSERParams *)(argp1);
+  result = (int) ((arg1)->maxArea);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -90700,31 +91732,31 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarKeypoint_response_set (const octave_value_list& args, int nargout) {
-  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
-  float arg2 ;
+static octave_value_list _wrap_CvMSERParams_minArea_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  float val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStarKeypoint_response_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_minArea_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_response_set" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_minArea_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarKeypoint *)(argp1);
-  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  arg1 = (CvMSERParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarKeypoint_response_set" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_minArea_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (float)(val2);
-  if (arg1) (arg1)->response = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->minArea = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -90732,81 +91764,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarKeypoint_response_get (const octave_value_list& args, int nargout) {
-  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
+static octave_value_list _wrap_CvMSERParams_minArea_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvStarKeypoint_response_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_minArea_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_response_get" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
-  }
-  arg1 = (CvStarKeypoint *)(argp1);
-  result = (float) ((arg1)->response);
-  _outv = SWIG_From_float((float)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvStarKeypoint (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvStarKeypoint *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvStarKeypoint",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvStarKeypoint *)new CvStarKeypoint(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_minArea_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStarKeypoint, 1 |  0 );
+  arg1 = (CvMSERParams *)(argp1);
+  result = (int) ((arg1)->minArea);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvStarKeypoint (const octave_value_list& args, int nargout) {
-  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
+static octave_value_list _wrap_CvMSERParams_maxVariation_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
+  float arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("delete_CvStarKeypoint",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_maxVariation_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvStarKeypoint" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
-  }
-  arg1 = (CvStarKeypoint *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_maxVariation_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
+  arg1 = (CvMSERParams *)(argp1);
+  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_maxVariation_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = (float)(val2);
+  if (arg1) (arg1)->maxVariation = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -90814,86 +91821,56 @@ fail:
 }
 
 
-static swig_octave_member swig_CvStarKeypoint_members[] = {
-{"pt",0,_wrap_CvStarKeypoint_pt_get,_wrap_CvStarKeypoint_pt_set,0,0},
-{"size",0,_wrap_CvStarKeypoint_size_get,_wrap_CvStarKeypoint_size_set,0,0},
-{"response",0,_wrap_CvStarKeypoint_response_get,_wrap_CvStarKeypoint_response_set,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvStarKeypoint_base_names[] = {0};
-static const swig_type_info *swig_CvStarKeypoint_base[] = {0};
-static swig_octave_class _wrap_class_CvStarKeypoint = {"CvStarKeypoint", &SWIGTYPE_p_CvStarKeypoint,0,_wrap_new_CvStarKeypoint,0,_wrap_delete_CvStarKeypoint,swig_CvStarKeypoint_members,swig_CvStarKeypoint_base_names,swig_CvStarKeypoint_base };
-
-static octave_value_list _wrap_cvStarKeypoint (const octave_value_list& args, int nargout) {
-  CvPoint arg1 ;
-  int arg2 ;
-  float arg3 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  float val3 ;
-  int ecode3 = 0 ;
+static octave_value_list _wrap_CvMSERParams_maxVariation_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvStarKeypoint result;
+  float result;
   
-  if (!SWIG_check_num_args("cvStarKeypoint",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_maxVariation_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  {
-    arg1 = OctObject_to_CvPoint(args(0));
-  }
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvStarKeypoint" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_float(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvStarKeypoint" "', argument " "3"" of type '" "float""'");
-  } 
-  arg3 = (float)(val3);
-  {
-    try {
-      result = cvStarKeypoint(arg1,arg2,arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_maxVariation_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  _outv = SWIG_NewPointerObj((new CvStarKeypoint((const CvStarKeypoint&)(result))), SWIGTYPE_p_CvStarKeypoint, SWIG_POINTER_OWN |  0 );
+  arg1 = (CvMSERParams *)(argp1);
+  result = (float) ((arg1)->maxVariation);
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_maxSize_set (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_CvMSERParams_minDiversity_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
+  float arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
+  float val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_maxSize_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_minDiversity_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_maxSize_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_minDiversity_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  arg1 = (CvMSERParams *)(argp1);
+  ecode2 = SWIG_AsVal_float(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_maxSize_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_minDiversity_set" "', argument " "2"" of type '" "float""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->maxSize = arg2;
+  arg2 = (float)(val2);
+  if (arg1) (arg1)->minDiversity = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -90901,33 +91878,33 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_maxSize_get (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+static octave_value_list _wrap_CvMSERParams_minDiversity_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  float result;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_maxSize_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_minDiversity_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_maxSize_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_minDiversity_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
-  result = (int) ((arg1)->maxSize);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvMSERParams *)(argp1);
+  result = (float) ((arg1)->minDiversity);
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_responseThreshold_set (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+static octave_value_list _wrap_CvMSERParams_maxEvolution_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -90937,20 +91914,20 @@ static octave_value_list _wrap_CvStarDetectorParams_responseThreshold_set (const
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_responseThreshold_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_maxEvolution_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_responseThreshold_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_maxEvolution_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
+  arg1 = (CvMSERParams *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_responseThreshold_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_maxEvolution_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->responseThreshold = arg2;
+  if (arg1) (arg1)->maxEvolution = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -90958,8 +91935,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_responseThreshold_get (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+static octave_value_list _wrap_CvMSERParams_maxEvolution_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -90967,15 +91944,15 @@ static octave_value_list _wrap_CvStarDetectorParams_responseThreshold_get (const
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_responseThreshold_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_maxEvolution_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_responseThreshold_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_maxEvolution_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
-  result = (int) ((arg1)->responseThreshold);
+  arg1 = (CvMSERParams *)(argp1);
+  result = (int) ((arg1)->maxEvolution);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -90983,31 +91960,31 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_lineThresholdProjected_set (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_CvMSERParams_areaThreshold_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
+  double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
+  double val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_lineThresholdProjected_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_areaThreshold_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_lineThresholdProjected_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_areaThreshold_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  arg1 = (CvMSERParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_lineThresholdProjected_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_areaThreshold_set" "', argument " "2"" of type '" "double""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->lineThresholdProjected = arg2;
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->areaThreshold = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -91015,56 +91992,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_lineThresholdProjected_get (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+static octave_value_list _wrap_CvMSERParams_areaThreshold_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  double result;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_lineThresholdProjected_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_areaThreshold_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_lineThresholdProjected_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_areaThreshold_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
-  result = (int) ((arg1)->lineThresholdProjected);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvMSERParams *)(argp1);
+  result = (double) ((arg1)->areaThreshold);
+  _outv = SWIG_From_double((double)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_lineThresholdBinarized_set (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_CvMSERParams_minMargin_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
+  double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
+  double val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_lineThresholdBinarized_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_minMargin_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_lineThresholdBinarized_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_minMargin_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  arg1 = (CvMSERParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_lineThresholdBinarized_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_minMargin_set" "', argument " "2"" of type '" "double""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->lineThresholdBinarized = arg2;
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->minMargin = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -91072,33 +92049,33 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_lineThresholdBinarized_get (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+static octave_value_list _wrap_CvMSERParams_minMargin_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  double result;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_lineThresholdBinarized_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_minMargin_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_lineThresholdBinarized_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_minMargin_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
-  result = (int) ((arg1)->lineThresholdBinarized);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvMSERParams *)(argp1);
+  result = (double) ((arg1)->minMargin);
+  _outv = SWIG_From_double((double)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_suppressNonmaxSize_set (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+static octave_value_list _wrap_CvMSERParams_edgeBlurSize_set (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -91108,20 +92085,20 @@ static octave_value_list _wrap_CvStarDetectorParams_suppressNonmaxSize_set (cons
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_suppressNonmaxSize_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_edgeBlurSize_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_suppressNonmaxSize_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_edgeBlurSize_set" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
+  arg1 = (CvMSERParams *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_suppressNonmaxSize_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMSERParams_edgeBlurSize_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->suppressNonmaxSize = arg2;
+  if (arg1) (arg1)->edgeBlurSize = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -91129,8 +92106,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStarDetectorParams_suppressNonmaxSize_get (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+static octave_value_list _wrap_CvMSERParams_edgeBlurSize_get (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -91138,15 +92115,15 @@ static octave_value_list _wrap_CvStarDetectorParams_suppressNonmaxSize_get (cons
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvStarDetectorParams_suppressNonmaxSize_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMSERParams_edgeBlurSize_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_suppressNonmaxSize_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMSERParams_edgeBlurSize_get" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
-  result = (int) ((arg1)->suppressNonmaxSize);
+  arg1 = (CvMSERParams *)(argp1);
+  result = (int) ((arg1)->edgeBlurSize);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -91154,47 +92131,47 @@ fail:
 }
 
 
-static octave_value_list _wrap_new_CvStarDetectorParams (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvMSERParams (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvStarDetectorParams *result = 0 ;
+  CvMSERParams *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvStarDetectorParams",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("new_CvMSERParams",args.length(),0,0,0)) {
     SWIG_fail;
   }
   {
     try {
-      result = (CvStarDetectorParams *)new CvStarDetectorParams(); 
+      result = (CvMSERParams *)new CvMSERParams(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStarDetectorParams, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMSERParams, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvStarDetectorParams (const octave_value_list& args, int nargout) {
-  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+static octave_value_list _wrap_delete_CvMSERParams (const octave_value_list& args, int nargout) {
+  CvMSERParams *arg1 = (CvMSERParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("delete_CvStarDetectorParams",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("delete_CvMSERParams",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMSERParams, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvStarDetectorParams" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvMSERParams" "', argument " "1"" of type '" "CvMSERParams *""'"); 
   }
-  arg1 = (CvStarDetectorParams *)(argp1);
+  arg1 = (CvMSERParams *)(argp1);
   {
     try {
       delete arg1; 
@@ -91211,141 +92188,197 @@ fail:
 }
 
 
-static swig_octave_member swig_CvStarDetectorParams_members[] = {
-{"maxSize",0,_wrap_CvStarDetectorParams_maxSize_get,_wrap_CvStarDetectorParams_maxSize_set,0,0},
-{"responseThreshold",0,_wrap_CvStarDetectorParams_responseThreshold_get,_wrap_CvStarDetectorParams_responseThreshold_set,0,0},
-{"lineThresholdProjected",0,_wrap_CvStarDetectorParams_lineThresholdProjected_get,_wrap_CvStarDetectorParams_lineThresholdProjected_set,0,0},
-{"lineThresholdBinarized",0,_wrap_CvStarDetectorParams_lineThresholdBinarized_get,_wrap_CvStarDetectorParams_lineThresholdBinarized_set,0,0},
-{"suppressNonmaxSize",0,_wrap_CvStarDetectorParams_suppressNonmaxSize_get,_wrap_CvStarDetectorParams_suppressNonmaxSize_set,0,0},
+static swig_octave_member swig_CvMSERParams_members[] = {
+{"delta",0,_wrap_CvMSERParams_delta_get,_wrap_CvMSERParams_delta_set,0,0},
+{"maxArea",0,_wrap_CvMSERParams_maxArea_get,_wrap_CvMSERParams_maxArea_set,0,0},
+{"minArea",0,_wrap_CvMSERParams_minArea_get,_wrap_CvMSERParams_minArea_set,0,0},
+{"maxVariation",0,_wrap_CvMSERParams_maxVariation_get,_wrap_CvMSERParams_maxVariation_set,0,0},
+{"minDiversity",0,_wrap_CvMSERParams_minDiversity_get,_wrap_CvMSERParams_minDiversity_set,0,0},
+{"maxEvolution",0,_wrap_CvMSERParams_maxEvolution_get,_wrap_CvMSERParams_maxEvolution_set,0,0},
+{"areaThreshold",0,_wrap_CvMSERParams_areaThreshold_get,_wrap_CvMSERParams_areaThreshold_set,0,0},
+{"minMargin",0,_wrap_CvMSERParams_minMargin_get,_wrap_CvMSERParams_minMargin_set,0,0},
+{"edgeBlurSize",0,_wrap_CvMSERParams_edgeBlurSize_get,_wrap_CvMSERParams_edgeBlurSize_set,0,0},
 {0,0,0,0}
 };
-static const char *swig_CvStarDetectorParams_base_names[] = {0};
-static const swig_type_info *swig_CvStarDetectorParams_base[] = {0};
-static swig_octave_class _wrap_class_CvStarDetectorParams = {"CvStarDetectorParams", &SWIGTYPE_p_CvStarDetectorParams,0,_wrap_new_CvStarDetectorParams,0,_wrap_delete_CvStarDetectorParams,swig_CvStarDetectorParams_members,swig_CvStarDetectorParams_base_names,swig_CvStarDetectorParams_base };
-
-static octave_value_list _wrap_cvStarDetectorParams (const octave_value_list& args, int nargout) {
-  int arg1 = (int) 45 ;
-  int arg2 = (int) 30 ;
-  int arg3 = (int) 10 ;
-  int arg4 = (int) 8 ;
-  int arg5 = (int) 5 ;
+static const char *swig_CvMSERParams_base_names[] = {0};
+static const swig_type_info *swig_CvMSERParams_base[] = {0};
+static swig_octave_class _wrap_class_CvMSERParams = {"CvMSERParams", &SWIGTYPE_p_CvMSERParams,0,_wrap_new_CvMSERParams,0,_wrap_delete_CvMSERParams,swig_CvMSERParams_members,swig_CvMSERParams_base_names,swig_CvMSERParams_base };
+
+static octave_value_list _wrap_cvMSERParams (const octave_value_list& args, int nargout) {
+  int arg1 = (int) 5 ;
+  int arg2 = (int) 60 ;
+  int arg3 = (int) 14400 ;
+  float arg4 = (float) .25 ;
+  float arg5 = (float) .2 ;
+  int arg6 = (int) 200 ;
+  double arg7 = (double) 1.01 ;
+  double arg8 = (double) .003 ;
+  int arg9 = (int) 5 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  int val4 ;
+  float val4 ;
   int ecode4 = 0 ;
-  int val5 ;
+  float val5 ;
   int ecode5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
+  double val7 ;
+  int ecode7 = 0 ;
+  double val8 ;
+  int ecode8 = 0 ;
+  int val9 ;
+  int ecode9 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvStarDetectorParams result;
+  CvMSERParams result;
   
-  if (!SWIG_check_num_args("cvStarDetectorParams",args.length(),5,0,0)) {
+  if (!SWIG_check_num_args("cvMSERParams",args.length(),9,0,0)) {
     SWIG_fail;
   }
   if (0<args.length()) {
     ecode1 = SWIG_AsVal_int(args(0), &val1);
     if (!SWIG_IsOK(ecode1)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvStarDetectorParams" "', argument " "1"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvMSERParams" "', argument " "1"" of type '" "int""'");
     } 
     arg1 = (int)(val1);
   }
   if (1<args.length()) {
     ecode2 = SWIG_AsVal_int(args(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvStarDetectorParams" "', argument " "2"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvMSERParams" "', argument " "2"" of type '" "int""'");
     } 
     arg2 = (int)(val2);
   }
   if (2<args.length()) {
     ecode3 = SWIG_AsVal_int(args(2), &val3);
     if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvStarDetectorParams" "', argument " "3"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvMSERParams" "', argument " "3"" of type '" "int""'");
     } 
     arg3 = (int)(val3);
   }
   if (3<args.length()) {
-    ecode4 = SWIG_AsVal_int(args(3), &val4);
+    ecode4 = SWIG_AsVal_float(args(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvStarDetectorParams" "', argument " "4"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvMSERParams" "', argument " "4"" of type '" "float""'");
     } 
-    arg4 = (int)(val4);
+    arg4 = (float)(val4);
   }
   if (4<args.length()) {
-    ecode5 = SWIG_AsVal_int(args(4), &val5);
+    ecode5 = SWIG_AsVal_float(args(4), &val5);
     if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvStarDetectorParams" "', argument " "5"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvMSERParams" "', argument " "5"" of type '" "float""'");
     } 
-    arg5 = (int)(val5);
+    arg5 = (float)(val5);
+  }
+  if (5<args.length()) {
+    ecode6 = SWIG_AsVal_int(args(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvMSERParams" "', argument " "6"" of type '" "int""'");
+    } 
+    arg6 = (int)(val6);
+  }
+  if (6<args.length()) {
+    ecode7 = SWIG_AsVal_double(args(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "cvMSERParams" "', argument " "7"" of type '" "double""'");
+    } 
+    arg7 = (double)(val7);
+  }
+  if (7<args.length()) {
+    ecode8 = SWIG_AsVal_double(args(7), &val8);
+    if (!SWIG_IsOK(ecode8)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "cvMSERParams" "', argument " "8"" of type '" "double""'");
+    } 
+    arg8 = (double)(val8);
+  }
+  if (8<args.length()) {
+    ecode9 = SWIG_AsVal_int(args(8), &val9);
+    if (!SWIG_IsOK(ecode9)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "cvMSERParams" "', argument " "9"" of type '" "int""'");
+    } 
+    arg9 = (int)(val9);
   }
   {
     try {
-      result = cvStarDetectorParams(arg1,arg2,arg3,arg4,arg5); 
+      result = cvMSERParams(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj((new CvStarDetectorParams((const CvStarDetectorParams&)(result))), SWIGTYPE_p_CvStarDetectorParams, SWIG_POINTER_OWN |  0 );
+  _outv = SWIG_NewPointerObj((new CvMSERParams((const CvMSERParams&)(result))), SWIGTYPE_p_CvMSERParams, SWIG_POINTER_OWN |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvGetStarKeypoints (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvExtractMSER (const octave_value_list& args, int nargout) {
   CvArr *arg1 = (CvArr *) 0 ;
-  CvMemStorage *arg2 = (CvMemStorage *) 0 ;
-  CvStarDetectorParams arg3 = (CvStarDetectorParams) cvStarDetectorParams() ;
+  CvArr *arg2 = (CvArr *) 0 ;
+  CvSeq **arg3 = (CvSeq **) 0 ;
+  CvMemStorage *arg4 = (CvMemStorage *) 0 ;
+  CvMSERParams arg5 ;
   bool freearg1 = false ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 ;
-  int res3 = 0 ;
+  bool freearg2 = false ;
+  void *vptr3 ;
+  CvSeq *buffer3 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvSeq *result = 0 ;
   
-  if (!SWIG_check_num_args("cvGetStarKeypoints",args.length(),3,2,0)) {
+  if (!SWIG_check_num_args("cvExtractMSER",args.length(),5,5,0)) {
     SWIG_fail;
   }
   {
     arg1 = OctObject_to_CvArr(args(0), &freearg1);
   }
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMemStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvGetStarKeypoints" "', argument " "2"" of type '" "CvMemStorage *""'"); 
+  {
+    arg2 = OctObject_to_CvArr(args(1), &freearg2);
   }
-  arg2 = (CvMemStorage *)(argp2);
-  if (2<args.length()) {
-    {
-      res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvStarDetectorParams,  0 );
-      if (!SWIG_IsOK(res3)) {
-        SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvGetStarKeypoints" "', argument " "3"" of type '" "CvStarDetectorParams""'"); 
-      }  
-      if (!argp3) {
-        SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvGetStarKeypoints" "', argument " "3"" of type '" "CvStarDetectorParams""'");
-      } else {
-        arg3 = *((CvStarDetectorParams *)(argp3));
-      }
+  {
+    if ((SWIG_ConvertPtr(args(2), &vptr3, SWIGTYPE_p_CvSeq, 1)) == -1){
+      SWIG_fail;
+    }
+    buffer3 = (CvSeq *) vptr3;
+    arg3=&buffer3;
+  }
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMemStorage, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvExtractMSER" "', argument " "4"" of type '" "CvMemStorage *""'"); 
+  }
+  arg4 = (CvMemStorage *)(argp4);
+  {
+    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvMSERParams,  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvExtractMSER" "', argument " "5"" of type '" "CvMSERParams""'"); 
+    }  
+    if (!argp5) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvExtractMSER" "', argument " "5"" of type '" "CvMSERParams""'");
+    } else {
+      arg5 = *((CvMSERParams *)(argp5));
     }
   }
   {
     try {
-      result = (CvSeq *)cvGetStarKeypoints((void const *)arg1,arg2,arg3); 
+      cvExtractMSER(arg1,arg2,arg3,arg4,arg5); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSeq, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
   {
     if(arg1!=NULL && freearg1){
@@ -91353,205 +92386,124 @@ static octave_value_list _wrap_cvGetStarKeypoints (const octave_value_list& args
       cvFree(&(arg1));
     }
   }
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvLoadHaarClassifierCascade (const octave_value_list& args, int nargout) {
-  char *arg1 = (char *) 0 ;
-  CvSize arg2 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  void *argp2 ;
+static octave_value_list _wrap_CvStarKeypoint_pt_set (const octave_value_list& args, int nargout) {
+  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
+  CvPoint *arg2 = (CvPoint *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
   int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvHaarClassifierCascade *result = 0 ;
   
-  if (!SWIG_check_num_args("cvLoadHaarClassifierCascade",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStarKeypoint_pt_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_AsCharPtrAndSize(args(0), &buf1, NULL, &alloc1);
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvLoadHaarClassifierCascade" "', argument " "1"" of type '" "char const *""'");
-  }
-  arg1 = (char *)(buf1);
-  {
-    res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvLoadHaarClassifierCascade" "', argument " "2"" of type '" "CvSize""'"); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvLoadHaarClassifierCascade" "', argument " "2"" of type '" "CvSize""'");
-    } else {
-      arg2 = *((CvSize *)(argp2));
-    }
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_pt_set" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
   }
-  {
-    try {
-      result = (CvHaarClassifierCascade *)cvLoadHaarClassifierCascade((char const *)arg1,arg2); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  arg1 = (CvStarKeypoint *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvPoint, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStarKeypoint_pt_set" "', argument " "2"" of type '" "CvPoint *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvHaarClassifierCascade, 1 |  0 );
+  arg2 = (CvPoint *)(argp2);
+  if (arg1) (arg1)->pt = *arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvReleaseHaarClassifierCascade (const octave_value_list& args, int nargout) {
-  CvHaarClassifierCascade **arg1 = (CvHaarClassifierCascade **) 0 ;
+static octave_value_list _wrap_CvStarKeypoint_pt_get (const octave_value_list& args, int nargout) {
+  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvPoint *result = 0 ;
   
-  if (!SWIG_check_num_args("cvReleaseHaarClassifierCascade",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStarKeypoint_pt_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvHaarClassifierCascade, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleaseHaarClassifierCascade" "', argument " "1"" of type '" "CvHaarClassifierCascade **""'"); 
-  }
-  arg1 = (CvHaarClassifierCascade **)(argp1);
-  {
-    try {
-      cvReleaseHaarClassifierCascade(arg1); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_pt_get" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvStarKeypoint *)(argp1);
+  result = (CvPoint *)& ((arg1)->pt);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvPoint, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvSetImagesForHaarClassifierCascade (const octave_value_list& args, int nargout) {
-  CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  CvArr *arg2 = (CvArr *) 0 ;
-  CvArr *arg3 = (CvArr *) 0 ;
-  CvArr *arg4 = (CvArr *) 0 ;
-  double arg5 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool freearg2 = false ;
-  bool freearg3 = false ;
-  bool freearg4 = false ;
-  double val5 ;
-  int ecode5 = 0 ;
+static octave_value_list _wrap_CvStarKeypoint_size_set (const octave_value_list& args, int nargout) {
+  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvSetImagesForHaarClassifierCascade",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvStarKeypoint_size_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvSetImagesForHaarClassifierCascade" "', argument " "1"" of type '" "CvHaarClassifierCascade *""'"); 
-  }
-  arg1 = (CvHaarClassifierCascade *)(argp1);
-  {
-    arg2 = OctObject_to_CvArr(args(1), &freearg2);
-  }
-  {
-    arg3 = OctObject_to_CvArr(args(2), &freearg3);
-  }
-  {
-    arg4 = OctObject_to_CvArr(args(3), &freearg4);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_size_set" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
   }
-  ecode5 = SWIG_AsVal_double(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvSetImagesForHaarClassifierCascade" "', argument " "5"" of type '" "double""'");
+  arg1 = (CvStarKeypoint *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarKeypoint_size_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg5 = (double)(val5);
-  {
-    try {
-      cvSetImagesForHaarClassifierCascade(arg1,(void const *)arg2,(void const *)arg3,(void const *)arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->size = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  {
-    if(arg2!=NULL && freearg2){
-      cvReleaseData( arg2 );
-      cvFree(&(arg2));
-    }
-  }
-  {
-    if(arg3!=NULL && freearg3){
-      cvReleaseData( arg3 );
-      cvFree(&(arg3));
-    }
-  }
-  {
-    if(arg4!=NULL && freearg4){
-      cvReleaseData( arg4 );
-      cvFree(&(arg4));
-    }
-  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvRunHaarClassifierCascade (const octave_value_list& args, int nargout) {
-  CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  CvPoint arg2 ;
-  int arg3 = (int) 0 ;
+static octave_value_list _wrap_CvStarKeypoint_size_get (const octave_value_list& args, int nargout) {
+  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("cvRunHaarClassifierCascade",args.length(),3,2,0)) {
+  if (!SWIG_check_num_args("CvStarKeypoint_size_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRunHaarClassifierCascade" "', argument " "1"" of type '" "CvHaarClassifierCascade *""'"); 
-  }
-  arg1 = (CvHaarClassifierCascade *)(argp1);
-  {
-    arg2 = OctObject_to_CvPoint(args(1));
-  }
-  if (2<args.length()) {
-    ecode3 = SWIG_AsVal_int(args(2), &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvRunHaarClassifierCascade" "', argument " "3"" of type '" "int""'");
-    } 
-    arg3 = (int)(val3);
-  }
-  {
-    try {
-      result = (int)cvRunHaarClassifierCascade(arg1,arg2,arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_size_get" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
   }
+  arg1 = (CvStarKeypoint *)(argp1);
+  result = (int) ((arg1)->size);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -91559,271 +92511,107 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvUndistort2 (const octave_value_list& args, int nargout) {
-  CvArr *arg1 = (CvArr *) 0 ;
-  CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  bool freearg1 = false ;
-  bool freearg2 = false ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
+static octave_value_list _wrap_CvStarKeypoint_response_set (const octave_value_list& args, int nargout) {
+  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvUndistort2",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvStarKeypoint_response_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  {
-    arg1 = OctObject_to_CvArr(args(0), &freearg1);
-  }
-  {
-    arg2 = OctObject_to_CvArr(args(1), &freearg2);
-  }
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvUndistort2" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvUndistort2" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  {
-    try {
-      cvUndistort2((void const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_response_set" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
   }
+  arg1 = (CvStarKeypoint *)(argp1);
+  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarKeypoint_response_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = (float)(val2);
+  if (arg1) (arg1)->response = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  {
-    if(arg1!=NULL && freearg1){
-      cvReleaseData( arg1 );
-      cvFree(&(arg1));
-    }
-  }
-  {
-    if(arg2!=NULL && freearg2){
-      cvReleaseData( arg2 );
-      cvFree(&(arg2));
-    }
-  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvInitUndistortMap (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvArr *arg3 = (CvArr *) 0 ;
-  CvArr *arg4 = (CvArr *) 0 ;
+static octave_value_list _wrap_CvStarKeypoint_response_get (const octave_value_list& args, int nargout) {
+  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  bool freearg3 = false ;
-  bool freearg4 = false ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  float result;
   
-  if (!SWIG_check_num_args("cvInitUndistortMap",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvStarKeypoint_response_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvInitUndistortMap" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvInitUndistortMap" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  {
-    arg3 = OctObject_to_CvArr(args(2), &freearg3);
-  }
-  {
-    arg4 = OctObject_to_CvArr(args(3), &freearg4);
-  }
-  {
-    try {
-      cvInitUndistortMap((CvMat const *)arg1,(CvMat const *)arg2,arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarKeypoint_response_get" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvStarKeypoint *)(argp1);
+  result = (float) ((arg1)->response);
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  {
-    if(arg3!=NULL && freearg3){
-      cvReleaseData( arg3 );
-      cvFree(&(arg3));
-    }
-  }
-  {
-    if(arg4!=NULL && freearg4){
-      cvReleaseData( arg4 );
-      cvFree(&(arg4));
-    }
-  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvInitUndistortRectifyMap (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvArr *arg5 = (CvArr *) 0 ;
-  CvArr *arg6 = (CvArr *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  bool freearg5 = false ;
-  bool freearg6 = false ;
+static octave_value_list _wrap_new_CvStarKeypoint (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvStarKeypoint *result = 0 ;
   
-  if (!SWIG_check_num_args("cvInitUndistortRectifyMap",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("new_CvStarKeypoint",args.length(),0,0,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvInitUndistortRectifyMap" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvInitUndistortRectifyMap" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvInitUndistortRectifyMap" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvInitUndistortRectifyMap" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  {
-    arg5 = OctObject_to_CvArr(args(4), &freearg5);
-  }
-  {
-    arg6 = OctObject_to_CvArr(args(5), &freearg6);
-  }
   {
     try {
-      cvInitUndistortRectifyMap((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6); 
+      result = (CvStarKeypoint *)new CvStarKeypoint(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStarKeypoint, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  {
-    if(arg5!=NULL && freearg5){
-      cvReleaseData( arg5 );
-      cvFree(&(arg5));
-    }
-  }
-  {
-    if(arg6!=NULL && freearg6){
-      cvReleaseData( arg6 );
-      cvFree(&(arg6));
-    }
-  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvUndistortPoints (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
+static octave_value_list _wrap_delete_CvStarKeypoint (const octave_value_list& args, int nargout) {
+  CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvUndistortPoints",args.length(),6,4,0)) {
+  if (!SWIG_check_num_args("delete_CvStarKeypoint",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarKeypoint, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvUndistortPoints" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvUndistortPoints" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvUndistortPoints" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvUndistortPoints" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  if (4<args.length()) {
-    res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvUndistortPoints" "', argument " "5"" of type '" "CvMat const *""'"); 
-    }
-    arg5 = (CvMat *)(argp5);
-  }
-  if (5<args.length()) {
-    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvUndistortPoints" "', argument " "6"" of type '" "CvMat const *""'"); 
-    }
-    arg6 = (CvMat *)(argp6);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvStarKeypoint" "', argument " "1"" of type '" "CvStarKeypoint *""'"); 
   }
+  arg1 = (CvStarKeypoint *)(argp1);
   {
     try {
-      cvUndistortPoints((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6)
+      delete arg1
     } 
     catch (...) 
     {
@@ -91837,217 +92625,200 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvRodrigues2 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+static swig_octave_member swig_CvStarKeypoint_members[] = {
+{"pt",0,_wrap_CvStarKeypoint_pt_get,_wrap_CvStarKeypoint_pt_set,0,0},
+{"size",0,_wrap_CvStarKeypoint_size_get,_wrap_CvStarKeypoint_size_set,0,0},
+{"response",0,_wrap_CvStarKeypoint_response_get,_wrap_CvStarKeypoint_response_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvStarKeypoint_base_names[] = {0};
+static const swig_type_info *swig_CvStarKeypoint_base[] = {0};
+static swig_octave_class _wrap_class_CvStarKeypoint = {"CvStarKeypoint", &SWIGTYPE_p_CvStarKeypoint,0,_wrap_new_CvStarKeypoint,0,_wrap_delete_CvStarKeypoint,swig_CvStarKeypoint_members,swig_CvStarKeypoint_base_names,swig_CvStarKeypoint_base };
+
+static octave_value_list _wrap_cvStarKeypoint (const octave_value_list& args, int nargout) {
+  CvPoint arg1 ;
+  int arg2 ;
+  float arg3 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  CvStarKeypoint result;
   
-  if (!SWIG_check_num_args("cvRodrigues2",args.length(),3,2,0)) {
+  if (!SWIG_check_num_args("cvStarKeypoint",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRodrigues2" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvRodrigues2" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (2<args.length()) {
-    res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvRodrigues2" "', argument " "3"" of type '" "CvMat *""'"); 
-    }
-    arg3 = (CvMat *)(argp3);
+  {
+    arg1 = OctObject_to_CvPoint(args(0));
   }
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvStarKeypoint" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  ecode3 = SWIG_AsVal_float(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvStarKeypoint" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = (float)(val3);
   {
     try {
-      result = (int)cvRodrigues2((CvMat const *)arg1,arg2,arg3); 
+      result = cvStarKeypoint(arg1,arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_int((int)(result));
+  _outv = SWIG_NewPointerObj((new CvStarKeypoint((const CvStarKeypoint&)(result))), SWIGTYPE_p_CvStarKeypoint, SWIG_POINTER_OWN |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvFindHomography (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  int arg4 = (int) 0 ;
-  double arg5 = (double) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvStarDetectorParams_maxSize_set (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  double val5 ;
-  int ecode5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("cvFindHomography",args.length(),6,3,0)) {
+  if (!SWIG_check_num_args("CvStarDetectorParams_maxSize_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvFindHomography" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvFindHomography" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvFindHomography" "', argument " "3"" of type '" "CvMat *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  if (3<args.length()) {
-    ecode4 = SWIG_AsVal_int(args(3), &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvFindHomography" "', argument " "4"" of type '" "int""'");
-    } 
-    arg4 = (int)(val4);
-  }
-  if (4<args.length()) {
-    ecode5 = SWIG_AsVal_double(args(4), &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvFindHomography" "', argument " "5"" of type '" "double""'");
-    } 
-    arg5 = (double)(val5);
-  }
-  if (5<args.length()) {
-    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvFindHomography" "', argument " "6"" of type '" "CvMat *""'"); 
-    }
-    arg6 = (CvMat *)(argp6);
-  }
-  {
-    try {
-      result = (int)cvFindHomography((CvMat const *)arg1,(CvMat const *)arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_maxSize_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvStarDetectorParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_maxSize_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->maxSize = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvRQDecomp3x3 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) NULL ;
-  CvMat *arg5 = (CvMat *) NULL ;
-  CvMat *arg6 = (CvMat *) NULL ;
-  CvPoint3D64f *arg7 = (CvPoint3D64f *) NULL ;
+static octave_value_list _wrap_CvStarDetectorParams_maxSize_get (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("cvRQDecomp3x3",args.length(),7,3,0)) {
+  if (!SWIG_check_num_args("CvStarDetectorParams_maxSize_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRQDecomp3x3" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvRQDecomp3x3" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_maxSize_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvRQDecomp3x3" "', argument " "3"" of type '" "CvMat *""'"); 
+  arg1 = (CvStarDetectorParams *)(argp1);
+  result = (int) ((arg1)->maxSize);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStarDetectorParams_responseThreshold_set (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvStarDetectorParams_responseThreshold_set",args.length(),2,2,0)) {
+    SWIG_fail;
   }
-  arg3 = (CvMat *)(argp3);
-  if (3<args.length()) {
-    res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvRQDecomp3x3" "', argument " "4"" of type '" "CvMat *""'"); 
-    }
-    arg4 = (CvMat *)(argp4);
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_responseThreshold_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
-  if (4<args.length()) {
-    res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvRQDecomp3x3" "', argument " "5"" of type '" "CvMat *""'"); 
-    }
-    arg5 = (CvMat *)(argp5);
+  arg1 = (CvStarDetectorParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_responseThreshold_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->responseThreshold = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStarDetectorParams_responseThreshold_get (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvStarDetectorParams_responseThreshold_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (5<args.length()) {
-    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvRQDecomp3x3" "', argument " "6"" of type '" "CvMat *""'"); 
-    }
-    arg6 = (CvMat *)(argp6);
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_responseThreshold_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
-  if (6<args.length()) {
-    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvPoint3D64f, 0 |  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvRQDecomp3x3" "', argument " "7"" of type '" "CvPoint3D64f *""'"); 
-    }
-    arg7 = (CvPoint3D64f *)(argp7);
+  arg1 = (CvStarDetectorParams *)(argp1);
+  result = (int) ((arg1)->responseThreshold);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStarDetectorParams_lineThresholdProjected_set (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvStarDetectorParams_lineThresholdProjected_set",args.length(),2,2,0)) {
+    SWIG_fail;
   }
-  {
-    try {
-      cvRQDecomp3x3((CvMat const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_lineThresholdProjected_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
+  arg1 = (CvStarDetectorParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_lineThresholdProjected_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->lineThresholdProjected = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -92055,95 +92826,113 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvDecomposeProjectionMatrix (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) NULL ;
-  CvMat *arg6 = (CvMat *) NULL ;
-  CvMat *arg7 = (CvMat *) NULL ;
-  CvPoint3D64f *arg8 = (CvPoint3D64f *) NULL ;
+static octave_value_list _wrap_CvStarDetectorParams_lineThresholdProjected_get (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("cvDecomposeProjectionMatrix",args.length(),8,4,0)) {
+  if (!SWIG_check_num_args("CvStarDetectorParams_lineThresholdProjected_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvDecomposeProjectionMatrix" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvDecomposeProjectionMatrix" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvDecomposeProjectionMatrix" "', argument " "3"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_lineThresholdProjected_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvDecomposeProjectionMatrix" "', argument " "4"" of type '" "CvMat *""'"); 
+  arg1 = (CvStarDetectorParams *)(argp1);
+  result = (int) ((arg1)->lineThresholdProjected);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStarDetectorParams_lineThresholdBinarized_set (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvStarDetectorParams_lineThresholdBinarized_set",args.length(),2,2,0)) {
+    SWIG_fail;
   }
-  arg4 = (CvMat *)(argp4);
-  if (4<args.length()) {
-    res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvDecomposeProjectionMatrix" "', argument " "5"" of type '" "CvMat *""'"); 
-    }
-    arg5 = (CvMat *)(argp5);
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_lineThresholdBinarized_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
-  if (5<args.length()) {
-    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvDecomposeProjectionMatrix" "', argument " "6"" of type '" "CvMat *""'"); 
-    }
-    arg6 = (CvMat *)(argp6);
+  arg1 = (CvStarDetectorParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_lineThresholdBinarized_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->lineThresholdBinarized = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStarDetectorParams_lineThresholdBinarized_get (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvStarDetectorParams_lineThresholdBinarized_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (6<args.length()) {
-    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvDecomposeProjectionMatrix" "', argument " "7"" of type '" "CvMat *""'"); 
-    }
-    arg7 = (CvMat *)(argp7);
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_lineThresholdBinarized_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
-  if (7<args.length()) {
-    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvPoint3D64f, 0 |  0 );
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvDecomposeProjectionMatrix" "', argument " "8"" of type '" "CvPoint3D64f *""'"); 
-    }
-    arg8 = (CvPoint3D64f *)(argp8);
+  arg1 = (CvStarDetectorParams *)(argp1);
+  result = (int) ((arg1)->lineThresholdBinarized);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStarDetectorParams_suppressNonmaxSize_set (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvStarDetectorParams_suppressNonmaxSize_set",args.length(),2,2,0)) {
+    SWIG_fail;
   }
-  {
-    try {
-      cvDecomposeProjectionMatrix((CvMat const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_suppressNonmaxSize_set" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
+  arg1 = (CvStarDetectorParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStarDetectorParams_suppressNonmaxSize_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->suppressNonmaxSize = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -92151,201 +92940,75 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvCalcMatMulDeriv (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvStarDetectorParams_suppressNonmaxSize_get (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("cvCalcMatMulDeriv",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvStarDetectorParams_suppressNonmaxSize_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCalcMatMulDeriv" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCalcMatMulDeriv" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvCalcMatMulDeriv" "', argument " "3"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStarDetectorParams_suppressNonmaxSize_get" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvCalcMatMulDeriv" "', argument " "4"" of type '" "CvMat *""'"); 
+  arg1 = (CvStarDetectorParams *)(argp1);
+  result = (int) ((arg1)->suppressNonmaxSize);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvStarDetectorParams (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvStarDetectorParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvStarDetectorParams",args.length(),0,0,0)) {
+    SWIG_fail;
   }
-  arg4 = (CvMat *)(argp4);
   {
     try {
-      cvCalcMatMulDeriv((CvMat const *)arg1,(CvMat const *)arg2,arg3,arg4); 
+      result = (CvStarDetectorParams *)new CvStarDetectorParams(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStarDetectorParams, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvComposeRT (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
-  CvMat *arg9 = (CvMat *) 0 ;
-  CvMat *arg10 = (CvMat *) 0 ;
-  CvMat *arg11 = (CvMat *) 0 ;
-  CvMat *arg12 = (CvMat *) 0 ;
-  CvMat *arg13 = (CvMat *) 0 ;
-  CvMat *arg14 = (CvMat *) 0 ;
+static octave_value_list _wrap_delete_CvStarDetectorParams (const octave_value_list& args, int nargout) {
+  CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 = 0 ;
-  int res9 = 0 ;
-  void *argp10 = 0 ;
-  int res10 = 0 ;
-  void *argp11 = 0 ;
-  int res11 = 0 ;
-  void *argp12 = 0 ;
-  int res12 = 0 ;
-  void *argp13 = 0 ;
-  int res13 = 0 ;
-  void *argp14 = 0 ;
-  int res14 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvComposeRT",args.length(),14,6,0)) {
+  if (!SWIG_check_num_args("delete_CvStarDetectorParams",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStarDetectorParams, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvComposeRT" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvComposeRT" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvComposeRT" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvComposeRT" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvComposeRT" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvComposeRT" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  if (6<args.length()) {
-    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvComposeRT" "', argument " "7"" of type '" "CvMat *""'"); 
-    }
-    arg7 = (CvMat *)(argp7);
-  }
-  if (7<args.length()) {
-    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvComposeRT" "', argument " "8"" of type '" "CvMat *""'"); 
-    }
-    arg8 = (CvMat *)(argp8);
-  }
-  if (8<args.length()) {
-    res9 = SWIG_ConvertPtr(args(8), &argp9,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvComposeRT" "', argument " "9"" of type '" "CvMat *""'"); 
-    }
-    arg9 = (CvMat *)(argp9);
-  }
-  if (9<args.length()) {
-    res10 = SWIG_ConvertPtr(args(9), &argp10,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "cvComposeRT" "', argument " "10"" of type '" "CvMat *""'"); 
-    }
-    arg10 = (CvMat *)(argp10);
-  }
-  if (10<args.length()) {
-    res11 = SWIG_ConvertPtr(args(10), &argp11,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res11)) {
-      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "cvComposeRT" "', argument " "11"" of type '" "CvMat *""'"); 
-    }
-    arg11 = (CvMat *)(argp11);
-  }
-  if (11<args.length()) {
-    res12 = SWIG_ConvertPtr(args(11), &argp12,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res12)) {
-      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "cvComposeRT" "', argument " "12"" of type '" "CvMat *""'"); 
-    }
-    arg12 = (CvMat *)(argp12);
-  }
-  if (12<args.length()) {
-    res13 = SWIG_ConvertPtr(args(12), &argp13,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res13)) {
-      SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "cvComposeRT" "', argument " "13"" of type '" "CvMat *""'"); 
-    }
-    arg13 = (CvMat *)(argp13);
-  }
-  if (13<args.length()) {
-    res14 = SWIG_ConvertPtr(args(13), &argp14,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res14)) {
-      SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "cvComposeRT" "', argument " "14"" of type '" "CvMat *""'"); 
-    }
-    arg14 = (CvMat *)(argp14);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvStarDetectorParams" "', argument " "1"" of type '" "CvStarDetectorParams *""'"); 
   }
+  arg1 = (CvStarDetectorParams *)(argp1);
   {
     try {
-      cvComposeRT((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14)
+      delete arg1
     } 
     catch (...) 
     {
@@ -92359,444 +93022,276 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvProjectPoints2 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) NULL ;
-  CvMat *arg8 = (CvMat *) NULL ;
-  CvMat *arg9 = (CvMat *) NULL ;
-  CvMat *arg10 = (CvMat *) NULL ;
-  CvMat *arg11 = (CvMat *) NULL ;
-  double arg12 = (double) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 = 0 ;
-  int res9 = 0 ;
-  void *argp10 = 0 ;
-  int res10 = 0 ;
-  void *argp11 = 0 ;
-  int res11 = 0 ;
-  double val12 ;
-  int ecode12 = 0 ;
+static swig_octave_member swig_CvStarDetectorParams_members[] = {
+{"maxSize",0,_wrap_CvStarDetectorParams_maxSize_get,_wrap_CvStarDetectorParams_maxSize_set,0,0},
+{"responseThreshold",0,_wrap_CvStarDetectorParams_responseThreshold_get,_wrap_CvStarDetectorParams_responseThreshold_set,0,0},
+{"lineThresholdProjected",0,_wrap_CvStarDetectorParams_lineThresholdProjected_get,_wrap_CvStarDetectorParams_lineThresholdProjected_set,0,0},
+{"lineThresholdBinarized",0,_wrap_CvStarDetectorParams_lineThresholdBinarized_get,_wrap_CvStarDetectorParams_lineThresholdBinarized_set,0,0},
+{"suppressNonmaxSize",0,_wrap_CvStarDetectorParams_suppressNonmaxSize_get,_wrap_CvStarDetectorParams_suppressNonmaxSize_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvStarDetectorParams_base_names[] = {0};
+static const swig_type_info *swig_CvStarDetectorParams_base[] = {0};
+static swig_octave_class _wrap_class_CvStarDetectorParams = {"CvStarDetectorParams", &SWIGTYPE_p_CvStarDetectorParams,0,_wrap_new_CvStarDetectorParams,0,_wrap_delete_CvStarDetectorParams,swig_CvStarDetectorParams_members,swig_CvStarDetectorParams_base_names,swig_CvStarDetectorParams_base };
+
+static octave_value_list _wrap_cvStarDetectorParams (const octave_value_list& args, int nargout) {
+  int arg1 = (int) 45 ;
+  int arg2 = (int) 30 ;
+  int arg3 = (int) 10 ;
+  int arg4 = (int) 8 ;
+  int arg5 = (int) 5 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvStarDetectorParams result;
   
-  if (!SWIG_check_num_args("cvProjectPoints2",args.length(),12,6,0)) {
+  if (!SWIG_check_num_args("cvStarDetectorParams",args.length(),5,0,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvProjectPoints2" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvProjectPoints2" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvProjectPoints2" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvProjectPoints2" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvProjectPoints2" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvProjectPoints2" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  if (6<args.length()) {
-    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvProjectPoints2" "', argument " "7"" of type '" "CvMat *""'"); 
-    }
-    arg7 = (CvMat *)(argp7);
-  }
-  if (7<args.length()) {
-    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvProjectPoints2" "', argument " "8"" of type '" "CvMat *""'"); 
-    }
-    arg8 = (CvMat *)(argp8);
+  if (0<args.length()) {
+    ecode1 = SWIG_AsVal_int(args(0), &val1);
+    if (!SWIG_IsOK(ecode1)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvStarDetectorParams" "', argument " "1"" of type '" "int""'");
+    } 
+    arg1 = (int)(val1);
   }
-  if (8<args.length()) {
-    res9 = SWIG_ConvertPtr(args(8), &argp9,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvProjectPoints2" "', argument " "9"" of type '" "CvMat *""'"); 
-    }
-    arg9 = (CvMat *)(argp9);
+  if (1<args.length()) {
+    ecode2 = SWIG_AsVal_int(args(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvStarDetectorParams" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = (int)(val2);
   }
-  if (9<args.length()) {
-    res10 = SWIG_ConvertPtr(args(9), &argp10,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "cvProjectPoints2" "', argument " "10"" of type '" "CvMat *""'"); 
-    }
-    arg10 = (CvMat *)(argp10);
+  if (2<args.length()) {
+    ecode3 = SWIG_AsVal_int(args(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvStarDetectorParams" "', argument " "3"" of type '" "int""'");
+    } 
+    arg3 = (int)(val3);
   }
-  if (10<args.length()) {
-    res11 = SWIG_ConvertPtr(args(10), &argp11,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res11)) {
-      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "cvProjectPoints2" "', argument " "11"" of type '" "CvMat *""'"); 
-    }
-    arg11 = (CvMat *)(argp11);
+  if (3<args.length()) {
+    ecode4 = SWIG_AsVal_int(args(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvStarDetectorParams" "', argument " "4"" of type '" "int""'");
+    } 
+    arg4 = (int)(val4);
   }
-  if (11<args.length()) {
-    ecode12 = SWIG_AsVal_double(args(11), &val12);
-    if (!SWIG_IsOK(ecode12)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "cvProjectPoints2" "', argument " "12"" of type '" "double""'");
+  if (4<args.length()) {
+    ecode5 = SWIG_AsVal_int(args(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvStarDetectorParams" "', argument " "5"" of type '" "int""'");
     } 
-    arg12 = (double)(val12);
+    arg5 = (int)(val5);
   }
   {
     try {
-      cvProjectPoints2((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12); 
+      result = cvStarDetectorParams(arg1,arg2,arg3,arg4,arg5); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj((new CvStarDetectorParams((const CvStarDetectorParams&)(result))), SWIGTYPE_p_CvStarDetectorParams, SWIG_POINTER_OWN |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvFindExtrinsicCameraParams2 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+static octave_value_list _wrap_cvGetStarKeypoints (const octave_value_list& args, int nargout) {
+  CvArr *arg1 = (CvArr *) 0 ;
+  CvMemStorage *arg2 = (CvMemStorage *) 0 ;
+  CvStarDetectorParams arg3 = (CvStarDetectorParams) cvStarDetectorParams() ;
+  bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
+  void *argp3 ;
   int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvSeq *result = 0 ;
   
-  if (!SWIG_check_num_args("cvFindExtrinsicCameraParams2",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("cvGetStarKeypoints",args.length(),3,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "1"" of type '" "CvMat const *""'"); 
+  {
+    arg1 = OctObject_to_CvArr(args(0), &freearg1);
   }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMemStorage, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "5"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvGetStarKeypoints" "', argument " "2"" of type '" "CvMemStorage *""'"); 
   }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "6"" of type '" "CvMat *""'"); 
+  arg2 = (CvMemStorage *)(argp2);
+  if (2<args.length()) {
+    {
+      res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvStarDetectorParams,  0 );
+      if (!SWIG_IsOK(res3)) {
+        SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvGetStarKeypoints" "', argument " "3"" of type '" "CvStarDetectorParams""'"); 
+      }  
+      if (!argp3) {
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvGetStarKeypoints" "', argument " "3"" of type '" "CvStarDetectorParams""'");
+      } else {
+        arg3 = *((CvStarDetectorParams *)(argp3));
+      }
+    }
   }
-  arg6 = (CvMat *)(argp6);
   {
     try {
-      cvFindExtrinsicCameraParams2((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6); 
+      result = (CvSeq *)cvGetStarKeypoints((void const *)arg1,arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSeq, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    if(arg1!=NULL && freearg1){
+      cvReleaseData( arg1 );
+      cvFree(&(arg1));
+    }
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvInitIntrinsicParams2D (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvSize arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  double arg6 = (double) 1. ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
+static octave_value_list _wrap_cvLoadHaarClassifierCascade (const octave_value_list& args, int nargout) {
+  char *arg1 = (char *) 0 ;
+  CvSize arg2 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  void *argp2 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  double val6 ;
-  int ecode6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvHaarClassifierCascade *result = 0 ;
   
-  if (!SWIG_check_num_args("cvInitIntrinsicParams2D",args.length(),6,5,0)) {
+  if (!SWIG_check_num_args("cvLoadHaarClassifierCascade",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_AsCharPtrAndSize(args(0), &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvInitIntrinsicParams2D" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvInitIntrinsicParams2D" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvInitIntrinsicParams2D" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvLoadHaarClassifierCascade" "', argument " "1"" of type '" "char const *""'");
   }
-  arg3 = (CvMat *)(argp3);
+  arg1 = (char *)(buf1);
   {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvInitIntrinsicParams2D" "', argument " "4"" of type '" "CvSize""'"); 
+    res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSize,  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvLoadHaarClassifierCascade" "', argument " "2"" of type '" "CvSize""'"); 
     }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvInitIntrinsicParams2D" "', argument " "4"" of type '" "CvSize""'");
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvLoadHaarClassifierCascade" "', argument " "2"" of type '" "CvSize""'");
     } else {
-      arg4 = *((CvSize *)(argp4));
+      arg2 = *((CvSize *)(argp2));
     }
   }
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvInitIntrinsicParams2D" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  if (5<args.length()) {
-    ecode6 = SWIG_AsVal_double(args(5), &val6);
-    if (!SWIG_IsOK(ecode6)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvInitIntrinsicParams2D" "', argument " "6"" of type '" "double""'");
-    } 
-    arg6 = (double)(val6);
-  }
   {
     try {
-      cvInitIntrinsicParams2D((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6); 
+      result = (CvHaarClassifierCascade *)cvLoadHaarClassifierCascade((char const *)arg1,arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvHaarClassifierCascade, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvFindChessboardCorners (const octave_value_list& args, int nargout) {
-  void *arg1 = (void *) 0 ;
-  CvSize arg2 ;
-  CvPoint2D32f *arg3 = (CvPoint2D32f *) 0 ;
-  int *arg4 = (int *) NULL ;
-  int arg5 = (int) 1+2 ;
-  int res1 ;
-  CvSize *pattern_size2 ;
-  CvPoint2D32f *tmp_corners2 ;
-  int tmp_ncorners2 ;
-  int val5 ;
-  int ecode5 = 0 ;
+static octave_value_list _wrap_cvReleaseHaarClassifierCascade (const octave_value_list& args, int nargout) {
+  CvHaarClassifierCascade **arg1 = (CvHaarClassifierCascade **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("cvFindChessboardCorners",args.length(),3,2,0)) {
+  if (!SWIG_check_num_args("cvReleaseHaarClassifierCascade",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0),SWIG_as_voidptrptr(&arg1), 0, 0);
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvHaarClassifierCascade, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvFindChessboardCorners" "', argument " "1"" of type '" "void const *""'"); 
-  }
-  {
-    void * vptr;
-    if( SWIG_ConvertPtr(args(1), &vptr, SWIGTYPE_p_CvSize, SWIG_POINTER_EXCEPTION ) == -1){
-      SWIG_fail;
-    }
-    pattern_size2=(CvSize *)vptr;
-    tmp_ncorners2 = pattern_size2->width*pattern_size2->height;
-    
-    tmp_corners2 = (CvPoint2D32f *) malloc(sizeof(CvPoint2D32f)*tmp_ncorners2);
-    arg2 = *pattern_size2;
-    arg3 = tmp_corners2;
-    arg4 = &tmp_ncorners2;
-  }
-  if (2<args.length()) {
-    ecode5 = SWIG_AsVal_int(args(2), &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvFindChessboardCorners" "', argument " "5"" of type '" "int""'");
-    } 
-    arg5 = (int)(val5);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleaseHaarClassifierCascade" "', argument " "1"" of type '" "CvHaarClassifierCascade **""'"); 
   }
+  arg1 = (CvHaarClassifierCascade **)(argp1);
   {
     try {
-      result = (int)cvFindChessboardCorners((void const *)arg1,arg2,arg3,arg4,arg5); 
+      cvReleaseHaarClassifierCascade(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_int((int)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  {
-    int i;
-    octave_value to_add;
-    
-    // create the list to return
-    to_add = OctList_New ( tmp_ncorners2 );
-    
-    // extract all the corner values of the result, and add it to the
-    // final resulting list
-    for (i = 0; i < tmp_ncorners2; i++) {
-      CvPoint2D32f * pt = new CvPoint2D32f;
-      pt->x = tmp_corners2[i].x;
-      pt->y = tmp_corners2[i].y;
-      
-      OctList_SetItem (to_add, i,
-        SWIG_NewPointerObj( pt, SWIGTYPE_p_CvPoint2D32f, 0));
-    }
-    
-    _outp = SWIG_AppendResult( _outp, &to_add, 1);
-    free(tmp_corners2);
-  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvDrawChessboardCorners (const octave_value_list& args, int nargout) {
-  CvArr *arg1 = (CvArr *) 0 ;
-  CvSize arg2 ;
-  CvPoint2D32f *arg3 = (CvPoint2D32f *) 0 ;
-  int arg4 ;
-  int arg5 ;
-  bool freearg1 = false ;
-  void *argp2 ;
-  int res2 = 0 ;
-  int cornersCount3 ;
-  CvPoint2D32f *corners3 ;
-  int val5 ;
+static octave_value_list _wrap_cvSetImagesForHaarClassifierCascade (const octave_value_list& args, int nargout) {
+  CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
+  CvArr *arg2 = (CvArr *) 0 ;
+  CvArr *arg3 = (CvArr *) 0 ;
+  CvArr *arg4 = (CvArr *) 0 ;
+  double arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool freearg2 = false ;
+  bool freearg3 = false ;
+  bool freearg4 = false ;
+  double val5 ;
   int ecode5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvDrawChessboardCorners",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("cvSetImagesForHaarClassifierCascade",args.length(),5,5,0)) {
     SWIG_fail;
   }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvSetImagesForHaarClassifierCascade" "', argument " "1"" of type '" "CvHaarClassifierCascade *""'"); 
+  }
+  arg1 = (CvHaarClassifierCascade *)(argp1);
   {
-    arg1 = OctObject_to_CvArr(args(0), &freearg1);
+    arg2 = OctObject_to_CvArr(args(1), &freearg2);
   }
   {
-    res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvDrawChessboardCorners" "', argument " "2"" of type '" "CvSize""'"); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvDrawChessboardCorners" "', argument " "2"" of type '" "CvSize""'");
-    } else {
-      arg2 = *((CvSize *)(argp2));
-    }
+    arg3 = OctObject_to_CvArr(args(2), &freearg3);
   }
   {
-    int i;
-    
-    if(!OctList_Check(args(2))){
-      error("Expected a list");
-      SWIG_fail;
-    }
-    
-    // get the size of the input array
-    cornersCount3 = OctList_Size (args(2));
-    arg4 = cornersCount3;
-    
-    // allocate the needed memory
-    corners3 = (CvPoint2D32f *)malloc (arg4 * sizeof (CvPoint2D32f));
-    arg3 = corners3;
-    
-    // the size of the array for the C call
-    
-    // extract all the points values from the list
-    for (i = 0; i < arg4; i++) {
-      octave_value item = OctList_GetItem (args(2), i);
-      
-      void *vptr;
-      SWIG_Octave_ConvertPtr (item, &vptr,
-        SWIGTYPE_p_CvPoint2D32f,
-        SWIG_POINTER_EXCEPTION);
-      CvPoint2D32f *p = (CvPoint2D32f *) vptr;;
-      arg3 [i].x = p->x;
-      arg3 [i].y = p->y;
-    }
+    arg4 = OctObject_to_CvArr(args(3), &freearg4);
   }
-  ecode5 = SWIG_AsVal_int(args(3), &val5);
+  ecode5 = SWIG_AsVal_double(args(4), &val5);
   if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvDrawChessboardCorners" "', argument " "5"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvSetImagesForHaarClassifierCascade" "', argument " "5"" of type '" "double""'");
   } 
-  arg5 = (int)(val5);
+  arg5 = (double)(val5);
   {
     try {
-      cvDrawChessboardCorners(arg1,arg2,arg3,arg4,arg5); 
+      cvSetImagesForHaarClassifierCascade(arg1,(void const *)arg2,(void const *)arg3,(void const *)arg4,arg5); 
     } 
     catch (...) 
     {
@@ -92806,26 +93301,21 @@ static octave_value_list _wrap_cvDrawChessboardCorners (const octave_value_list&
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
   {
-    int i;
-    octave_value to_add;
-    
-    // create the list to return
-    to_add = OctList_New (cornersCount3);
-    
-    // extract all the corner values of the result, and add it to the
-    // final resulting list
-    for (i = 0; i < cornersCount3; i++) {
-      OctList_SetItem (to_add, i,
-        SWIG_NewPointerObj (&(corners3 [i]),
-          SWIGTYPE_p_CvPoint2D32f, 0));
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
     }
-    
-    _outp = SWIG_AppendResult( _outp, &to_add, 1);
   }
   {
-    if(arg1!=NULL && freearg1){
-      cvReleaseData( arg1 );
-      cvFree(&(arg1));
+    if(arg3!=NULL && freearg3){
+      cvReleaseData( arg3 );
+      cvFree(&(arg3));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
     }
   }
 fail:
@@ -92833,101 +93323,90 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvCalibrateCamera2 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvSize arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) NULL ;
-  CvMat *arg8 = (CvMat *) NULL ;
-  int arg9 = (int) 0 ;
+static octave_value_list _wrap_cvRunHaarClassifierCascade (const octave_value_list& args, int nargout) {
+  CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
+  CvPoint arg2 ;
+  int arg3 = (int) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  int val9 ;
-  int ecode9 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("cvCalibrateCamera2",args.length(),9,6,0)) {
+  if (!SWIG_check_num_args("cvRunHaarClassifierCascade",args.length(),3,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCalibrateCamera2" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRunHaarClassifierCascade" "', argument " "1"" of type '" "CvHaarClassifierCascade const *""'"); 
   }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCalibrateCamera2" "', argument " "2"" of type '" "CvMat const *""'"); 
+  arg1 = (CvHaarClassifierCascade *)(argp1);
+  {
+    arg2 = OctObject_to_CvPoint(args(1));
   }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvCalibrateCamera2" "', argument " "3"" of type '" "CvMat const *""'"); 
+  if (2<args.length()) {
+    ecode3 = SWIG_AsVal_int(args(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvRunHaarClassifierCascade" "', argument " "3"" of type '" "int""'");
+    } 
+    arg3 = (int)(val3);
   }
-  arg3 = (CvMat *)(argp3);
   {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvCalibrateCamera2" "', argument " "4"" of type '" "CvSize""'"); 
-    }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvCalibrateCamera2" "', argument " "4"" of type '" "CvSize""'");
-    } else {
-      arg4 = *((CvSize *)(argp4));
-    }
+    try {
+      result = (int)cvRunHaarClassifierCascade((CvHaarClassifierCascade const *)arg1,arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvCalibrateCamera2" "', argument " "5"" of type '" "CvMat *""'"); 
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_cvUndistort2 (const octave_value_list& args, int nargout) {
+  CvArr *arg1 = (CvArr *) 0 ;
+  CvArr *arg2 = (CvArr *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  bool freearg1 = false ;
+  bool freearg2 = false ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("cvUndistort2",args.length(),4,4,0)) {
+    SWIG_fail;
   }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvCalibrateCamera2" "', argument " "6"" of type '" "CvMat *""'"); 
+  {
+    arg1 = OctObject_to_CvArr(args(0), &freearg1);
   }
-  arg6 = (CvMat *)(argp6);
-  if (6<args.length()) {
-    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvCalibrateCamera2" "', argument " "7"" of type '" "CvMat *""'"); 
-    }
-    arg7 = (CvMat *)(argp7);
+  {
+    arg2 = OctObject_to_CvArr(args(1), &freearg2);
   }
-  if (7<args.length()) {
-    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvCalibrateCamera2" "', argument " "8"" of type '" "CvMat *""'"); 
-    }
-    arg8 = (CvMat *)(argp8);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvUndistort2" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
-  if (8<args.length()) {
-    ecode9 = SWIG_AsVal_int(args(8), &val9);
-    if (!SWIG_IsOK(ecode9)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "cvCalibrateCamera2" "', argument " "9"" of type '" "int""'");
-    } 
-    arg9 = (int)(val9);
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvUndistort2" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
+  arg4 = (CvMat *)(argp4);
   {
     try {
-      cvCalibrateCamera2((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
+      cvUndistort2((void const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4); 
     } 
     catch (...) 
     {
@@ -92936,114 +93415,60 @@ static octave_value_list _wrap_cvCalibrateCamera2 (const octave_value_list& args
   }
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    if(arg1!=NULL && freearg1){
+      cvReleaseData( arg1 );
+      cvFree(&(arg1));
+    }
+  }
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvCalibrationMatrixValues (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvInitUndistortMap (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
-  CvSize arg2 ;
-  double arg3 = (double) 0 ;
-  double arg4 = (double) 0 ;
-  double *arg5 = (double *) NULL ;
-  double *arg6 = (double *) NULL ;
-  double *arg7 = (double *) NULL ;
-  CvPoint2D64f *arg8 = (CvPoint2D64f *) NULL ;
-  double *arg9 = (double *) NULL ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvArr *arg3 = (CvArr *) 0 ;
+  CvArr *arg4 = (CvArr *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 ;
+  void *argp2 = 0 ;
   int res2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  double val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 = 0 ;
-  int res9 = 0 ;
+  bool freearg3 = false ;
+  bool freearg4 = false ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvCalibrationMatrixValues",args.length(),9,2,0)) {
+  if (!SWIG_check_num_args("cvInitUndistortMap",args.length(),4,4,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCalibrationMatrixValues" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvInitUndistortMap" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
-  {
-    res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCalibrationMatrixValues" "', argument " "2"" of type '" "CvSize""'"); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvCalibrationMatrixValues" "', argument " "2"" of type '" "CvSize""'");
-    } else {
-      arg2 = *((CvSize *)(argp2));
-    }
-  }
-  if (2<args.length()) {
-    ecode3 = SWIG_AsVal_double(args(2), &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvCalibrationMatrixValues" "', argument " "3"" of type '" "double""'");
-    } 
-    arg3 = (double)(val3);
-  }
-  if (3<args.length()) {
-    ecode4 = SWIG_AsVal_double(args(3), &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvCalibrationMatrixValues" "', argument " "4"" of type '" "double""'");
-    } 
-    arg4 = (double)(val4);
-  }
-  if (4<args.length()) {
-    res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_double, 0 |  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvCalibrationMatrixValues" "', argument " "5"" of type '" "double *""'"); 
-    }
-    arg5 = (double *)(argp5);
-  }
-  if (5<args.length()) {
-    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_double, 0 |  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvCalibrationMatrixValues" "', argument " "6"" of type '" "double *""'"); 
-    }
-    arg6 = (double *)(argp6);
-  }
-  if (6<args.length()) {
-    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_double, 0 |  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvCalibrationMatrixValues" "', argument " "7"" of type '" "double *""'"); 
-    }
-    arg7 = (double *)(argp7);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvInitUndistortMap" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  if (7<args.length()) {
-    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvPoint2D64f, 0 |  0 );
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvCalibrationMatrixValues" "', argument " "8"" of type '" "CvPoint2D64f *""'"); 
-    }
-    arg8 = (CvPoint2D64f *)(argp8);
+  arg2 = (CvMat *)(argp2);
+  {
+    arg3 = OctObject_to_CvArr(args(2), &freearg3);
   }
-  if (8<args.length()) {
-    res9 = SWIG_ConvertPtr(args(8), &argp9,SWIGTYPE_p_double, 0 |  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvCalibrationMatrixValues" "', argument " "9"" of type '" "double *""'"); 
-    }
-    arg9 = (double *)(argp9);
+  {
+    arg4 = OctObject_to_CvArr(args(3), &freearg4);
   }
   {
     try {
-      cvCalibrationMatrixValues((CvMat const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
+      cvInitUndistortMap((CvMat const *)arg1,(CvMat const *)arg2,arg3,arg4); 
     } 
     catch (...) 
     {
@@ -93052,27 +93477,30 @@ static octave_value_list _wrap_cvCalibrationMatrixValues (const octave_value_lis
   }
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    if(arg3!=NULL && freearg3){
+      cvReleaseData( arg3 );
+      cvFree(&(arg3));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvStereoCalibrate (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvInitUndistortRectifyMap (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
-  CvSize arg9 ;
-  CvMat *arg10 = (CvMat *) 0 ;
-  CvMat *arg11 = (CvMat *) 0 ;
-  CvMat *arg12 = (CvMat *) 0 ;
-  CvMat *arg13 = (CvMat *) 0 ;
-  CvTermCriteria arg14 = (CvTermCriteria) cvTermCriteria( 1 +2,30,1e-6) ;
-  int arg15 = (int) 256 ;
+  CvArr *arg5 = (CvArr *) 0 ;
+  CvArr *arg6 = (CvArr *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -93081,133 +93509,44 @@ static octave_value_list _wrap_cvStereoCalibrate (const octave_value_list& args,
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 ;
-  int res9 = 0 ;
-  void *argp10 = 0 ;
-  int res10 = 0 ;
-  void *argp11 = 0 ;
-  int res11 = 0 ;
-  void *argp12 = 0 ;
-  int res12 = 0 ;
-  void *argp13 = 0 ;
-  int res13 = 0 ;
-  void *argp14 ;
-  int res14 = 0 ;
-  int val15 ;
-  int ecode15 = 0 ;
+  bool freearg5 = false ;
+  bool freearg6 = false ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvStereoCalibrate",args.length(),15,11,0)) {
+  if (!SWIG_check_num_args("cvInitUndistortRectifyMap",args.length(),6,6,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvStereoCalibrate" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvInitUndistortRectifyMap" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvStereoCalibrate" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvInitUndistortRectifyMap" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvStereoCalibrate" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvInitUndistortRectifyMap" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvStereoCalibrate" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvInitUndistortRectifyMap" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvStereoCalibrate" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvStereoCalibrate" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvStereoCalibrate" "', argument " "7"" of type '" "CvMat *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvStereoCalibrate" "', argument " "8"" of type '" "CvMat *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
   {
-    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvStereoCalibrate" "', argument " "9"" of type '" "CvSize""'"); 
-    }  
-    if (!argp9) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvStereoCalibrate" "', argument " "9"" of type '" "CvSize""'");
-    } else {
-      arg9 = *((CvSize *)(argp9));
-    }
-  }
-  res10 = SWIG_ConvertPtr(args(9), &argp10,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res10)) {
-    SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "cvStereoCalibrate" "', argument " "10"" of type '" "CvMat *""'"); 
-  }
-  arg10 = (CvMat *)(argp10);
-  res11 = SWIG_ConvertPtr(args(10), &argp11,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res11)) {
-    SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "cvStereoCalibrate" "', argument " "11"" of type '" "CvMat *""'"); 
-  }
-  arg11 = (CvMat *)(argp11);
-  if (11<args.length()) {
-    res12 = SWIG_ConvertPtr(args(11), &argp12,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res12)) {
-      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "cvStereoCalibrate" "', argument " "12"" of type '" "CvMat *""'"); 
-    }
-    arg12 = (CvMat *)(argp12);
-  }
-  if (12<args.length()) {
-    res13 = SWIG_ConvertPtr(args(12), &argp13,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res13)) {
-      SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "cvStereoCalibrate" "', argument " "13"" of type '" "CvMat *""'"); 
-    }
-    arg13 = (CvMat *)(argp13);
-  }
-  if (13<args.length()) {
-    {
-      res14 = SWIG_ConvertPtr(args(13), &argp14, SWIGTYPE_p_CvTermCriteria,  0 );
-      if (!SWIG_IsOK(res14)) {
-        SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "cvStereoCalibrate" "', argument " "14"" of type '" "CvTermCriteria""'"); 
-      }  
-      if (!argp14) {
-        SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvStereoCalibrate" "', argument " "14"" of type '" "CvTermCriteria""'");
-      } else {
-        arg14 = *((CvTermCriteria *)(argp14));
-      }
-    }
+    arg5 = OctObject_to_CvArr(args(4), &freearg5);
   }
-  if (14<args.length()) {
-    ecode15 = SWIG_AsVal_int(args(14), &val15);
-    if (!SWIG_IsOK(ecode15)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "cvStereoCalibrate" "', argument " "15"" of type '" "int""'");
-    } 
-    arg15 = (int)(val15);
+  {
+    arg6 = OctObject_to_CvArr(args(5), &freearg6);
   }
   {
     try {
-      cvStereoCalibrate((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15); 
+      cvInitUndistortRectifyMap((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6); 
     } 
     catch (...) 
     {
@@ -93216,25 +93555,30 @@ static octave_value_list _wrap_cvStereoCalibrate (const octave_value_list& args,
   }
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  {
+    if(arg6!=NULL && freearg6){
+      cvReleaseData( arg6 );
+      cvFree(&(arg6));
+    }
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvStereoRectify (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvUndistortPoints (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvSize arg5 ;
+  CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
-  CvMat *arg9 = (CvMat *) 0 ;
-  CvMat *arg10 = (CvMat *) 0 ;
-  CvMat *arg11 = (CvMat *) 0 ;
-  CvMat *arg12 = (CvMat *) 0 ;
-  int arg13 = (int) 1024 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -93243,109 +93587,54 @@ static octave_value_list _wrap_cvStereoRectify (const octave_value_list& args, i
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  void *argp5 ;
+  void *argp5 = 0 ;
   int res5 = 0 ;
   void *argp6 = 0 ;
   int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 = 0 ;
-  int res9 = 0 ;
-  void *argp10 = 0 ;
-  int res10 = 0 ;
-  void *argp11 = 0 ;
-  int res11 = 0 ;
-  void *argp12 = 0 ;
-  int res12 = 0 ;
-  int val13 ;
-  int ecode13 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvStereoRectify",args.length(),13,11,0)) {
+  if (!SWIG_check_num_args("cvUndistortPoints",args.length(),6,4,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvStereoRectify" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvUndistortPoints" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvStereoRectify" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvUndistortPoints" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvStereoRectify" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvUndistortPoints" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvStereoRectify" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvUndistortPoints" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
+  if (4<args.length()) {
+    res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
     if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvStereoRectify" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvStereoRectify" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvUndistortPoints" "', argument " "5"" of type '" "CvMat const *""'"); 
     }
+    arg5 = (CvMat *)(argp5);
   }
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvStereoRectify" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvStereoRectify" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvStereoRectify" "', argument " "8"" of type '" "CvMat *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
-  res9 = SWIG_ConvertPtr(args(8), &argp9,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res9)) {
-    SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvStereoRectify" "', argument " "9"" of type '" "CvMat *""'"); 
-  }
-  arg9 = (CvMat *)(argp9);
-  res10 = SWIG_ConvertPtr(args(9), &argp10,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res10)) {
-    SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "cvStereoRectify" "', argument " "10"" of type '" "CvMat *""'"); 
-  }
-  arg10 = (CvMat *)(argp10);
-  res11 = SWIG_ConvertPtr(args(10), &argp11,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res11)) {
-    SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "cvStereoRectify" "', argument " "11"" of type '" "CvMat *""'"); 
-  }
-  arg11 = (CvMat *)(argp11);
-  if (11<args.length()) {
-    res12 = SWIG_ConvertPtr(args(11), &argp12,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res12)) {
-      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "cvStereoRectify" "', argument " "12"" of type '" "CvMat *""'"); 
+  if (5<args.length()) {
+    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvUndistortPoints" "', argument " "6"" of type '" "CvMat const *""'"); 
     }
-    arg12 = (CvMat *)(argp12);
-  }
-  if (12<args.length()) {
-    ecode13 = SWIG_AsVal_int(args(12), &val13);
-    if (!SWIG_IsOK(ecode13)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "cvStereoRectify" "', argument " "13"" of type '" "int""'");
-    } 
-    arg13 = (int)(val13);
+    arg6 = (CvMat *)(argp6);
   }
   {
     try {
-      cvStereoRectify((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,(CvMat const *)arg6,(CvMat const *)arg7,arg8,arg9,arg10,arg11,arg12,arg13); 
+      cvUndistortPoints((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
     } 
     catch (...) 
     {
@@ -93359,82 +93648,44 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvStereoRectifyUncalibrated (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvRodrigues2 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvSize arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  double arg7 = (double) 5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  void *argp4 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  double val7 ;
-  int ecode7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("cvStereoRectifyUncalibrated",args.length(),7,6,0)) {
+  if (!SWIG_check_num_args("cvRodrigues2",args.length(),3,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvStereoRectifyUncalibrated" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRodrigues2" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvStereoRectifyUncalibrated" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvRodrigues2" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvStereoRectifyUncalibrated" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvStereoRectifyUncalibrated" "', argument " "4"" of type '" "CvSize""'"); 
-    }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvStereoRectifyUncalibrated" "', argument " "4"" of type '" "CvSize""'");
-    } else {
-      arg4 = *((CvSize *)(argp4));
+  if (2<args.length()) {
+    res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvRodrigues2" "', argument " "3"" of type '" "CvMat *""'"); 
     }
-  }
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvStereoRectifyUncalibrated" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvStereoRectifyUncalibrated" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  if (6<args.length()) {
-    ecode7 = SWIG_AsVal_double(args(6), &val7);
-    if (!SWIG_IsOK(ecode7)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "cvStereoRectifyUncalibrated" "', argument " "7"" of type '" "double""'");
-    } 
-    arg7 = (double)(val7);
+    arg3 = (CvMat *)(argp3);
   }
   {
     try {
-      result = (int)cvStereoRectifyUncalibrated((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6,arg7); 
+      result = (int)cvRodrigues2((CvMat const *)arg1,arg2,arg3); 
     } 
     catch (...) 
     {
@@ -93448,112 +93699,160 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvCreatePOSITObject (const octave_value_list& args, int nargout) {
-  CvPoint3D32f *arg1 = (CvPoint3D32f *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
+static octave_value_list _wrap_cvFindHomography (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  int arg4 = (int) 0 ;
+  double arg5 = (double) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  double val5 ;
+  int ecode5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvPOSITObject *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("cvCreatePOSITObject",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvFindHomography",args.length(),6,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPoint3D32f, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCreatePOSITObject" "', argument " "1"" of type '" "CvPoint3D32f *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvFindHomography" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvFindHomography" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvFindHomography" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  if (3<args.length()) {
+    ecode4 = SWIG_AsVal_int(args(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvFindHomography" "', argument " "4"" of type '" "int""'");
+    } 
+    arg4 = (int)(val4);
+  }
+  if (4<args.length()) {
+    ecode5 = SWIG_AsVal_double(args(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvFindHomography" "', argument " "5"" of type '" "double""'");
+    } 
+    arg5 = (double)(val5);
+  }
+  if (5<args.length()) {
+    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvFindHomography" "', argument " "6"" of type '" "CvMat *""'"); 
+    }
+    arg6 = (CvMat *)(argp6);
   }
-  arg1 = (CvPoint3D32f *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvCreatePOSITObject" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
   {
     try {
-      result = (CvPOSITObject *)cvCreatePOSITObject(arg1,arg2); 
+      result = (int)cvFindHomography((CvMat const *)arg1,(CvMat const *)arg2,arg3,arg4,arg5,arg6); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvPOSITObject, 1 |  0 );
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvPOSIT (const octave_value_list& args, int nargout) {
-  CvPOSITObject *arg1 = (CvPOSITObject *) 0 ;
-  CvPoint2D32f *arg2 = (CvPoint2D32f *) 0 ;
-  double arg3 ;
-  CvTermCriteria arg4 ;
-  CvMatr32f arg5 = (CvMatr32f) 0 ;
-  CvVect32f arg6 = (CvVect32f) 0 ;
+static octave_value_list _wrap_cvRQDecomp3x3 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) NULL ;
+  CvMat *arg5 = (CvMat *) NULL ;
+  CvMat *arg6 = (CvMat *) NULL ;
+  CvPoint3D64f *arg7 = (CvPoint3D64f *) NULL ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  void *argp4 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
   int res4 = 0 ;
   void *argp5 = 0 ;
   int res5 = 0 ;
   void *argp6 = 0 ;
   int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvPOSIT",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("cvRQDecomp3x3",args.length(),7,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPOSITObject, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvPOSIT" "', argument " "1"" of type '" "CvPOSITObject *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRQDecomp3x3" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvPOSITObject *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvPOSIT" "', argument " "2"" of type '" "CvPoint2D32f *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvRQDecomp3x3" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  arg2 = (CvPoint2D32f *)(argp2);
-  ecode3 = SWIG_AsVal_double(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvPOSIT" "', argument " "3"" of type '" "double""'");
-  } 
-  arg3 = (double)(val3);
-  {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvTermCriteria,  0 );
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvRQDecomp3x3" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  if (3<args.length()) {
+    res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvPOSIT" "', argument " "4"" of type '" "CvTermCriteria""'"); 
-    }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvPOSIT" "', argument " "4"" of type '" "CvTermCriteria""'");
-    } else {
-      arg4 = *((CvTermCriteria *)(argp4));
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvRQDecomp3x3" "', argument " "4"" of type '" "CvMat *""'"); 
     }
+    arg4 = (CvMat *)(argp4);
   }
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_float, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvPOSIT" "', argument " "5"" of type '" "CvMatr32f""'"); 
+  if (4<args.length()) {
+    res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvRQDecomp3x3" "', argument " "5"" of type '" "CvMat *""'"); 
+    }
+    arg5 = (CvMat *)(argp5);
   }
-  arg5 = (CvMatr32f)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_float, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvPOSIT" "', argument " "6"" of type '" "CvVect32f""'"); 
+  if (5<args.length()) {
+    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvRQDecomp3x3" "', argument " "6"" of type '" "CvMat *""'"); 
+    }
+    arg6 = (CvMat *)(argp6);
+  }
+  if (6<args.length()) {
+    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvPoint3D64f, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvRQDecomp3x3" "', argument " "7"" of type '" "CvPoint3D64f *""'"); 
+    }
+    arg7 = (CvPoint3D64f *)(argp7);
   }
-  arg6 = (CvVect32f)(argp6);
   {
     try {
-      cvPOSIT(arg1,arg2,arg3,arg4,arg5,arg6); 
+      cvRQDecomp3x3((CvMat const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
     } 
     catch (...) 
     {
@@ -93567,122 +93866,145 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvReleasePOSITObject (const octave_value_list& args, int nargout) {
-  CvPOSITObject **arg1 = (CvPOSITObject **) 0 ;
+static octave_value_list _wrap_cvDecomposeProjectionMatrix (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) NULL ;
+  CvMat *arg6 = (CvMat *) NULL ;
+  CvMat *arg7 = (CvMat *) NULL ;
+  CvPoint3D64f *arg8 = (CvPoint3D64f *) NULL ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvReleasePOSITObject",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvDecomposeProjectionMatrix",args.length(),8,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvPOSITObject, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleasePOSITObject" "', argument " "1"" of type '" "CvPOSITObject **""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvDecomposeProjectionMatrix" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvPOSITObject **)(argp1);
-  {
-    try {
-      cvReleasePOSITObject(arg1); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvDecomposeProjectionMatrix" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_cvRANSACUpdateNumIters (const octave_value_list& args, int nargout) {
-  double arg1 ;
-  double arg2 ;
-  int arg3 ;
-  int arg4 ;
-  double val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("cvRANSACUpdateNumIters",args.length(),4,4,0)) {
-    SWIG_fail;
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvDecomposeProjectionMatrix" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvDecomposeProjectionMatrix" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  if (4<args.length()) {
+    res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvDecomposeProjectionMatrix" "', argument " "5"" of type '" "CvMat *""'"); 
+    }
+    arg5 = (CvMat *)(argp5);
+  }
+  if (5<args.length()) {
+    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvDecomposeProjectionMatrix" "', argument " "6"" of type '" "CvMat *""'"); 
+    }
+    arg6 = (CvMat *)(argp6);
+  }
+  if (6<args.length()) {
+    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvDecomposeProjectionMatrix" "', argument " "7"" of type '" "CvMat *""'"); 
+    }
+    arg7 = (CvMat *)(argp7);
+  }
+  if (7<args.length()) {
+    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvPoint3D64f, 0 |  0 );
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvDecomposeProjectionMatrix" "', argument " "8"" of type '" "CvPoint3D64f *""'"); 
+    }
+    arg8 = (CvPoint3D64f *)(argp8);
   }
-  ecode1 = SWIG_AsVal_double(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvRANSACUpdateNumIters" "', argument " "1"" of type '" "double""'");
-  } 
-  arg1 = (double)(val1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvRANSACUpdateNumIters" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvRANSACUpdateNumIters" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvRANSACUpdateNumIters" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
   {
     try {
-      result = (int)cvRANSACUpdateNumIters(arg1,arg2,arg3,arg4); 
+      cvDecomposeProjectionMatrix((CvMat const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_int((int)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvConvertPointsHomogeneous (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvCalcMatMulDeriv (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvConvertPointsHomogeneous",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvCalcMatMulDeriv",args.length(),4,4,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvConvertPointsHomogeneous" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCalcMatMulDeriv" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvConvertPointsHomogeneous" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCalcMatMulDeriv" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvCalcMatMulDeriv" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvCalcMatMulDeriv" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
   {
     try {
-      cvConvertPointsHomogeneous((CvMat const *)arg1,arg2); 
+      cvCalcMatMulDeriv((CvMat const *)arg1,(CvMat const *)arg2,arg3,arg4); 
     } 
     catch (...) 
     {
@@ -93696,176 +94018,283 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvFindFundamentalMat (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvComposeRT (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  int arg4 = (int) 8 ;
-  double arg5 = (double) 3. ;
-  double arg6 = (double) 0.99 ;
-  CvMat *arg7 = (CvMat *) NULL ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvMat *arg9 = (CvMat *) 0 ;
+  CvMat *arg10 = (CvMat *) 0 ;
+  CvMat *arg11 = (CvMat *) 0 ;
+  CvMat *arg12 = (CvMat *) 0 ;
+  CvMat *arg13 = (CvMat *) 0 ;
+  CvMat *arg14 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  double val5 ;
-  int ecode5 = 0 ;
-  double val6 ;
-  int ecode6 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
   void *argp7 = 0 ;
   int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 = 0 ;
+  int res9 = 0 ;
+  void *argp10 = 0 ;
+  int res10 = 0 ;
+  void *argp11 = 0 ;
+  int res11 = 0 ;
+  void *argp12 = 0 ;
+  int res12 = 0 ;
+  void *argp13 = 0 ;
+  int res13 = 0 ;
+  void *argp14 = 0 ;
+  int res14 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("cvFindFundamentalMat",args.length(),7,3,0)) {
+  if (!SWIG_check_num_args("cvComposeRT",args.length(),14,6,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvFindFundamentalMat" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvComposeRT" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvFindFundamentalMat" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvComposeRT" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvFindFundamentalMat" "', argument " "3"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvComposeRT" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
-  if (3<args.length()) {
-    ecode4 = SWIG_AsVal_int(args(3), &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvFindFundamentalMat" "', argument " "4"" of type '" "int""'");
-    } 
-    arg4 = (int)(val4);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvComposeRT" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
-  if (4<args.length()) {
-    ecode5 = SWIG_AsVal_double(args(4), &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvFindFundamentalMat" "', argument " "5"" of type '" "double""'");
-    } 
-    arg5 = (double)(val5);
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvComposeRT" "', argument " "5"" of type '" "CvMat *""'"); 
   }
-  if (5<args.length()) {
-    ecode6 = SWIG_AsVal_double(args(5), &val6);
-    if (!SWIG_IsOK(ecode6)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvFindFundamentalMat" "', argument " "6"" of type '" "double""'");
-    } 
-    arg6 = (double)(val6);
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvComposeRT" "', argument " "6"" of type '" "CvMat *""'"); 
   }
+  arg6 = (CvMat *)(argp6);
   if (6<args.length()) {
     res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
     if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvFindFundamentalMat" "', argument " "7"" of type '" "CvMat *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvComposeRT" "', argument " "7"" of type '" "CvMat *""'"); 
     }
     arg7 = (CvMat *)(argp7);
   }
+  if (7<args.length()) {
+    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvComposeRT" "', argument " "8"" of type '" "CvMat *""'"); 
+    }
+    arg8 = (CvMat *)(argp8);
+  }
+  if (8<args.length()) {
+    res9 = SWIG_ConvertPtr(args(8), &argp9,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvComposeRT" "', argument " "9"" of type '" "CvMat *""'"); 
+    }
+    arg9 = (CvMat *)(argp9);
+  }
+  if (9<args.length()) {
+    res10 = SWIG_ConvertPtr(args(9), &argp10,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "cvComposeRT" "', argument " "10"" of type '" "CvMat *""'"); 
+    }
+    arg10 = (CvMat *)(argp10);
+  }
+  if (10<args.length()) {
+    res11 = SWIG_ConvertPtr(args(10), &argp11,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res11)) {
+      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "cvComposeRT" "', argument " "11"" of type '" "CvMat *""'"); 
+    }
+    arg11 = (CvMat *)(argp11);
+  }
+  if (11<args.length()) {
+    res12 = SWIG_ConvertPtr(args(11), &argp12,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res12)) {
+      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "cvComposeRT" "', argument " "12"" of type '" "CvMat *""'"); 
+    }
+    arg12 = (CvMat *)(argp12);
+  }
+  if (12<args.length()) {
+    res13 = SWIG_ConvertPtr(args(12), &argp13,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res13)) {
+      SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "cvComposeRT" "', argument " "13"" of type '" "CvMat *""'"); 
+    }
+    arg13 = (CvMat *)(argp13);
+  }
+  if (13<args.length()) {
+    res14 = SWIG_ConvertPtr(args(13), &argp14,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res14)) {
+      SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "cvComposeRT" "', argument " "14"" of type '" "CvMat *""'"); 
+    }
+    arg14 = (CvMat *)(argp14);
+  }
   {
     try {
-      result = (int)cvFindFundamentalMat((CvMat const *)arg1,(CvMat const *)arg2,arg3,arg4,arg5,arg6,arg7); 
+      cvComposeRT((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_int((int)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvComputeCorrespondEpilines (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_cvProjectPoints2 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
-  int arg2 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) NULL ;
+  CvMat *arg8 = (CvMat *) NULL ;
+  CvMat *arg9 = (CvMat *) NULL ;
+  CvMat *arg10 = (CvMat *) NULL ;
+  CvMat *arg11 = (CvMat *) NULL ;
+  double arg12 = (double) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 = 0 ;
+  int res9 = 0 ;
+  void *argp10 = 0 ;
+  int res10 = 0 ;
+  void *argp11 = 0 ;
+  int res11 = 0 ;
+  double val12 ;
+  int ecode12 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvComputeCorrespondEpilines",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("cvProjectPoints2",args.length(),12,6,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvComputeCorrespondEpilines" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvProjectPoints2" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvComputeCorrespondEpilines" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvProjectPoints2" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvComputeCorrespondEpilines" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvProjectPoints2" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvComputeCorrespondEpilines" "', argument " "4"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvProjectPoints2" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
-  {
-    try {
-      cvComputeCorrespondEpilines((CvMat const *)arg1,arg2,(CvMat const *)arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvProjectPoints2" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoBMState_preFilterType_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoBMState_preFilterType_set",args.length(),2,2,0)) {
-    SWIG_fail;
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvProjectPoints2" "', argument " "6"" of type '" "CvMat *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterType_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+  arg6 = (CvMat *)(argp6);
+  if (6<args.length()) {
+    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvProjectPoints2" "', argument " "7"" of type '" "CvMat *""'"); 
+    }
+    arg7 = (CvMat *)(argp7);
+  }
+  if (7<args.length()) {
+    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvProjectPoints2" "', argument " "8"" of type '" "CvMat *""'"); 
+    }
+    arg8 = (CvMat *)(argp8);
+  }
+  if (8<args.length()) {
+    res9 = SWIG_ConvertPtr(args(8), &argp9,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvProjectPoints2" "', argument " "9"" of type '" "CvMat *""'"); 
+    }
+    arg9 = (CvMat *)(argp9);
+  }
+  if (9<args.length()) {
+    res10 = SWIG_ConvertPtr(args(9), &argp10,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "cvProjectPoints2" "', argument " "10"" of type '" "CvMat *""'"); 
+    }
+    arg10 = (CvMat *)(argp10);
+  }
+  if (10<args.length()) {
+    res11 = SWIG_ConvertPtr(args(10), &argp11,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res11)) {
+      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "cvProjectPoints2" "', argument " "11"" of type '" "CvMat *""'"); 
+    }
+    arg11 = (CvMat *)(argp11);
+  }
+  if (11<args.length()) {
+    ecode12 = SWIG_AsVal_double(args(11), &val12);
+    if (!SWIG_IsOK(ecode12)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "cvProjectPoints2" "', argument " "12"" of type '" "double""'");
+    } 
+    arg12 = (double)(val12);
+  }
+  {
+    try {
+      cvProjectPoints2((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_preFilterType_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->preFilterType = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -93873,56 +94302,81 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_preFilterType_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvFindExtrinsicCameraParams2 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  int arg7 = (int) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  int val7 ;
+  int ecode7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_preFilterType_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvFindExtrinsicCameraParams2",args.length(),7,6,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterType_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->preFilterType);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoBMState_preFilterSize_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoBMState_preFilterSize_set",args.length(),2,2,0)) {
-    SWIG_fail;
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterSize_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "5"" of type '" "CvMat *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "6"" of type '" "CvMat *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  if (6<args.length()) {
+    ecode7 = SWIG_AsVal_int(args(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "7"" of type '" "int""'");
+    } 
+    arg7 = (int)(val7);
+  }
+  {
+    try {
+      cvFindExtrinsicCameraParams2((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6,arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_preFilterSize_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->preFilterSize = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -93930,56 +94384,79 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_preFilterSize_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvInitIntrinsicParams2D (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvSize arg4 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  double arg6 = (double) 1. ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  double val6 ;
+  int ecode6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_preFilterSize_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvInitIntrinsicParams2D",args.length(),6,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterSize_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvInitIntrinsicParams2D" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->preFilterSize);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoBMState_preFilterCap_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoBMState_preFilterCap_set",args.length(),2,2,0)) {
-    SWIG_fail;
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvInitIntrinsicParams2D" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterCap_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvInitIntrinsicParams2D" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  {
+    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvSize,  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvInitIntrinsicParams2D" "', argument " "4"" of type '" "CvSize""'"); 
+    }  
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvInitIntrinsicParams2D" "', argument " "4"" of type '" "CvSize""'");
+    } else {
+      arg4 = *((CvSize *)(argp4));
+    }
+  }
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvInitIntrinsicParams2D" "', argument " "5"" of type '" "CvMat *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  if (5<args.length()) {
+    ecode6 = SWIG_AsVal_double(args(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvInitIntrinsicParams2D" "', argument " "6"" of type '" "double""'");
+    } 
+    arg6 = (double)(val6);
+  }
+  {
+    try {
+      cvInitIntrinsicParams2D((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_preFilterCap_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->preFilterCap = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -93987,113 +94464,297 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_preFilterCap_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+static octave_value_list _wrap_cvFindChessboardCorners (const octave_value_list& args, int nargout) {
+  void *arg1 = (void *) 0 ;
+  CvSize arg2 ;
+  CvPoint2D32f *arg3 = (CvPoint2D32f *) 0 ;
+  int *arg4 = (int *) NULL ;
+  int arg5 = (int) 1+2 ;
+  int res1 ;
+  CvSize *pattern_size2 ;
+  CvPoint2D32f *tmp_corners2 ;
+  int tmp_ncorners2 ;
+  int val5 ;
+  int ecode5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_preFilterCap_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvFindChessboardCorners",args.length(),3,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0),SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterCap_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvFindChessboardCorners" "', argument " "1"" of type '" "void const *""'"); 
+  }
+  {
+    void * vptr;
+    if( SWIG_ConvertPtr(args(1), &vptr, SWIGTYPE_p_CvSize, SWIG_POINTER_EXCEPTION ) == -1){
+      SWIG_fail;
+    }
+    pattern_size2=(CvSize *)vptr;
+    tmp_ncorners2 = pattern_size2->width*pattern_size2->height;
+    
+    tmp_corners2 = (CvPoint2D32f *) malloc(sizeof(CvPoint2D32f)*tmp_ncorners2);
+    arg2 = *pattern_size2;
+    arg3 = tmp_corners2;
+    arg4 = &tmp_ncorners2;
+  }
+  if (2<args.length()) {
+    ecode5 = SWIG_AsVal_int(args(2), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvFindChessboardCorners" "', argument " "5"" of type '" "int""'");
+    } 
+    arg5 = (int)(val5);
+  }
+  {
+    try {
+      result = (int)cvFindChessboardCorners((void const *)arg1,arg2,arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->preFilterCap);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    int i;
+    octave_value to_add;
+    
+    // create the list to return
+    to_add = OctList_New ( tmp_ncorners2 );
+    
+    // extract all the corner values of the result, and add it to the
+    // final resulting list
+    for (i = 0; i < tmp_ncorners2; i++) {
+      CvPoint2D32f * pt = new CvPoint2D32f;
+      pt->x = tmp_corners2[i].x;
+      pt->y = tmp_corners2[i].y;
+      
+      OctList_SetItem (to_add, i,
+        SWIG_NewPointerObj( pt, SWIGTYPE_p_CvPoint2D32f, 0));
+    }
+    
+    _outp = SWIG_AppendResult( _outp, &to_add, 1);
+    free(tmp_corners2);
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_SADWindowSize_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+static octave_value_list _wrap_cvDrawChessboardCorners (const octave_value_list& args, int nargout) {
+  CvArr *arg1 = (CvArr *) 0 ;
+  CvSize arg2 ;
+  CvPoint2D32f *arg3 = (CvPoint2D32f *) 0 ;
+  int arg4 ;
+  int arg5 ;
+  bool freearg1 = false ;
+  void *argp2 ;
+  int res2 = 0 ;
+  int cornersCount3 ;
+  CvPoint2D32f *corners3 ;
+  int val5 ;
+  int ecode5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoBMState_SADWindowSize_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvDrawChessboardCorners",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_SADWindowSize_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+  {
+    arg1 = OctObject_to_CvArr(args(0), &freearg1);
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_SADWindowSize_set" "', argument " "2"" of type '" "int""'");
+  {
+    res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSize,  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvDrawChessboardCorners" "', argument " "2"" of type '" "CvSize""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvDrawChessboardCorners" "', argument " "2"" of type '" "CvSize""'");
+    } else {
+      arg2 = *((CvSize *)(argp2));
+    }
+  }
+  {
+    int i;
+    
+    if(!OctList_Check(args(2))){
+      error("Expected a list");
+      SWIG_fail;
+    }
+    
+    // get the size of the input array
+    cornersCount3 = OctList_Size (args(2));
+    arg4 = cornersCount3;
+    
+    // allocate the needed memory
+    corners3 = (CvPoint2D32f *)malloc (arg4 * sizeof (CvPoint2D32f));
+    arg3 = corners3;
+    
+    // the size of the array for the C call
+    
+    // extract all the points values from the list
+    for (i = 0; i < arg4; i++) {
+      octave_value item = OctList_GetItem (args(2), i);
+      
+      void *vptr;
+      SWIG_Octave_ConvertPtr (item, &vptr,
+        SWIGTYPE_p_CvPoint2D32f,
+        SWIG_POINTER_EXCEPTION);
+      CvPoint2D32f *p = (CvPoint2D32f *) vptr;;
+      arg3 [i].x = p->x;
+      arg3 [i].y = p->y;
+    }
+  }
+  ecode5 = SWIG_AsVal_int(args(3), &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvDrawChessboardCorners" "', argument " "5"" of type '" "int""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->SADWindowSize = arg2;
+  arg5 = (int)(val5);
+  {
+    try {
+      cvDrawChessboardCorners(arg1,arg2,arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    int i;
+    octave_value to_add;
+    
+    // create the list to return
+    to_add = OctList_New (cornersCount3);
+    
+    // extract all the corner values of the result, and add it to the
+    // final resulting list
+    for (i = 0; i < cornersCount3; i++) {
+      OctList_SetItem (to_add, i,
+        SWIG_NewPointerObj (&(corners3 [i]),
+          SWIGTYPE_p_CvPoint2D32f, 0));
+    }
+    
+    _outp = SWIG_AppendResult( _outp, &to_add, 1);
+  }
+  {
+    if(arg1!=NULL && freearg1){
+      cvReleaseData( arg1 );
+      cvFree(&(arg1));
+    }
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_SADWindowSize_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvCalibrateCamera2 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvSize arg4 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) NULL ;
+  CvMat *arg8 = (CvMat *) NULL ;
+  int arg9 = (int) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  int val9 ;
+  int ecode9 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_SADWindowSize_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvCalibrateCamera2",args.length(),9,6,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_SADWindowSize_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCalibrateCamera2" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->SADWindowSize);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoBMState_minDisparity_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoBMState_minDisparity_set",args.length(),2,2,0)) {
-    SWIG_fail;
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCalibrateCamera2" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_minDisparity_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvCalibrateCamera2" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  {
+    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvSize,  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvCalibrateCamera2" "', argument " "4"" of type '" "CvSize""'"); 
+    }  
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvCalibrateCamera2" "', argument " "4"" of type '" "CvSize""'");
+    } else {
+      arg4 = *((CvSize *)(argp4));
+    }
+  }
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvCalibrateCamera2" "', argument " "5"" of type '" "CvMat *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvCalibrateCamera2" "', argument " "6"" of type '" "CvMat *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  if (6<args.length()) {
+    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvCalibrateCamera2" "', argument " "7"" of type '" "CvMat *""'"); 
+    }
+    arg7 = (CvMat *)(argp7);
+  }
+  if (7<args.length()) {
+    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvCalibrateCamera2" "', argument " "8"" of type '" "CvMat *""'"); 
+    }
+    arg8 = (CvMat *)(argp8);
+  }
+  if (8<args.length()) {
+    ecode9 = SWIG_AsVal_int(args(8), &val9);
+    if (!SWIG_IsOK(ecode9)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "cvCalibrateCamera2" "', argument " "9"" of type '" "int""'");
+    } 
+    arg9 = (int)(val9);
+  }
+  {
+    try {
+      cvCalibrateCamera2((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_minDisparity_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->minDisparity = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94101,56 +94762,279 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_minDisparity_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvCalibrationMatrixValues (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvSize arg2 ;
+  double arg3 = (double) 0 ;
+  double arg4 = (double) 0 ;
+  double *arg5 = (double *) NULL ;
+  double *arg6 = (double *) NULL ;
+  double *arg7 = (double *) NULL ;
+  CvPoint2D64f *arg8 = (CvPoint2D64f *) NULL ;
+  double *arg9 = (double *) NULL ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 = 0 ;
+  int res9 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_minDisparity_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvCalibrationMatrixValues",args.length(),9,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_minDisparity_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCalibrationMatrixValues" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->minDisparity);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvMat *)(argp1);
+  {
+    res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSize,  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCalibrationMatrixValues" "', argument " "2"" of type '" "CvSize""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvCalibrationMatrixValues" "', argument " "2"" of type '" "CvSize""'");
+    } else {
+      arg2 = *((CvSize *)(argp2));
+    }
+  }
+  if (2<args.length()) {
+    ecode3 = SWIG_AsVal_double(args(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvCalibrationMatrixValues" "', argument " "3"" of type '" "double""'");
+    } 
+    arg3 = (double)(val3);
+  }
+  if (3<args.length()) {
+    ecode4 = SWIG_AsVal_double(args(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvCalibrationMatrixValues" "', argument " "4"" of type '" "double""'");
+    } 
+    arg4 = (double)(val4);
+  }
+  if (4<args.length()) {
+    res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_double, 0 |  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvCalibrationMatrixValues" "', argument " "5"" of type '" "double *""'"); 
+    }
+    arg5 = (double *)(argp5);
+  }
+  if (5<args.length()) {
+    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_double, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvCalibrationMatrixValues" "', argument " "6"" of type '" "double *""'"); 
+    }
+    arg6 = (double *)(argp6);
+  }
+  if (6<args.length()) {
+    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_double, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvCalibrationMatrixValues" "', argument " "7"" of type '" "double *""'"); 
+    }
+    arg7 = (double *)(argp7);
+  }
+  if (7<args.length()) {
+    res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvPoint2D64f, 0 |  0 );
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvCalibrationMatrixValues" "', argument " "8"" of type '" "CvPoint2D64f *""'"); 
+    }
+    arg8 = (CvPoint2D64f *)(argp8);
+  }
+  if (8<args.length()) {
+    res9 = SWIG_ConvertPtr(args(8), &argp9,SWIGTYPE_p_double, 0 |  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvCalibrationMatrixValues" "', argument " "9"" of type '" "double *""'"); 
+    }
+    arg9 = (double *)(argp9);
+  }
+  {
+    try {
+      cvCalibrationMatrixValues((CvMat const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_numberOfDisparities_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_cvStereoCalibrate (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvSize arg9 ;
+  CvMat *arg10 = (CvMat *) 0 ;
+  CvMat *arg11 = (CvMat *) 0 ;
+  CvMat *arg12 = (CvMat *) 0 ;
+  CvMat *arg13 = (CvMat *) 0 ;
+  CvTermCriteria arg14 = (CvTermCriteria) cvTermCriteria( 1 +2,30,1e-6) ;
+  int arg15 = (int) 256 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  void *argp10 = 0 ;
+  int res10 = 0 ;
+  void *argp11 = 0 ;
+  int res11 = 0 ;
+  void *argp12 = 0 ;
+  int res12 = 0 ;
+  void *argp13 = 0 ;
+  int res13 = 0 ;
+  void *argp14 ;
+  int res14 = 0 ;
+  int val15 ;
+  int ecode15 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoBMState_numberOfDisparities_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvStereoCalibrate",args.length(),15,11,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_numberOfDisparities_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvStereoCalibrate" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvStereoCalibrate" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvStereoCalibrate" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvStereoCalibrate" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvStereoCalibrate" "', argument " "5"" of type '" "CvMat *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvStereoCalibrate" "', argument " "6"" of type '" "CvMat *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvStereoCalibrate" "', argument " "7"" of type '" "CvMat *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvStereoCalibrate" "', argument " "8"" of type '" "CvMat *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvSize,  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvStereoCalibrate" "', argument " "9"" of type '" "CvSize""'"); 
+    }  
+    if (!argp9) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvStereoCalibrate" "', argument " "9"" of type '" "CvSize""'");
+    } else {
+      arg9 = *((CvSize *)(argp9));
+    }
+  }
+  res10 = SWIG_ConvertPtr(args(9), &argp10,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res10)) {
+    SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "cvStereoCalibrate" "', argument " "10"" of type '" "CvMat *""'"); 
+  }
+  arg10 = (CvMat *)(argp10);
+  res11 = SWIG_ConvertPtr(args(10), &argp11,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res11)) {
+    SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "cvStereoCalibrate" "', argument " "11"" of type '" "CvMat *""'"); 
+  }
+  arg11 = (CvMat *)(argp11);
+  if (11<args.length()) {
+    res12 = SWIG_ConvertPtr(args(11), &argp12,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res12)) {
+      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "cvStereoCalibrate" "', argument " "12"" of type '" "CvMat *""'"); 
+    }
+    arg12 = (CvMat *)(argp12);
+  }
+  if (12<args.length()) {
+    res13 = SWIG_ConvertPtr(args(12), &argp13,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res13)) {
+      SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "cvStereoCalibrate" "', argument " "13"" of type '" "CvMat *""'"); 
+    }
+    arg13 = (CvMat *)(argp13);
+  }
+  if (13<args.length()) {
+    {
+      res14 = SWIG_ConvertPtr(args(13), &argp14, SWIGTYPE_p_CvTermCriteria,  0 );
+      if (!SWIG_IsOK(res14)) {
+        SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "cvStereoCalibrate" "', argument " "14"" of type '" "CvTermCriteria""'"); 
+      }  
+      if (!argp14) {
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvStereoCalibrate" "', argument " "14"" of type '" "CvTermCriteria""'");
+      } else {
+        arg14 = *((CvTermCriteria *)(argp14));
+      }
+    }
+  }
+  if (14<args.length()) {
+    ecode15 = SWIG_AsVal_int(args(14), &val15);
+    if (!SWIG_IsOK(ecode15)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "cvStereoCalibrate" "', argument " "15"" of type '" "int""'");
+    } 
+    arg15 = (int)(val15);
+  }
+  {
+    try {
+      cvStereoCalibrate((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_numberOfDisparities_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->numberOfDisparities = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94158,81 +95042,226 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_numberOfDisparities_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvStereoRectify (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvSize arg5 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvMat *arg9 = (CvMat *) 0 ;
+  CvMat *arg10 = (CvMat *) 0 ;
+  CvMat *arg11 = (CvMat *) 0 ;
+  CvMat *arg12 = (CvMat *) 0 ;
+  int arg13 = (int) 1024 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 = 0 ;
+  int res9 = 0 ;
+  void *argp10 = 0 ;
+  int res10 = 0 ;
+  void *argp11 = 0 ;
+  int res11 = 0 ;
+  void *argp12 = 0 ;
+  int res12 = 0 ;
+  int val13 ;
+  int ecode13 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_numberOfDisparities_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvStereoRectify",args.length(),13,11,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_numberOfDisparities_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvStereoRectify" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->numberOfDisparities);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvStereoRectify" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvStereoRectify" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvStereoRectify" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvStereoRectify" "', argument " "5"" of type '" "CvSize""'"); 
+    }  
+    if (!argp5) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvStereoRectify" "', argument " "5"" of type '" "CvSize""'");
+    } else {
+      arg5 = *((CvSize *)(argp5));
+    }
+  }
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvStereoRectify" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvStereoRectify" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "cvStereoRectify" "', argument " "8"" of type '" "CvMat *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  res9 = SWIG_ConvertPtr(args(8), &argp9,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res9)) {
+    SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "cvStereoRectify" "', argument " "9"" of type '" "CvMat *""'"); 
+  }
+  arg9 = (CvMat *)(argp9);
+  res10 = SWIG_ConvertPtr(args(9), &argp10,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res10)) {
+    SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "cvStereoRectify" "', argument " "10"" of type '" "CvMat *""'"); 
+  }
+  arg10 = (CvMat *)(argp10);
+  res11 = SWIG_ConvertPtr(args(10), &argp11,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res11)) {
+    SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "cvStereoRectify" "', argument " "11"" of type '" "CvMat *""'"); 
+  }
+  arg11 = (CvMat *)(argp11);
+  if (11<args.length()) {
+    res12 = SWIG_ConvertPtr(args(11), &argp12,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res12)) {
+      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "cvStereoRectify" "', argument " "12"" of type '" "CvMat *""'"); 
+    }
+    arg12 = (CvMat *)(argp12);
+  }
+  if (12<args.length()) {
+    ecode13 = SWIG_AsVal_int(args(12), &val13);
+    if (!SWIG_IsOK(ecode13)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "cvStereoRectify" "', argument " "13"" of type '" "int""'");
+    } 
+    arg13 = (int)(val13);
+  }
+  {
+    try {
+      cvStereoRectify((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,(CvMat const *)arg6,(CvMat const *)arg7,arg8,arg9,arg10,arg11,arg12,arg13); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_textureThreshold_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_cvStereoRectifyUncalibrated (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvSize arg4 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  double arg7 = (double) 5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  double val7 ;
+  int ecode7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_textureThreshold_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvStereoRectifyUncalibrated",args.length(),7,6,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_textureThreshold_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvStereoRectifyUncalibrated" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_textureThreshold_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->textureThreshold = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoBMState_textureThreshold_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvStereoBMState_textureThreshold_get",args.length(),1,1,0)) {
-    SWIG_fail;
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvStereoRectifyUncalibrated" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_textureThreshold_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvStereoRectifyUncalibrated" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  {
+    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvSize,  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvStereoRectifyUncalibrated" "', argument " "4"" of type '" "CvSize""'"); 
+    }  
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvStereoRectifyUncalibrated" "', argument " "4"" of type '" "CvSize""'");
+    } else {
+      arg4 = *((CvSize *)(argp4));
+    }
+  }
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvStereoRectifyUncalibrated" "', argument " "5"" of type '" "CvMat *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvStereoRectifyUncalibrated" "', argument " "6"" of type '" "CvMat *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  if (6<args.length()) {
+    ecode7 = SWIG_AsVal_double(args(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "cvStereoRectifyUncalibrated" "', argument " "7"" of type '" "double""'");
+    } 
+    arg7 = (double)(val7);
+  }
+  {
+    try {
+      result = (int)cvStereoRectifyUncalibrated((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6,arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->textureThreshold);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94240,8 +95269,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_uniquenessRatio_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvCreatePOSITObject (const octave_value_list& args, int nargout) {
+  CvPoint3D32f *arg1 = (CvPoint3D32f *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -94250,78 +95279,108 @@ static octave_value_list _wrap_CvStereoBMState_uniquenessRatio_set (const octave
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvPOSITObject *result = 0 ;
   
-  if (!SWIG_check_num_args("CvStereoBMState_uniquenessRatio_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvCreatePOSITObject",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPoint3D32f, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_uniquenessRatio_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCreatePOSITObject" "', argument " "1"" of type '" "CvPoint3D32f *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
+  arg1 = (CvPoint3D32f *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_uniquenessRatio_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvCreatePOSITObject" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->uniquenessRatio = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoBMState_uniquenessRatio_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvStereoBMState_uniquenessRatio_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_uniquenessRatio_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+  {
+    try {
+      result = (CvPOSITObject *)cvCreatePOSITObject(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->uniquenessRatio);
-  _outv = SWIG_From_int((int)(result));
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvPOSITObject, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_speckleWindowSize_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_cvPOSIT (const octave_value_list& args, int nargout) {
+  CvPOSITObject *arg1 = (CvPOSITObject *) 0 ;
+  CvPoint2D32f *arg2 = (CvPoint2D32f *) 0 ;
+  double arg3 ;
+  CvTermCriteria arg4 ;
+  CvMatr32f arg5 = (CvMatr32f) 0 ;
+  CvVect32f arg6 = (CvVect32f) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  void *argp4 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoBMState_speckleWindowSize_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvPOSIT",args.length(),6,6,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPOSITObject, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_speckleWindowSize_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvPOSIT" "', argument " "1"" of type '" "CvPOSITObject *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_speckleWindowSize_set" "', argument " "2"" of type '" "int""'");
+  arg1 = (CvPOSITObject *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvPOSIT" "', argument " "2"" of type '" "CvPoint2D32f *""'"); 
+  }
+  arg2 = (CvPoint2D32f *)(argp2);
+  ecode3 = SWIG_AsVal_double(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvPOSIT" "', argument " "3"" of type '" "double""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->speckleWindowSize = arg2;
+  arg3 = (double)(val3);
+  {
+    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvTermCriteria,  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvPOSIT" "', argument " "4"" of type '" "CvTermCriteria""'"); 
+    }  
+    if (!argp4) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "cvPOSIT" "', argument " "4"" of type '" "CvTermCriteria""'");
+    } else {
+      arg4 = *((CvTermCriteria *)(argp4));
+    }
+  }
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvPOSIT" "', argument " "5"" of type '" "CvMatr32f""'"); 
+  }
+  arg5 = (CvMatr32f)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvPOSIT" "', argument " "6"" of type '" "CvVect32f""'"); 
+  }
+  arg6 = (CvVect32f)(argp6);
+  {
+    try {
+      cvPOSIT(arg1,arg2,arg3,arg4,arg5,arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94329,170 +95388,337 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_speckleWindowSize_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvReleasePOSITObject (const octave_value_list& args, int nargout) {
+  CvPOSITObject **arg1 = (CvPOSITObject **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_speckleWindowSize_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvReleasePOSITObject",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvPOSITObject, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_speckleWindowSize_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleasePOSITObject" "', argument " "1"" of type '" "CvPOSITObject **""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->speckleWindowSize);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvPOSITObject **)(argp1);
+  {
+    try {
+      cvReleasePOSITObject(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_speckleRange_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
+static octave_value_list _wrap_cvRANSACUpdateNumIters (const octave_value_list& args, int nargout) {
+  double arg1 ;
+  double arg2 ;
+  int arg3 ;
+  int arg4 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
   int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_speckleRange_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvRANSACUpdateNumIters",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_speckleRange_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
-  }
-  arg1 = (CvStereoBMState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  ecode1 = SWIG_AsVal_double(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvRANSACUpdateNumIters" "', argument " "1"" of type '" "double""'");
+  } 
+  arg1 = (double)(val1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_speckleRange_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvRANSACUpdateNumIters" "', argument " "2"" of type '" "double""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->speckleRange = arg2;
-  _outv = octave_value();
+  arg2 = (double)(val2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvRANSACUpdateNumIters" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  ecode4 = SWIG_AsVal_int(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvRANSACUpdateNumIters" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = (int)(val4);
+  {
+    try {
+      result = (int)cvRANSACUpdateNumIters(arg1,arg2,arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_speckleRange_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvConvertPointsHomogeneous (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_speckleRange_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvConvertPointsHomogeneous",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_speckleRange_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvConvertPointsHomogeneous" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (int) ((arg1)->speckleRange);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvConvertPointsHomogeneous" "', argument " "2"" of type '" "CvMat *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  {
+    try {
+      cvConvertPointsHomogeneous((CvMat const *)arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_preFilteredImg0_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvFindFundamentalMat (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  int arg4 = (int) 8 ;
+  double arg5 = (double) 3. ;
+  double arg6 = (double) 0.99 ;
+  CvMat *arg7 = (CvMat *) NULL ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  double val5 ;
+  int ecode5 = 0 ;
+  double val6 ;
+  int ecode6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_preFilteredImg0_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvFindFundamentalMat",args.length(),7,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilteredImg0_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvFindFundamentalMat" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoBMState_preFilteredImg0_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvFindFundamentalMat" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->preFilteredImg0 = arg2;
-  _outv = octave_value();
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvFindFundamentalMat" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  if (3<args.length()) {
+    ecode4 = SWIG_AsVal_int(args(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvFindFundamentalMat" "', argument " "4"" of type '" "int""'");
+    } 
+    arg4 = (int)(val4);
+  }
+  if (4<args.length()) {
+    ecode5 = SWIG_AsVal_double(args(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvFindFundamentalMat" "', argument " "5"" of type '" "double""'");
+    } 
+    arg5 = (double)(val5);
+  }
+  if (5<args.length()) {
+    ecode6 = SWIG_AsVal_double(args(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvFindFundamentalMat" "', argument " "6"" of type '" "double""'");
+    } 
+    arg6 = (double)(val6);
+  }
+  if (6<args.length()) {
+    res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "cvFindFundamentalMat" "', argument " "7"" of type '" "CvMat *""'"); 
+    }
+    arg7 = (CvMat *)(argp7);
+  }
+  {
+    try {
+      result = (int)cvFindFundamentalMat((CvMat const *)arg1,(CvMat const *)arg2,arg3,arg4,arg5,arg6,arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_preFilteredImg0_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvComputeCorrespondEpilines (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvStereoBMState_preFilteredImg0_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvComputeCorrespondEpilines",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilteredImg0_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvComputeCorrespondEpilines" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (CvMat *) ((arg1)->preFilteredImg0);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvComputeCorrespondEpilines" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvComputeCorrespondEpilines" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvComputeCorrespondEpilines" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    try {
+      cvComputeCorrespondEpilines((CvMat const *)arg1,arg2,(CvMat const *)arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_preFilteredImg1_set (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvTriangulatePoints (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoBMState_preFilteredImg1_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvTriangulatePoints",args.length(),5,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilteredImg1_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvTriangulatePoints" "', argument " "1"" of type '" "CvMat *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoBMState_preFilteredImg1_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvTriangulatePoints" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->preFilteredImg1 = arg2;
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvTriangulatePoints" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvTriangulatePoints" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvTriangulatePoints" "', argument " "5"" of type '" "CvMat *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  {
+    try {
+      cvTriangulatePoints(arg1,arg2,arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94500,56 +95726,95 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_preFilteredImg1_get (const octave_value_list& args, int nargout) {
-  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+static octave_value_list _wrap_cvCorrectMatches (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvStereoBMState_preFilteredImg1_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvCorrectMatches",args.length(),5,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilteredImg1_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCorrectMatches" "', argument " "1"" of type '" "CvMat *""'"); 
   }
-  arg1 = (CvStereoBMState *)(argp1);
-  result = (CvMat *) ((arg1)->preFilteredImg1);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCorrectMatches" "', argument " "2"" of type '" "CvMat *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvCorrectMatches" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvCorrectMatches" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvCorrectMatches" "', argument " "5"" of type '" "CvMat *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  {
+    try {
+      cvCorrectMatches(arg1,arg2,arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_slidingSumBuf_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvStereoBMState_preFilterType_set (const octave_value_list& args, int nargout) {
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoBMState_slidingSumBuf_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilterType_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_slidingSumBuf_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterType_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
   arg1 = (CvStereoBMState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoBMState_slidingSumBuf_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->slidingSumBuf = arg2;
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_preFilterType_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->preFilterType = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94557,81 +95822,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoBMState_slidingSumBuf_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvStereoBMState_preFilterType_get (const octave_value_list& args, int nargout) {
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvStereoBMState_slidingSumBuf_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilterType_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_slidingSumBuf_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterType_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
   arg1 = (CvStereoBMState *)(argp1);
-  result = (CvMat *) ((arg1)->slidingSumBuf);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvStereoBMState (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvStereoBMState *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvStereoBMState",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvStereoBMState *)new CvStereoBMState(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStereoBMState, 1 |  0 );
+  result = (int) ((arg1)->preFilterType);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvStereoBMState (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvStereoBMState_preFilterSize_set (const octave_value_list& args, int nargout) {
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("delete_CvStereoBMState",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilterSize_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvStereoBMState" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterSize_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
   arg1 = (CvStereoBMState *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_preFilterSize_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->preFilterSize = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94639,96 +95879,56 @@ fail:
 }
 
 
-static swig_octave_member swig_CvStereoBMState_members[] = {
-{"preFilterType",0,_wrap_CvStereoBMState_preFilterType_get,_wrap_CvStereoBMState_preFilterType_set,0,0},
-{"preFilterSize",0,_wrap_CvStereoBMState_preFilterSize_get,_wrap_CvStereoBMState_preFilterSize_set,0,0},
-{"preFilterCap",0,_wrap_CvStereoBMState_preFilterCap_get,_wrap_CvStereoBMState_preFilterCap_set,0,0},
-{"SADWindowSize",0,_wrap_CvStereoBMState_SADWindowSize_get,_wrap_CvStereoBMState_SADWindowSize_set,0,0},
-{"minDisparity",0,_wrap_CvStereoBMState_minDisparity_get,_wrap_CvStereoBMState_minDisparity_set,0,0},
-{"numberOfDisparities",0,_wrap_CvStereoBMState_numberOfDisparities_get,_wrap_CvStereoBMState_numberOfDisparities_set,0,0},
-{"textureThreshold",0,_wrap_CvStereoBMState_textureThreshold_get,_wrap_CvStereoBMState_textureThreshold_set,0,0},
-{"uniquenessRatio",0,_wrap_CvStereoBMState_uniquenessRatio_get,_wrap_CvStereoBMState_uniquenessRatio_set,0,0},
-{"speckleWindowSize",0,_wrap_CvStereoBMState_speckleWindowSize_get,_wrap_CvStereoBMState_speckleWindowSize_set,0,0},
-{"speckleRange",0,_wrap_CvStereoBMState_speckleRange_get,_wrap_CvStereoBMState_speckleRange_set,0,0},
-{"preFilteredImg0",0,_wrap_CvStereoBMState_preFilteredImg0_get,_wrap_CvStereoBMState_preFilteredImg0_set,0,0},
-{"preFilteredImg1",0,_wrap_CvStereoBMState_preFilteredImg1_get,_wrap_CvStereoBMState_preFilteredImg1_set,0,0},
-{"slidingSumBuf",0,_wrap_CvStereoBMState_slidingSumBuf_get,_wrap_CvStereoBMState_slidingSumBuf_set,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvStereoBMState_base_names[] = {0};
-static const swig_type_info *swig_CvStereoBMState_base[] = {0};
-static swig_octave_class _wrap_class_CvStereoBMState = {"CvStereoBMState", &SWIGTYPE_p_CvStereoBMState,0,_wrap_new_CvStereoBMState,0,_wrap_delete_CvStereoBMState,swig_CvStereoBMState_members,swig_CvStereoBMState_base_names,swig_CvStereoBMState_base };
-
-static octave_value_list _wrap_cvCreateStereoBMState (const octave_value_list& args, int nargout) {
-  int arg1 = (int) 0 ;
-  int arg2 = (int) 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+static octave_value_list _wrap_CvStereoBMState_preFilterSize_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvStereoBMState *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("cvCreateStereoBMState",args.length(),2,0,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilterSize_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  if (0<args.length()) {
-    ecode1 = SWIG_AsVal_int(args(0), &val1);
-    if (!SWIG_IsOK(ecode1)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCreateStereoBMState" "', argument " "1"" of type '" "int""'");
-    } 
-    arg1 = (int)(val1);
-  }
-  if (1<args.length()) {
-    ecode2 = SWIG_AsVal_int(args(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvCreateStereoBMState" "', argument " "2"" of type '" "int""'");
-    } 
-    arg2 = (int)(val2);
-  }
-  {
-    try {
-      result = (CvStereoBMState *)cvCreateStereoBMState(arg1,arg2); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterSize_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->preFilterSize);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvReleaseStereoBMState (const octave_value_list& args, int nargout) {
-  CvStereoBMState **arg1 = (CvStereoBMState **) 0 ;
+static octave_value_list _wrap_CvStereoBMState_preFilterCap_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvReleaseStereoBMState",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilterCap_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvStereoBMState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleaseStereoBMState" "', argument " "1"" of type '" "CvStereoBMState **""'"); 
-  }
-  arg1 = (CvStereoBMState **)(argp1);
-  {
-    try {
-      cvReleaseStereoBMState(arg1); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterCap_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
+  arg1 = (CvStereoBMState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_preFilterCap_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->preFilterCap = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94736,73 +95936,33 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvFindStereoCorrespondenceBM (const octave_value_list& args, int nargout) {
-  CvArr *arg1 = (CvArr *) 0 ;
-  CvArr *arg2 = (CvArr *) 0 ;
-  CvArr *arg3 = (CvArr *) 0 ;
-  CvStereoBMState *arg4 = (CvStereoBMState *) 0 ;
-  bool freearg1 = false ;
-  bool freearg2 = false ;
-  bool freearg3 = false ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
+static octave_value_list _wrap_CvStereoBMState_preFilterCap_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("cvFindStereoCorrespondenceBM",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilterCap_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  {
-    arg1 = OctObject_to_CvArr(args(0), &freearg1);
-  }
-  {
-    arg2 = OctObject_to_CvArr(args(1), &freearg2);
-  }
-  {
-    arg3 = OctObject_to_CvArr(args(2), &freearg3);
-  }
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvFindStereoCorrespondenceBM" "', argument " "4"" of type '" "CvStereoBMState *""'"); 
-  }
-  arg4 = (CvStereoBMState *)(argp4);
-  {
-    try {
-      cvFindStereoCorrespondenceBM((void const *)arg1,(void const *)arg2,arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilterCap_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->preFilterCap);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  {
-    if(arg1!=NULL && freearg1){
-      cvReleaseData( arg1 );
-      cvFree(&(arg1));
-    }
-  }
-  {
-    if(arg2!=NULL && freearg2){
-      cvReleaseData( arg2 );
-      cvFree(&(arg2));
-    }
-  }
-  {
-    if(arg3!=NULL && freearg3){
-      cvReleaseData( arg3 );
-      cvFree(&(arg3));
-    }
-  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_Ithreshold_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_SADWindowSize_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -94812,20 +95972,20 @@ static octave_value_list _wrap_CvStereoGCState_Ithreshold_set (const octave_valu
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoGCState_Ithreshold_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_SADWindowSize_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_Ithreshold_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_SADWindowSize_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
+  arg1 = (CvStereoBMState *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_Ithreshold_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_SADWindowSize_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->Ithreshold = arg2;
+  if (arg1) (arg1)->SADWindowSize = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94833,8 +95993,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_Ithreshold_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_SADWindowSize_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -94842,15 +96002,15 @@ static octave_value_list _wrap_CvStereoGCState_Ithreshold_get (const octave_valu
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvStereoGCState_Ithreshold_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_SADWindowSize_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_Ithreshold_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_SADWindowSize_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (int) ((arg1)->Ithreshold);
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->SADWindowSize);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94858,8 +96018,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_interactionRadius_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_minDisparity_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -94869,20 +96029,20 @@ static octave_value_list _wrap_CvStereoGCState_interactionRadius_set (const octa
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoGCState_interactionRadius_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_minDisparity_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_interactionRadius_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_minDisparity_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
+  arg1 = (CvStereoBMState *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_interactionRadius_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_minDisparity_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->interactionRadius = arg2;
+  if (arg1) (arg1)->minDisparity = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94890,8 +96050,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_interactionRadius_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_minDisparity_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -94899,15 +96059,15 @@ static octave_value_list _wrap_CvStereoGCState_interactionRadius_get (const octa
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvStereoGCState_interactionRadius_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_minDisparity_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_interactionRadius_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_minDisparity_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (int) ((arg1)->interactionRadius);
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->minDisparity);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94915,31 +96075,31 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_K_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  float arg2 ;
+static octave_value_list _wrap_CvStereoBMState_numberOfDisparities_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  float val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoGCState_K_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_numberOfDisparities_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_K_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_numberOfDisparities_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  arg1 = (CvStereoBMState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_K_set" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_numberOfDisparities_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (float)(val2);
-  if (arg1) (arg1)->K = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->numberOfDisparities = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -94947,56 +96107,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_K_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_numberOfDisparities_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvStereoGCState_K_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_numberOfDisparities_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_K_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_numberOfDisparities_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (float) ((arg1)->K);
-  _outv = SWIG_From_float((float)(result));
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->numberOfDisparities);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_lambda_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  float arg2 ;
+static octave_value_list _wrap_CvStereoBMState_textureThreshold_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  float val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoGCState_lambda_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_textureThreshold_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_textureThreshold_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  arg1 = (CvStereoBMState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_lambda_set" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_textureThreshold_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (float)(val2);
-  if (arg1) (arg1)->lambda = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->textureThreshold = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -95004,56 +96164,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_lambda_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_textureThreshold_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvStereoGCState_lambda_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_textureThreshold_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_textureThreshold_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (float) ((arg1)->lambda);
-  _outv = SWIG_From_float((float)(result));
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->textureThreshold);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_lambda1_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  float arg2 ;
+static octave_value_list _wrap_CvStereoBMState_uniquenessRatio_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  float val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoGCState_lambda1_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_uniquenessRatio_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda1_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_uniquenessRatio_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  arg1 = (CvStereoBMState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_lambda1_set" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_uniquenessRatio_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (float)(val2);
-  if (arg1) (arg1)->lambda1 = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->uniquenessRatio = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -95061,56 +96221,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_lambda1_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_uniquenessRatio_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvStereoGCState_lambda1_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_uniquenessRatio_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda1_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_uniquenessRatio_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (float) ((arg1)->lambda1);
-  _outv = SWIG_From_float((float)(result));
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->uniquenessRatio);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_lambda2_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  float arg2 ;
+static octave_value_list _wrap_CvStereoBMState_speckleWindowSize_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  float val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoGCState_lambda2_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_speckleWindowSize_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda2_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_speckleWindowSize_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  arg1 = (CvStereoBMState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_lambda2_set" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_speckleWindowSize_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (float)(val2);
-  if (arg1) (arg1)->lambda2 = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->speckleWindowSize = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -95118,33 +96278,33 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_lambda2_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_speckleWindowSize_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvStereoGCState_lambda2_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_speckleWindowSize_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda2_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_speckleWindowSize_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (float) ((arg1)->lambda2);
-  _outv = SWIG_From_float((float)(result));
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->speckleWindowSize);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_occlusionCost_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_speckleRange_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -95154,134 +96314,20 @@ static octave_value_list _wrap_CvStereoGCState_occlusionCost_set (const octave_v
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoGCState_occlusionCost_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_speckleRange_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_occlusionCost_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_speckleRange_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_occlusionCost_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->occlusionCost = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_occlusionCost_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_occlusionCost_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_occlusionCost_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (int) ((arg1)->occlusionCost);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_minDisparity_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_minDisparity_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_minDisparity_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_minDisparity_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->minDisparity = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_minDisparity_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_minDisparity_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_minDisparity_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (int) ((arg1)->minDisparity);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_numberOfDisparities_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_numberOfDisparities_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_numberOfDisparities_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
+  arg1 = (CvStereoBMState *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_numberOfDisparities_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_speckleRange_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->numberOfDisparities = arg2;
+  if (arg1) (arg1)->speckleRange = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -95289,8 +96335,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_numberOfDisparities_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_speckleRange_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -95298,15 +96344,15 @@ static octave_value_list _wrap_CvStereoGCState_numberOfDisparities_get (const oc
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvStereoGCState_numberOfDisparities_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_speckleRange_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_numberOfDisparities_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_speckleRange_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (int) ((arg1)->numberOfDisparities);
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->speckleRange);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -95314,8 +96360,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvStereoGCState_maxIters_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_trySmallerWindows_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -95325,11862 +96371,77 @@ static octave_value_list _wrap_CvStereoGCState_maxIters_set (const octave_value_
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvStereoGCState_maxIters_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_trySmallerWindows_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_maxIters_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_trySmallerWindows_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvStereoGCState *)(argp1);
+  arg1 = (CvStereoBMState *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_maxIters_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->maxIters = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_maxIters_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_maxIters_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_maxIters_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (int) ((arg1)->maxIters);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_left_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_left_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_left_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_left_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->left = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_left_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_left_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_left_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (CvMat *) ((arg1)->left);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_right_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_right_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_right_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_right_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->right = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_right_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_right_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_right_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (CvMat *) ((arg1)->right);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_dispLeft_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_dispLeft_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_dispLeft_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_dispLeft_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->dispLeft = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_dispLeft_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_dispLeft_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_dispLeft_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (CvMat *) ((arg1)->dispLeft);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_dispRight_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_dispRight_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_dispRight_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_dispRight_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->dispRight = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_dispRight_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_dispRight_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_dispRight_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (CvMat *) ((arg1)->dispRight);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_ptrLeft_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_ptrLeft_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_ptrLeft_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_ptrLeft_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->ptrLeft = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_ptrLeft_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_ptrLeft_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_ptrLeft_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (CvMat *) ((arg1)->ptrLeft);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_ptrRight_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_ptrRight_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_ptrRight_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_ptrRight_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->ptrRight = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_ptrRight_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_ptrRight_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_ptrRight_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (CvMat *) ((arg1)->ptrRight);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_vtxBuf_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_vtxBuf_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_vtxBuf_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_vtxBuf_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->vtxBuf = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_vtxBuf_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_vtxBuf_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_vtxBuf_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (CvMat *) ((arg1)->vtxBuf);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_edgeBuf_set (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_edgeBuf_set",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_edgeBuf_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_edgeBuf_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->edgeBuf = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvStereoGCState_edgeBuf_get (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvStereoGCState_edgeBuf_get",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_edgeBuf_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  result = (CvMat *) ((arg1)->edgeBuf);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvStereoGCState (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvStereoGCState *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvStereoGCState",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvStereoGCState *)new CvStereoGCState(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStereoGCState, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_delete_CvStereoGCState (const octave_value_list& args, int nargout) {
-  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("delete_CvStereoGCState",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvStereoGCState" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg1 = (CvStereoGCState *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static swig_octave_member swig_CvStereoGCState_members[] = {
-{"Ithreshold",0,_wrap_CvStereoGCState_Ithreshold_get,_wrap_CvStereoGCState_Ithreshold_set,0,0},
-{"interactionRadius",0,_wrap_CvStereoGCState_interactionRadius_get,_wrap_CvStereoGCState_interactionRadius_set,0,0},
-{"K",0,_wrap_CvStereoGCState_K_get,_wrap_CvStereoGCState_K_set,0,0},
-{"lambda",0,_wrap_CvStereoGCState_lambda_get,_wrap_CvStereoGCState_lambda_set,0,0},
-{"lambda1",0,_wrap_CvStereoGCState_lambda1_get,_wrap_CvStereoGCState_lambda1_set,0,0},
-{"lambda2",0,_wrap_CvStereoGCState_lambda2_get,_wrap_CvStereoGCState_lambda2_set,0,0},
-{"occlusionCost",0,_wrap_CvStereoGCState_occlusionCost_get,_wrap_CvStereoGCState_occlusionCost_set,0,0},
-{"minDisparity",0,_wrap_CvStereoGCState_minDisparity_get,_wrap_CvStereoGCState_minDisparity_set,0,0},
-{"numberOfDisparities",0,_wrap_CvStereoGCState_numberOfDisparities_get,_wrap_CvStereoGCState_numberOfDisparities_set,0,0},
-{"maxIters",0,_wrap_CvStereoGCState_maxIters_get,_wrap_CvStereoGCState_maxIters_set,0,0},
-{"left",0,_wrap_CvStereoGCState_left_get,_wrap_CvStereoGCState_left_set,0,0},
-{"right",0,_wrap_CvStereoGCState_right_get,_wrap_CvStereoGCState_right_set,0,0},
-{"dispLeft",0,_wrap_CvStereoGCState_dispLeft_get,_wrap_CvStereoGCState_dispLeft_set,0,0},
-{"dispRight",0,_wrap_CvStereoGCState_dispRight_get,_wrap_CvStereoGCState_dispRight_set,0,0},
-{"ptrLeft",0,_wrap_CvStereoGCState_ptrLeft_get,_wrap_CvStereoGCState_ptrLeft_set,0,0},
-{"ptrRight",0,_wrap_CvStereoGCState_ptrRight_get,_wrap_CvStereoGCState_ptrRight_set,0,0},
-{"vtxBuf",0,_wrap_CvStereoGCState_vtxBuf_get,_wrap_CvStereoGCState_vtxBuf_set,0,0},
-{"edgeBuf",0,_wrap_CvStereoGCState_edgeBuf_get,_wrap_CvStereoGCState_edgeBuf_set,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvStereoGCState_base_names[] = {0};
-static const swig_type_info *swig_CvStereoGCState_base[] = {0};
-static swig_octave_class _wrap_class_CvStereoGCState = {"CvStereoGCState", &SWIGTYPE_p_CvStereoGCState,0,_wrap_new_CvStereoGCState,0,_wrap_delete_CvStereoGCState,swig_CvStereoGCState_members,swig_CvStereoGCState_base_names,swig_CvStereoGCState_base };
-
-static octave_value_list _wrap_cvCreateStereoGCState (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvStereoGCState *result = 0 ;
-  
-  if (!SWIG_check_num_args("cvCreateStereoGCState",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCreateStereoGCState" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvCreateStereoGCState" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  {
-    try {
-      result = (CvStereoGCState *)cvCreateStereoGCState(arg1,arg2); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_cvReleaseStereoGCState (const octave_value_list& args, int nargout) {
-  CvStereoGCState **arg1 = (CvStereoGCState **) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("cvReleaseStereoGCState",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleaseStereoGCState" "', argument " "1"" of type '" "CvStereoGCState **""'"); 
-  }
-  arg1 = (CvStereoGCState **)(argp1);
-  {
-    try {
-      cvReleaseStereoGCState(arg1); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_cvFindStereoCorrespondenceGC (const octave_value_list& args, int nargout) {
-  CvArr *arg1 = (CvArr *) 0 ;
-  CvArr *arg2 = (CvArr *) 0 ;
-  CvArr *arg3 = (CvArr *) 0 ;
-  CvArr *arg4 = (CvArr *) 0 ;
-  CvStereoGCState *arg5 = (CvStereoGCState *) 0 ;
-  int arg6 = (int) 0 ;
-  bool freearg1 = false ;
-  bool freearg2 = false ;
-  bool freearg3 = false ;
-  bool freearg4 = false ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("cvFindStereoCorrespondenceGC",args.length(),6,5,0)) {
-    SWIG_fail;
-  }
-  {
-    arg1 = OctObject_to_CvArr(args(0), &freearg1);
-  }
-  {
-    arg2 = OctObject_to_CvArr(args(1), &freearg2);
-  }
-  {
-    arg3 = OctObject_to_CvArr(args(2), &freearg3);
-  }
-  {
-    arg4 = OctObject_to_CvArr(args(3), &freearg4);
-  }
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvFindStereoCorrespondenceGC" "', argument " "5"" of type '" "CvStereoGCState *""'"); 
-  }
-  arg5 = (CvStereoGCState *)(argp5);
-  if (5<args.length()) {
-    ecode6 = SWIG_AsVal_int(args(5), &val6);
-    if (!SWIG_IsOK(ecode6)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvFindStereoCorrespondenceGC" "', argument " "6"" of type '" "int""'");
-    } 
-    arg6 = (int)(val6);
-  }
-  {
-    try {
-      cvFindStereoCorrespondenceGC((void const *)arg1,(void const *)arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  {
-    if(arg1!=NULL && freearg1){
-      cvReleaseData( arg1 );
-      cvFree(&(arg1));
-    }
-  }
-  {
-    if(arg2!=NULL && freearg2){
-      cvReleaseData( arg2 );
-      cvFree(&(arg2));
-    }
-  }
-  {
-    if(arg3!=NULL && freearg3){
-      cvReleaseData( arg3 );
-      cvFree(&(arg3));
-    }
-  }
-  {
-    if(arg4!=NULL && freearg4){
-      cvReleaseData( arg4 );
-      cvFree(&(arg4));
-    }
-  }
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_cvReprojectImageTo3D (const octave_value_list& args, int nargout) {
-  CvArr *arg1 = (CvArr *) 0 ;
-  CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  int arg4 = (int) 0 ;
-  bool freearg1 = false ;
-  bool freearg2 = false ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("cvReprojectImageTo3D",args.length(),4,3,0)) {
-    SWIG_fail;
-  }
-  {
-    arg1 = OctObject_to_CvArr(args(0), &freearg1);
-  }
-  {
-    arg2 = OctObject_to_CvArr(args(1), &freearg2);
-  }
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvReprojectImageTo3D" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  if (3<args.length()) {
-    ecode4 = SWIG_AsVal_int(args(3), &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvReprojectImageTo3D" "', argument " "4"" of type '" "int""'");
-    } 
-    arg4 = (int)(val4);
-  }
-  {
-    try {
-      cvReprojectImageTo3D((void const *)arg1,arg2,(CvMat const *)arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  {
-    if(arg1!=NULL && freearg1){
-      cvReleaseData( arg1 );
-      cvFree(&(arg1));
-    }
-  }
-  {
-    if(arg2!=NULL && freearg2){
-      cvReleaseData( arg2 );
-      cvFree(&(arg2));
-    }
-  }
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBaseImageFilter__SWIG_0 (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBaseImageFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBaseImageFilter",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvBaseImageFilter *)new CvBaseImageFilter(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBaseImageFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBaseImageFilter__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  CvSize arg5 ;
-  CvPoint arg6 ;
-  int arg7 ;
-  CvScalar arg8 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  void *argp5 ;
-  int res5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBaseImageFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBaseImageFilter",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBaseImageFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBaseImageFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBaseImageFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBaseImageFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBaseImageFilter" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBaseImageFilter" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
-    }
-  }
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_CvBaseImageFilter" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    arg8 = OctObject_to_CvScalar( args(7) );
-  }
-  {
-    try {
-      result = (CvBaseImageFilter *)new CvBaseImageFilter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBaseImageFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBaseImageFilter__SWIG_2 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  CvSize arg5 ;
-  CvPoint arg6 ;
-  int arg7 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  void *argp5 ;
-  int res5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBaseImageFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBaseImageFilter",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBaseImageFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBaseImageFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBaseImageFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBaseImageFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBaseImageFilter" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBaseImageFilter" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
-    }
-  }
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_CvBaseImageFilter" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    try {
-      result = (CvBaseImageFilter *)new CvBaseImageFilter(arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBaseImageFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBaseImageFilter__SWIG_3 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  CvSize arg5 ;
-  CvPoint arg6 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  void *argp5 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBaseImageFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBaseImageFilter",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBaseImageFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBaseImageFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBaseImageFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBaseImageFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBaseImageFilter" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBaseImageFilter" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
-    }
-  }
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  {
-    try {
-      result = (CvBaseImageFilter *)new CvBaseImageFilter(arg1,arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBaseImageFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBaseImageFilter__SWIG_4 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  CvSize arg5 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  void *argp5 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBaseImageFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBaseImageFilter",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBaseImageFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBaseImageFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBaseImageFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBaseImageFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBaseImageFilter" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBaseImageFilter" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
-    }
-  }
-  {
-    try {
-      result = (CvBaseImageFilter *)new CvBaseImageFilter(arg1,arg2,arg3,arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBaseImageFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBaseImageFilter (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[8]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvBaseImageFilter__SWIG_0(args, nargout);
-  }
-  if (argc == 5) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSize, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_new_CvBaseImageFilter__SWIG_4(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSize, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_new_CvBaseImageFilter__SWIG_3(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSize, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  return _wrap_new_CvBaseImageFilter__SWIG_2(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSize, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvScalar, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_new_CvBaseImageFilter__SWIG_1(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvBaseImageFilter (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("delete_CvBaseImageFilter",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvBaseImageFilter" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_init__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_init" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBaseImageFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBaseImageFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBaseImageFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvBaseImageFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBaseImageFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBaseImageFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvBaseImageFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_init__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_init" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBaseImageFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBaseImageFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBaseImageFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvBaseImageFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBaseImageFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBaseImageFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvBaseImageFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_init__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_init" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBaseImageFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBaseImageFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBaseImageFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvBaseImageFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBaseImageFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBaseImageFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_init__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_init" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBaseImageFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBaseImageFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBaseImageFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvBaseImageFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBaseImageFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBaseImageFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_init (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[9]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
-  };
-  
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBaseImageFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvBaseImageFilter_init__SWIG_3(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBaseImageFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvBaseImageFilter_init__SWIG_2(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBaseImageFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvBaseImageFilter_init__SWIG_1(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBaseImageFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvBaseImageFilter_init__SWIG_0(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_clear (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_clear",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_clear" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      (arg1)->clear(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_process__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvRect arg4 ;
-  CvPoint arg5 ;
-  int arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 ;
-  int res4 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_process",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_process" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBaseImageFilter_process" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBaseImageFilter_process" "', argument " "3"" of type '" "CvMat *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvRect,  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBaseImageFilter_process" "', argument " "4"" of type '" "CvRect""'"); 
-    }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBaseImageFilter_process" "', argument " "4"" of type '" "CvRect""'");
-    } else {
-      arg4 = *((CvRect *)(argp4));
-    }
-  }
-  {
-    arg5 = OctObject_to_CvPoint(args(4));
-  }
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvBaseImageFilter_process" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  {
-    try {
-      result = (int)(arg1)->process((CvMat const *)arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_process__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvRect arg4 ;
-  CvPoint arg5 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 ;
-  int res4 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_process",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_process" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBaseImageFilter_process" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBaseImageFilter_process" "', argument " "3"" of type '" "CvMat *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvRect,  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBaseImageFilter_process" "', argument " "4"" of type '" "CvRect""'"); 
-    }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBaseImageFilter_process" "', argument " "4"" of type '" "CvRect""'");
-    } else {
-      arg4 = *((CvRect *)(argp4));
-    }
-  }
-  {
-    arg5 = OctObject_to_CvPoint(args(4));
-  }
-  {
-    try {
-      result = (int)(arg1)->process((CvMat const *)arg2,arg3,arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_process__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvRect arg4 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 ;
-  int res4 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_process",args.length(),4,4,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_process" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBaseImageFilter_process" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBaseImageFilter_process" "', argument " "3"" of type '" "CvMat *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvRect,  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBaseImageFilter_process" "', argument " "4"" of type '" "CvRect""'"); 
-    }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBaseImageFilter_process" "', argument " "4"" of type '" "CvRect""'");
-    } else {
-      arg4 = *((CvRect *)(argp4));
-    }
-  }
-  {
-    try {
-      result = (int)(arg1)->process((CvMat const *)arg2,arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_process__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_process",args.length(),3,3,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_process" "', argument " "1"" of type '" "CvBaseImageFilter *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBaseImageFilter_process" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBaseImageFilter_process" "', argument " "3"" of type '" "CvMat *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  {
-    try {
-      result = (int)(arg1)->process((CvMat const *)arg2,arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_process (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[6]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5)
-  };
-  
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBaseImageFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvBaseImageFilter_process__SWIG_3(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBaseImageFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvRect, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvBaseImageFilter_process__SWIG_2(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBaseImageFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvRect, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvPoint, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvBaseImageFilter_process__SWIG_1(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBaseImageFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvRect, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvPoint, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                return _wrap_CvBaseImageFilter_process__SWIG_0(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_get_src_type (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_get_src_type",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_get_src_type" "', argument " "1"" of type '" "CvBaseImageFilter const *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      result = (int)((CvBaseImageFilter const *)arg1)->get_src_type(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_get_dst_type (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_get_dst_type",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_get_dst_type" "', argument " "1"" of type '" "CvBaseImageFilter const *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      result = (int)((CvBaseImageFilter const *)arg1)->get_dst_type(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_get_work_type (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_get_work_type",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_get_work_type" "', argument " "1"" of type '" "CvBaseImageFilter const *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      result = (int)((CvBaseImageFilter const *)arg1)->get_work_type(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_get_kernel_size (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvSize result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_get_kernel_size",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_get_kernel_size" "', argument " "1"" of type '" "CvBaseImageFilter const *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      result = ((CvBaseImageFilter const *)arg1)->get_kernel_size(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj((new CvSize((const CvSize&)(result))), SWIGTYPE_p_CvSize, SWIG_POINTER_OWN |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_get_anchor (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvPoint result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_get_anchor",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_get_anchor" "', argument " "1"" of type '" "CvBaseImageFilter const *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      result = ((CvBaseImageFilter const *)arg1)->get_anchor(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj((new CvPoint((const CvPoint&)(result))), SWIGTYPE_p_CvPoint, SWIG_POINTER_OWN |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_get_width (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_get_width",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_get_width" "', argument " "1"" of type '" "CvBaseImageFilter const *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      result = (int)((CvBaseImageFilter const *)arg1)->get_width(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_get_x_filter_func (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvRowFilterFunc result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_get_x_filter_func",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_get_x_filter_func" "', argument " "1"" of type '" "CvBaseImageFilter const *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      result = (CvRowFilterFunc)((CvBaseImageFilter const *)arg1)->get_x_filter_func(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_q_const__unsigned_char_p_unsigned_char_p_void__void);
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBaseImageFilter_get_y_filter_func (const octave_value_list& args, int nargout) {
-  CvBaseImageFilter *arg1 = (CvBaseImageFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvColumnFilterFunc result;
-  
-  if (!SWIG_check_num_args("CvBaseImageFilter_get_y_filter_func",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBaseImageFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBaseImageFilter_get_y_filter_func" "', argument " "1"" of type '" "CvBaseImageFilter const *""'"); 
-  }
-  arg1 = (CvBaseImageFilter *)(argp1);
-  {
-    try {
-      result = (CvColumnFilterFunc)((CvBaseImageFilter const *)arg1)->get_y_filter_func(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_p_unsigned_char_p_unsigned_char_int_int_p_void__void);
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static swig_octave_member swig_CvBaseImageFilter_members[] = {
-{"init",_wrap_CvBaseImageFilter_init,0,0,0,0},
-{"clear",_wrap_CvBaseImageFilter_clear,0,0,0,0},
-{"process",_wrap_CvBaseImageFilter_process,0,0,0,0},
-{"get_src_type",_wrap_CvBaseImageFilter_get_src_type,0,0,0,0},
-{"get_dst_type",_wrap_CvBaseImageFilter_get_dst_type,0,0,0,0},
-{"get_work_type",_wrap_CvBaseImageFilter_get_work_type,0,0,0,0},
-{"get_kernel_size",_wrap_CvBaseImageFilter_get_kernel_size,0,0,0,0},
-{"get_anchor",_wrap_CvBaseImageFilter_get_anchor,0,0,0,0},
-{"get_width",_wrap_CvBaseImageFilter_get_width,0,0,0,0},
-{"get_x_filter_func",_wrap_CvBaseImageFilter_get_x_filter_func,0,0,0,0},
-{"get_y_filter_func",_wrap_CvBaseImageFilter_get_y_filter_func,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvBaseImageFilter_base_names[] = {0};
-static const swig_type_info *swig_CvBaseImageFilter_base[] = {0};
-static swig_octave_class _wrap_class_CvBaseImageFilter = {"CvBaseImageFilter", &SWIGTYPE_p_CvBaseImageFilter,0,_wrap_new_CvBaseImageFilter,0,_wrap_delete_CvBaseImageFilter,swig_CvBaseImageFilter_members,swig_CvBaseImageFilter_base_names,swig_CvBaseImageFilter_base };
-
-static octave_value_list _wrap_new_CvSepFilter__SWIG_0 (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvSepFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvSepFilter",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvSepFilter *)new CvSepFilter(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSepFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvSepFilter__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvPoint arg6 ;
-  int arg7 ;
-  CvScalar arg8 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvSepFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvSepFilter",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvSepFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvSepFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvSepFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvSepFilter" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvSepFilter" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_CvSepFilter" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    arg8 = OctObject_to_CvScalar( args(7) );
-  }
-  {
-    try {
-      result = (CvSepFilter *)new CvSepFilter(arg1,arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSepFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvSepFilter__SWIG_2 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvPoint arg6 ;
-  int arg7 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvSepFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvSepFilter",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvSepFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvSepFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvSepFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvSepFilter" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvSepFilter" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_CvSepFilter" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    try {
-      result = (CvSepFilter *)new CvSepFilter(arg1,arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSepFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvSepFilter__SWIG_3 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvPoint arg6 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvSepFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvSepFilter",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvSepFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvSepFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvSepFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvSepFilter" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvSepFilter" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  {
-    try {
-      result = (CvSepFilter *)new CvSepFilter(arg1,arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSepFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvSepFilter__SWIG_4 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvSepFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvSepFilter",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvSepFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvSepFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvSepFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvSepFilter" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvSepFilter" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    try {
-      result = (CvSepFilter *)new CvSepFilter(arg1,arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSepFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvSepFilter (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[8]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvSepFilter__SWIG_0(args, nargout);
-  }
-  if (argc == 5) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_new_CvSepFilter__SWIG_4(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_new_CvSepFilter__SWIG_3(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  return _wrap_new_CvSepFilter__SWIG_2(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvScalar, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_new_CvSepFilter__SWIG_1(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvSepFilter (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("delete_CvSepFilter",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSepFilter" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvSepFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvSepFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,(CvMat const *)arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvSepFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvSepFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,(CvMat const *)arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvPoint arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvSepFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,(CvMat const *)arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvSepFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_deriv__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  int arg6 ;
-  int arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_deriv",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_deriv" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init_deriv" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init_deriv" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init_deriv" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init_deriv" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvSepFilter_init_deriv" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvSepFilter_init_deriv" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvSepFilter_init_deriv" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init_deriv(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_deriv__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  int arg6 ;
-  int arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_deriv",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_deriv" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init_deriv" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init_deriv" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init_deriv" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init_deriv" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvSepFilter_init_deriv" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvSepFilter_init_deriv" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    try {
-      (arg1)->init_deriv(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_deriv (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[8]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7)
-  };
-  
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  return _wrap_CvSepFilter_init_deriv__SWIG_1(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvSepFilter_init_deriv__SWIG_0(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_gaussian (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  double arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  double val6 ;
-  int ecode6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_gaussian",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_gaussian" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init_gaussian" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init_gaussian" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init_gaussian" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init_gaussian" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  ecode6 = SWIG_AsVal_double(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvSepFilter_init_gaussian" "', argument " "6"" of type '" "double""'");
-  } 
-  arg6 = (double)(val6);
-  {
-    try {
-      (arg1)->init_gaussian(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvSepFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvSepFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init__SWIG_6 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init__SWIG_7 (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSepFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[9]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
-  };
-  
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvSepFilter_init__SWIG_3(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvSepFilter_init__SWIG_7(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvSepFilter_init__SWIG_2(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvSepFilter_init__SWIG_6(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvSepFilter_init__SWIG_1(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvSepFilter_init__SWIG_5(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvSepFilter_init__SWIG_0(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvSepFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvSepFilter_init__SWIG_4(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvSepFilter_clear (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_clear",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_clear" "', argument " "1"" of type '" "CvSepFilter *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  {
-    try {
-      (arg1)->clear(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_get_x_kernel (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvSepFilter_get_x_kernel",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_get_x_kernel" "', argument " "1"" of type '" "CvSepFilter const *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  {
-    try {
-      result = (CvMat *)((CvSepFilter const *)arg1)->get_x_kernel(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_get_y_kernel (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvSepFilter_get_y_kernel",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_get_y_kernel" "', argument " "1"" of type '" "CvSepFilter const *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  {
-    try {
-      result = (CvMat *)((CvSepFilter const *)arg1)->get_y_kernel(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_get_x_kernel_flags (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvSepFilter_get_x_kernel_flags",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_get_x_kernel_flags" "', argument " "1"" of type '" "CvSepFilter const *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  {
-    try {
-      result = (int)((CvSepFilter const *)arg1)->get_x_kernel_flags(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_get_y_kernel_flags (const octave_value_list& args, int nargout) {
-  CvSepFilter *arg1 = (CvSepFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvSepFilter_get_y_kernel_flags",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSepFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_get_y_kernel_flags" "', argument " "1"" of type '" "CvSepFilter const *""'"); 
-  }
-  arg1 = (CvSepFilter *)(argp1);
-  {
-    try {
-      result = (int)((CvSepFilter const *)arg1)->get_y_kernel_flags(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_gaussian_kernel__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  double arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_gaussian_kernel",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_gaussian_kernel" "', argument " "1"" of type '" "CvMat *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSepFilter_init_gaussian_kernel" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  {
-    try {
-      CvSepFilter::init_gaussian_kernel(arg1,arg2); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_gaussian_kernel__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_gaussian_kernel",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_gaussian_kernel" "', argument " "1"" of type '" "CvMat *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  {
-    try {
-      CvSepFilter::init_gaussian_kernel(arg1); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_gaussian_kernel (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[2]={
-    octave_value_ref(args,0),octave_value_ref(args,1)
-  };
-  
-  if (argc == 1) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvSepFilter_init_gaussian_kernel__SWIG_1(args, nargout);
-    }
-  }
-  if (argc == 2) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_double(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        return _wrap_CvSepFilter_init_gaussian_kernel__SWIG_0(args, nargout);
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_sobel_kernel__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_sobel_kernel",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "1"" of type '" "CvMat *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  {
-    try {
-      CvSepFilter::init_sobel_kernel(arg1,arg2,arg3,arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_sobel_kernel__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  int arg4 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_sobel_kernel",args.length(),4,4,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "1"" of type '" "CvMat *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init_sobel_kernel" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  {
-    try {
-      CvSepFilter::init_sobel_kernel(arg1,arg2,arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_sobel_kernel (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[5]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
-  };
-  
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_CvSepFilter_init_sobel_kernel__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              return _wrap_CvSepFilter_init_sobel_kernel__SWIG_0(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_scharr_kernel__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_scharr_kernel",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "1"" of type '" "CvMat *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  {
-    try {
-      CvSepFilter::init_scharr_kernel(arg1,arg2,arg3,arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_scharr_kernel__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  int arg4 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvSepFilter_init_scharr_kernel",args.length(),4,4,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "1"" of type '" "CvMat *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvSepFilter_init_scharr_kernel" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  {
-    try {
-      CvSepFilter::init_scharr_kernel(arg1,arg2,arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvSepFilter_init_scharr_kernel (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[5]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
-  };
-  
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_CvSepFilter_init_scharr_kernel__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              return _wrap_CvSepFilter_init_scharr_kernel__SWIG_0(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static swig_octave_member swig_CvSepFilter_members[] = {
-{"init_deriv",_wrap_CvSepFilter_init_deriv,0,0,0,0},
-{"init_gaussian",_wrap_CvSepFilter_init_gaussian,0,0,0,0},
-{"init",_wrap_CvSepFilter_init,0,0,0,0},
-{"clear",_wrap_CvSepFilter_clear,0,0,0,0},
-{"get_x_kernel",_wrap_CvSepFilter_get_x_kernel,0,0,0,0},
-{"get_y_kernel",_wrap_CvSepFilter_get_y_kernel,0,0,0,0},
-{"get_x_kernel_flags",_wrap_CvSepFilter_get_x_kernel_flags,0,0,0,0},
-{"get_y_kernel_flags",_wrap_CvSepFilter_get_y_kernel_flags,0,0,0,0},
-{"init_gaussian_kernel",_wrap_CvSepFilter_init_gaussian_kernel,0,0,1,0},
-{"init_sobel_kernel",_wrap_CvSepFilter_init_sobel_kernel,0,0,1,0},
-{"init_scharr_kernel",_wrap_CvSepFilter_init_scharr_kernel,0,0,1,0},
-{0,0,0,0}
-};
-static const char *swig_CvSepFilter_base_names[] = {"_p_CvBaseImageFilter",0};
-static const swig_type_info *swig_CvSepFilter_base[] = {0,0};
-static swig_octave_class _wrap_class_CvSepFilter = {"CvSepFilter", &SWIGTYPE_p_CvSepFilter,0,_wrap_new_CvSepFilter,0,_wrap_delete_CvSepFilter,swig_CvSepFilter_members,swig_CvSepFilter_base_names,swig_CvSepFilter_base };
-
-static octave_value_list _wrap_new_CvLinearFilter__SWIG_0 (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLinearFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLinearFilter",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvLinearFilter *)new CvLinearFilter(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLinearFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLinearFilter__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvPoint arg5 ;
-  int arg6 ;
-  CvScalar arg7 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLinearFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLinearFilter",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLinearFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLinearFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvLinearFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvLinearFilter" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  {
-    arg5 = OctObject_to_CvPoint(args(4));
-  }
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_CvLinearFilter" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  {
-    arg7 = OctObject_to_CvScalar( args(6) );
-  }
-  {
-    try {
-      result = (CvLinearFilter *)new CvLinearFilter(arg1,arg2,arg3,(CvMat const *)arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLinearFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLinearFilter__SWIG_2 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvPoint arg5 ;
-  int arg6 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLinearFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLinearFilter",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLinearFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLinearFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvLinearFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvLinearFilter" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  {
-    arg5 = OctObject_to_CvPoint(args(4));
-  }
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_CvLinearFilter" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  {
-    try {
-      result = (CvLinearFilter *)new CvLinearFilter(arg1,arg2,arg3,(CvMat const *)arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLinearFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLinearFilter__SWIG_3 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvPoint arg5 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLinearFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLinearFilter",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLinearFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLinearFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvLinearFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvLinearFilter" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  {
-    arg5 = OctObject_to_CvPoint(args(4));
-  }
-  {
-    try {
-      result = (CvLinearFilter *)new CvLinearFilter(arg1,arg2,arg3,(CvMat const *)arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLinearFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLinearFilter__SWIG_4 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLinearFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLinearFilter",args.length(),4,4,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLinearFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLinearFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvLinearFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvLinearFilter" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  {
-    try {
-      result = (CvLinearFilter *)new CvLinearFilter(arg1,arg2,arg3,(CvMat const *)arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLinearFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLinearFilter (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[7]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvLinearFilter__SWIG_0(args, nargout);
-  }
-  if (argc == 4) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_new_CvLinearFilter__SWIG_4(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  if (argc == 5) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvPoint, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_new_CvLinearFilter__SWIG_3(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvPoint, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                return _wrap_new_CvLinearFilter__SWIG_2(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvPoint, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvScalar, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_new_CvLinearFilter__SWIG_1(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvLinearFilter (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("delete_CvLinearFilter",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvLinearFilter" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvPoint arg6 ;
-  int arg7 ;
-  CvScalar arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_init" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLinearFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLinearFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLinearFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLinearFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvLinearFilter_init" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    arg8 = OctObject_to_CvScalar( args(7) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvPoint arg6 ;
-  int arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_init" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLinearFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLinearFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLinearFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLinearFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvLinearFilter_init" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvPoint arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_init" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLinearFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLinearFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLinearFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLinearFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_init",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_init" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLinearFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLinearFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLinearFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLinearFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_init" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLinearFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLinearFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLinearFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLinearFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLinearFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLinearFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvLinearFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_init" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLinearFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLinearFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLinearFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLinearFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLinearFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLinearFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvLinearFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init__SWIG_6 (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_init" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLinearFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLinearFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLinearFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLinearFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLinearFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLinearFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init__SWIG_7 (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_init" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLinearFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLinearFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLinearFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLinearFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLinearFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLinearFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_init (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[9]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
-  };
-  
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLinearFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvLinearFilter_init__SWIG_3(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLinearFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvLinearFilter_init__SWIG_2(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLinearFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvLinearFilter_init__SWIG_7(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLinearFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  return _wrap_CvLinearFilter_init__SWIG_1(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLinearFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvLinearFilter_init__SWIG_6(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLinearFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvScalar, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_CvLinearFilter_init__SWIG_0(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLinearFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvLinearFilter_init__SWIG_5(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLinearFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvLinearFilter_init__SWIG_4(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_clear (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_clear",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_clear" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  {
-    try {
-      (arg1)->clear(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_get_kernel (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_get_kernel",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_get_kernel" "', argument " "1"" of type '" "CvLinearFilter const *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  {
-    try {
-      result = (CvMat *)((CvLinearFilter const *)arg1)->get_kernel(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_get_kernel_sparse_buf (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  uchar *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_get_kernel_sparse_buf",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_get_kernel_sparse_buf" "', argument " "1"" of type '" "CvLinearFilter *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  {
-    try {
-      result = (uchar *)(arg1)->get_kernel_sparse_buf(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLinearFilter_get_kernel_sparse_count (const octave_value_list& args, int nargout) {
-  CvLinearFilter *arg1 = (CvLinearFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvLinearFilter_get_kernel_sparse_count",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLinearFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLinearFilter_get_kernel_sparse_count" "', argument " "1"" of type '" "CvLinearFilter const *""'"); 
-  }
-  arg1 = (CvLinearFilter *)(argp1);
-  {
-    try {
-      result = (int)((CvLinearFilter const *)arg1)->get_kernel_sparse_count(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static swig_octave_member swig_CvLinearFilter_members[] = {
-{"init",_wrap_CvLinearFilter_init,0,0,0,0},
-{"clear",_wrap_CvLinearFilter_clear,0,0,0,0},
-{"get_kernel",_wrap_CvLinearFilter_get_kernel,0,0,0,0},
-{"get_kernel_sparse_buf",_wrap_CvLinearFilter_get_kernel_sparse_buf,0,0,0,0},
-{"get_kernel_sparse_count",_wrap_CvLinearFilter_get_kernel_sparse_count,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvLinearFilter_base_names[] = {"_p_CvBaseImageFilter",0};
-static const swig_type_info *swig_CvLinearFilter_base[] = {0,0};
-static swig_octave_class _wrap_class_CvLinearFilter = {"CvLinearFilter", &SWIGTYPE_p_CvLinearFilter,0,_wrap_new_CvLinearFilter,0,_wrap_delete_CvLinearFilter,swig_CvLinearFilter_members,swig_CvLinearFilter_base_names,swig_CvLinearFilter_base };
-
-static octave_value_list _wrap_new_CvBoxFilter__SWIG_0 (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBoxFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBoxFilter",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvBoxFilter *)new CvBoxFilter(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoxFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBoxFilter__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  CvSize arg5 ;
-  CvPoint arg6 ;
-  int arg7 ;
-  CvScalar arg8 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  void *argp5 ;
-  int res5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBoxFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBoxFilter",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBoxFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoxFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBoxFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBoxFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoxFilter" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBoxFilter" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
-    }
-  }
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_CvBoxFilter" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    arg8 = OctObject_to_CvScalar( args(7) );
-  }
-  {
-    try {
-      result = (CvBoxFilter *)new CvBoxFilter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoxFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBoxFilter__SWIG_2 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  CvSize arg5 ;
-  CvPoint arg6 ;
-  int arg7 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  void *argp5 ;
-  int res5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBoxFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBoxFilter",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBoxFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoxFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBoxFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBoxFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoxFilter" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBoxFilter" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
-    }
-  }
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_CvBoxFilter" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    try {
-      result = (CvBoxFilter *)new CvBoxFilter(arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoxFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBoxFilter__SWIG_3 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  CvSize arg5 ;
-  CvPoint arg6 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  void *argp5 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBoxFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBoxFilter",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBoxFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoxFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBoxFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBoxFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoxFilter" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBoxFilter" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
-    }
-  }
-  {
-    arg6 = OctObject_to_CvPoint(args(5));
-  }
-  {
-    try {
-      result = (CvBoxFilter *)new CvBoxFilter(arg1,arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoxFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBoxFilter__SWIG_4 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  CvSize arg5 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  void *argp5 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBoxFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBoxFilter",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBoxFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoxFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBoxFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBoxFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoxFilter" "', argument " "5"" of type '" "CvSize""'"); 
-    }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBoxFilter" "', argument " "5"" of type '" "CvSize""'");
-    } else {
-      arg5 = *((CvSize *)(argp5));
-    }
-  }
-  {
-    try {
-      result = (CvBoxFilter *)new CvBoxFilter(arg1,arg2,arg3,arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoxFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBoxFilter (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[8]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvBoxFilter__SWIG_0(args, nargout);
-  }
-  if (argc == 5) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSize, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_new_CvBoxFilter__SWIG_4(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSize, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_new_CvBoxFilter__SWIG_3(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSize, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  return _wrap_new_CvBoxFilter__SWIG_2(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSize, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvPoint, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvScalar, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_new_CvBoxFilter__SWIG_1(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_init__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBoxFilter_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoxFilter_init" "', argument " "1"" of type '" "CvBoxFilter *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoxFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoxFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBoxFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvBoxFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoxFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoxFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvBoxFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_init__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBoxFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoxFilter_init" "', argument " "1"" of type '" "CvBoxFilter *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoxFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoxFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBoxFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvBoxFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoxFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoxFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvBoxFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_init__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBoxFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoxFilter_init" "', argument " "1"" of type '" "CvBoxFilter *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoxFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoxFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBoxFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvBoxFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoxFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoxFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_init__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBoxFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoxFilter_init" "', argument " "1"" of type '" "CvBoxFilter *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoxFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoxFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBoxFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvBoxFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoxFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoxFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_init (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[9]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
-  };
-  
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoxFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvBoxFilter_init__SWIG_3(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoxFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvBoxFilter_init__SWIG_2(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoxFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvBoxFilter_init__SWIG_1(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoxFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvBoxFilter_init__SWIG_0(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvBoxFilter (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("delete_CvBoxFilter",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvBoxFilter" "', argument " "1"" of type '" "CvBoxFilter *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_is_normalized (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  bool result;
-  
-  if (!SWIG_check_num_args("CvBoxFilter_is_normalized",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoxFilter_is_normalized" "', argument " "1"" of type '" "CvBoxFilter const *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  {
-    try {
-      result = (bool)((CvBoxFilter const *)arg1)->is_normalized(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_bool((bool)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_get_scale (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  double result;
-  
-  if (!SWIG_check_num_args("CvBoxFilter_get_scale",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoxFilter_get_scale" "', argument " "1"" of type '" "CvBoxFilter const *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  {
-    try {
-      result = (double)((CvBoxFilter const *)arg1)->get_scale(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_double((double)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_get_sum_buf (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  uchar *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvBoxFilter_get_sum_buf",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoxFilter_get_sum_buf" "', argument " "1"" of type '" "CvBoxFilter *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  {
-    try {
-      result = (uchar *)(arg1)->get_sum_buf(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoxFilter_get_sum_count_ptr (const octave_value_list& args, int nargout) {
-  CvBoxFilter *arg1 = (CvBoxFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvBoxFilter_get_sum_count_ptr",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoxFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoxFilter_get_sum_count_ptr" "', argument " "1"" of type '" "CvBoxFilter *""'"); 
-  }
-  arg1 = (CvBoxFilter *)(argp1);
-  {
-    try {
-      result = (int *)(arg1)->get_sum_count_ptr(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static swig_octave_member swig_CvBoxFilter_members[] = {
-{"init",_wrap_CvBoxFilter_init,0,0,0,0},
-{"is_normalized",_wrap_CvBoxFilter_is_normalized,0,0,0,0},
-{"get_scale",_wrap_CvBoxFilter_get_scale,0,0,0,0},
-{"get_sum_buf",_wrap_CvBoxFilter_get_sum_buf,0,0,0,0},
-{"get_sum_count_ptr",_wrap_CvBoxFilter_get_sum_count_ptr,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvBoxFilter_base_names[] = {"_p_CvBaseImageFilter",0};
-static const swig_type_info *swig_CvBoxFilter_base[] = {0,0};
-static swig_octave_class _wrap_class_CvBoxFilter = {"CvBoxFilter", &SWIGTYPE_p_CvBoxFilter,0,_wrap_new_CvBoxFilter,0,_wrap_delete_CvBoxFilter,swig_CvBoxFilter_members,swig_CvBoxFilter_base_names,swig_CvBoxFilter_base };
-
-static octave_value_list _wrap_new_CvLaplaceFilter__SWIG_0 (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLaplaceFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLaplaceFilter",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvLaplaceFilter *)new CvLaplaceFilter(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLaplaceFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLaplaceFilter__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  int arg5 ;
-  int arg6 ;
-  CvScalar arg7 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLaplaceFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLaplaceFilter",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLaplaceFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLaplaceFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvLaplaceFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvLaplaceFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_CvLaplaceFilter" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_CvLaplaceFilter" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  {
-    arg7 = OctObject_to_CvScalar( args(6) );
-  }
-  {
-    try {
-      result = (CvLaplaceFilter *)new CvLaplaceFilter(arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLaplaceFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLaplaceFilter__SWIG_2 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  int arg5 ;
-  int arg6 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLaplaceFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLaplaceFilter",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLaplaceFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLaplaceFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvLaplaceFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvLaplaceFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_CvLaplaceFilter" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_CvLaplaceFilter" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  {
-    try {
-      result = (CvLaplaceFilter *)new CvLaplaceFilter(arg1,arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLaplaceFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLaplaceFilter__SWIG_3 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  bool arg4 ;
-  int arg5 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvLaplaceFilter *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvLaplaceFilter",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLaplaceFilter" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLaplaceFilter" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvLaplaceFilter" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvLaplaceFilter" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_CvLaplaceFilter" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  {
-    try {
-      result = (CvLaplaceFilter *)new CvLaplaceFilter(arg1,arg2,arg3,arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLaplaceFilter, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvLaplaceFilter (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[7]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvLaplaceFilter__SWIG_0(args, nargout);
-  }
-  if (argc == 5) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              return _wrap_new_CvLaplaceFilter__SWIG_3(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                return _wrap_new_CvLaplaceFilter__SWIG_2(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvScalar, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_new_CvLaplaceFilter__SWIG_1(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvLaplaceFilter (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("delete_CvLaplaceFilter",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvLaplaceFilter" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  int arg6 ;
-  int arg7 ;
-  CvScalar arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvLaplaceFilter_init" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    arg8 = OctObject_to_CvScalar( args(7) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  int arg6 ;
-  int arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvLaplaceFilter_init" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  int arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvLaplaceFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvLaplaceFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_6 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_7 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvLaplaceFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,(CvMat const *)arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_8 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvLaplaceFilter_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,(CvMat const *)arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_9 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvPoint arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,(CvMat const *)arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init__SWIG_10 (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_init" "', argument " "1"" of type '" "CvLaplaceFilter *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLaplaceFilter_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLaplaceFilter_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvLaplaceFilter_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLaplaceFilter_init" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvLaplaceFilter_init" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_init (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[9]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
-  };
-  
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvLaplaceFilter_init__SWIG_10(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvLaplaceFilter_init__SWIG_6(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                return _wrap_CvLaplaceFilter_init__SWIG_2(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvLaplaceFilter_init__SWIG_9(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvLaplaceFilter_init__SWIG_5(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  return _wrap_CvLaplaceFilter_init__SWIG_1(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvLaplaceFilter_init__SWIG_8(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvLaplaceFilter_init__SWIG_4(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              {
-                int res = SWIG_AsVal_int(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvScalar, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_CvLaplaceFilter_init__SWIG_0(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvLaplaceFilter_init__SWIG_7(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLaplaceFilter, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvLaplaceFilter_init__SWIG_3(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_is_normalized (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  bool result;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_is_normalized",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_is_normalized" "', argument " "1"" of type '" "CvLaplaceFilter const *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  {
-    try {
-      result = (bool)((CvLaplaceFilter const *)arg1)->is_normalized(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_bool((bool)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLaplaceFilter_is_basic_laplacian (const octave_value_list& args, int nargout) {
-  CvLaplaceFilter *arg1 = (CvLaplaceFilter *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  bool result;
-  
-  if (!SWIG_check_num_args("CvLaplaceFilter_is_basic_laplacian",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLaplaceFilter, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLaplaceFilter_is_basic_laplacian" "', argument " "1"" of type '" "CvLaplaceFilter const *""'"); 
-  }
-  arg1 = (CvLaplaceFilter *)(argp1);
-  {
-    try {
-      result = (bool)((CvLaplaceFilter const *)arg1)->is_basic_laplacian(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_bool((bool)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static swig_octave_member swig_CvLaplaceFilter_members[] = {
-{"init",_wrap_CvLaplaceFilter_init,0,0,0,0},
-{"is_normalized",_wrap_CvLaplaceFilter_is_normalized,0,0,0,0},
-{"is_basic_laplacian",_wrap_CvLaplaceFilter_is_basic_laplacian,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvLaplaceFilter_base_names[] = {"_p_CvSepFilter",0};
-static const swig_type_info *swig_CvLaplaceFilter_base[] = {0,0};
-static swig_octave_class _wrap_class_CvLaplaceFilter = {"CvLaplaceFilter", &SWIGTYPE_p_CvLaplaceFilter,0,_wrap_new_CvLaplaceFilter,0,_wrap_delete_CvLaplaceFilter,swig_CvLaplaceFilter_members,swig_CvLaplaceFilter_base_names,swig_CvLaplaceFilter_base };
-
-static octave_value_list _wrap_new_CvMorphology__SWIG_0 (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMorphology *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvMorphology",args.length(),0,0,0)) {
-    SWIG_fail;
-  }
-  {
-    try {
-      result = (CvMorphology *)new CvMorphology(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMorphology, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvMorphology__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMorphology *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvMorphology",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvMorphology" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvMorphology" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvMorphology" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvMorphology" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvMorphology" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvMorphology" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvMorphology" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "new_CvMorphology" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      result = (CvMorphology *)new CvMorphology(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMorphology, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvMorphology__SWIG_2 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMorphology *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvMorphology",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvMorphology" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvMorphology" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvMorphology" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvMorphology" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvMorphology" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvMorphology" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvMorphology" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "new_CvMorphology" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      result = (CvMorphology *)new CvMorphology(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMorphology, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvMorphology__SWIG_3 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMorphology *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvMorphology",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvMorphology" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvMorphology" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvMorphology" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvMorphology" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvMorphology" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvMorphology" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvMorphology" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      result = (CvMorphology *)new CvMorphology(arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMorphology, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvMorphology__SWIG_4 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvSize arg6 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMorphology *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvMorphology",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvMorphology" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvMorphology" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvMorphology" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvMorphology" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvMorphology" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvMorphology" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvMorphology" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    try {
-      result = (CvMorphology *)new CvMorphology(arg1,arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMorphology, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvMorphology__SWIG_5 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMorphology *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvMorphology",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvMorphology" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvMorphology" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvMorphology" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvMorphology" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvMorphology" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    try {
-      result = (CvMorphology *)new CvMorphology(arg1,arg2,arg3,arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMorphology, 1 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvMorphology (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[9]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvMorphology__SWIG_0(args, nargout);
-  }
-  if (argc == 5) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_new_CvMorphology__SWIG_5(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_new_CvMorphology__SWIG_4(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_new_CvMorphology__SWIG_3(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_new_CvMorphology__SWIG_2(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_new_CvMorphology__SWIG_1(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvMorphology (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("delete_CvMorphology",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvMorphology" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvSize arg7 ;
-  CvPoint arg8 ;
-  int arg9 ;
-  CvScalar arg10 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 ;
-  int res7 = 0 ;
-  int val9 ;
-  int ecode9 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),10,10,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    res7 = SWIG_ConvertPtr(args(6), &argp7, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvMorphology_init" "', argument " "7"" of type '" "CvSize""'"); 
-    }  
-    if (!argp7) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvMorphology_init" "', argument " "7"" of type '" "CvSize""'");
-    } else {
-      arg7 = *((CvSize *)(argp7));
-    }
-  }
-  {
-    arg8 = OctObject_to_CvPoint(args(7));
-  }
-  ecode9 = SWIG_AsVal_int(args(8), &val9);
-  if (!SWIG_IsOK(ecode9)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "CvMorphology_init" "', argument " "9"" of type '" "int""'");
-  } 
-  arg9 = (int)(val9);
-  {
-    arg10 = OctObject_to_CvScalar( args(9) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvSize arg7 ;
-  CvPoint arg8 ;
-  int arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 ;
-  int res7 = 0 ;
-  int val9 ;
-  int ecode9 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    res7 = SWIG_ConvertPtr(args(6), &argp7, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvMorphology_init" "', argument " "7"" of type '" "CvSize""'"); 
-    }  
-    if (!argp7) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvMorphology_init" "', argument " "7"" of type '" "CvSize""'");
-    } else {
-      arg7 = *((CvSize *)(argp7));
-    }
-  }
-  {
-    arg8 = OctObject_to_CvPoint(args(7));
-  }
-  ecode9 = SWIG_AsVal_int(args(8), &val9);
-  if (!SWIG_IsOK(ecode9)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "CvMorphology_init" "', argument " "9"" of type '" "int""'");
-  } 
-  arg9 = (int)(val9);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvSize arg7 ;
-  CvPoint arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 ;
-  int res7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    res7 = SWIG_ConvertPtr(args(6), &argp7, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvMorphology_init" "', argument " "7"" of type '" "CvSize""'"); 
-    }  
-    if (!argp7) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvMorphology_init" "', argument " "7"" of type '" "CvSize""'");
-    } else {
-      arg7 = *((CvSize *)(argp7));
-    }
-  }
-  {
-    arg8 = OctObject_to_CvPoint(args(7));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvSize arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 ;
-  int res7 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    res7 = SWIG_ConvertPtr(args(6), &argp7, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvMorphology_init" "', argument " "7"" of type '" "CvSize""'"); 
-    }  
-    if (!argp7) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvMorphology_init" "', argument " "7"" of type '" "CvSize""'");
-    } else {
-      arg7 = *((CvSize *)(argp7));
-    }
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvMat *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  CvScalar arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvMorphology_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    arg9 = OctObject_to_CvScalar( args(8) );
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_6 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  int arg8 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),8,8,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CvMorphology_init" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_7 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  CvPoint arg7 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),7,7,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    arg7 = OctObject_to_CvPoint(args(6));
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6,arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init__SWIG_8 (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  CvSize arg6 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvMorphology_init",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init" "', argument " "1"" of type '" "CvMorphology *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMorphology_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvMorphology_init" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvMorphology_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvSize,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvSize""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvMorphology_init" "', argument " "6"" of type '" "CvSize""'");
-    } else {
-      arg6 = *((CvSize *)(argp6));
-    }
-  }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5,arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvMorphology_init (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[10]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8),octave_value_ref(args,9)
-  };
-  
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvMorphology_init__SWIG_8(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvMorphology_init__SWIG_4(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvMorphology_init__SWIG_7(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvSize, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvMorphology_init__SWIG_3(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    return _wrap_CvMorphology_init__SWIG_6(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvSize, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvPoint, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_CvMorphology_init__SWIG_2(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvSize, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvPoint, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvScalar, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvMorphology_init__SWIG_5(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvSize, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvPoint, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    {
-                      int res = SWIG_AsVal_int(argv[8], NULL);
-                      _v = SWIG_CheckState(res);
-                    }
-                    if (_v) {
-                      return _wrap_CvMorphology_init__SWIG_1(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 10) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMorphology, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvSize, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvPoint, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    {
-                      int res = SWIG_AsVal_int(argv[8], NULL);
-                      _v = SWIG_CheckState(res);
-                    }
-                    if (_v) {
-                      void *vptr = 0;
-                      int res = SWIG_ConvertPtr(argv[9], &vptr, SWIGTYPE_p_CvScalar, 0);
-                      _v = SWIG_CheckState(res);
-                      if (_v) {
-                        return _wrap_CvMorphology_init__SWIG_0(args, nargout);
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoBMState_trySmallerWindows_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->trySmallerWindows = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStereoBMState_trySmallerWindows_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
   
-  error("No matching function for overload");
-  return octave_value_list();
+  if (!SWIG_check_num_args("CvStereoBMState_trySmallerWindows_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_trySmallerWindows_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
+  }
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (int) ((arg1)->trySmallerWindows);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static octave_value_list _wrap_CvMorphology_clear (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_preFilteredImg0_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvMorphology_clear",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilteredImg0_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_clear" "', argument " "1"" of type '" "CvMorphology *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilteredImg0_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvMorphology *)(argp1);
-  {
-    try {
-      (arg1)->clear(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  arg1 = (CvStereoBMState *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoBMState_preFilteredImg0_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->preFilteredImg0 = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -107188,8 +96449,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMorphology_get_element (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_preFilteredImg0_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -107197,23 +96458,15 @@ static octave_value_list _wrap_CvMorphology_get_element (const octave_value_list
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMorphology_get_element",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilteredImg0_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_get_element" "', argument " "1"" of type '" "CvMorphology const *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  {
-    try {
-      result = (CvMat *)((CvMorphology const *)arg1)->get_element(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilteredImg0_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (CvMat *) ((arg1)->preFilteredImg0);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -107221,175 +96474,145 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMorphology_get_element_shape (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_preFilteredImg1_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvMorphology_get_element_shape",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilteredImg1_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_get_element_shape" "', argument " "1"" of type '" "CvMorphology const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilteredImg1_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvMorphology *)(argp1);
-  {
-    try {
-      result = (int)((CvMorphology const *)arg1)->get_element_shape(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  arg1 = (CvStereoBMState *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoBMState_preFilteredImg1_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  _outv = SWIG_From_int((int)(result));
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->preFilteredImg1 = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvMorphology_get_operation (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_preFilteredImg1_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMorphology_get_operation",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_preFilteredImg1_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_get_operation" "', argument " "1"" of type '" "CvMorphology const *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  {
-    try {
-      result = (int)((CvMorphology const *)arg1)->get_operation(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_preFilteredImg1_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (CvMat *) ((arg1)->preFilteredImg1);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvMorphology_get_element_sparse_buf (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_slidingSumBuf_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  uchar *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMorphology_get_element_sparse_buf",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_slidingSumBuf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_get_element_sparse_buf" "', argument " "1"" of type '" "CvMorphology *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_slidingSumBuf_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvMorphology *)(argp1);
-  {
-    try {
-      result = (uchar *)(arg1)->get_element_sparse_buf(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  arg1 = (CvStereoBMState *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoBMState_slidingSumBuf_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_char, 0 |  0 );
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->slidingSumBuf = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvMorphology_get_element_sparse_count (const octave_value_list& args, int nargout) {
-  CvMorphology *arg1 = (CvMorphology *) 0 ;
+static octave_value_list _wrap_CvStereoBMState_slidingSumBuf_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMorphology_get_element_sparse_count",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_slidingSumBuf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMorphology, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_get_element_sparse_count" "', argument " "1"" of type '" "CvMorphology const *""'"); 
-  }
-  arg1 = (CvMorphology *)(argp1);
-  {
-    try {
-      result = (int)((CvMorphology const *)arg1)->get_element_sparse_count(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_slidingSumBuf_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (CvMat *) ((arg1)->slidingSumBuf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvMorphology_init_binary_element__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  int arg2 ;
-  CvPoint arg3 ;
+static octave_value_list _wrap_CvStereoBMState_dbmin_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvMorphology_init_binary_element",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_dbmin_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init_binary_element" "', argument " "1"" of type '" "CvMat *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init_binary_element" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  {
-    arg3 = OctObject_to_CvPoint(args(2));
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_dbmin_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  {
-    try {
-      CvMorphology::init_binary_element(arg1,arg2,arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  arg1 = (CvStereoBMState *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoBMState_dbmin_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->dbmin = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -107397,39 +96620,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMorphology_init_binary_element__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_CvStereoBMState_dbmin_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvMorphology_init_binary_element",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoBMState_dbmin_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMorphology_init_binary_element" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_dbmin_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMorphology_init_binary_element" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  {
-    try {
-      CvMorphology::init_binary_element(arg1,arg2); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (CvMat *) ((arg1)->dbmin);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStereoBMState_dbmax_set (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvStereoBMState_dbmax_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_dbmax_set" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
+  arg1 = (CvStereoBMState *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoBMState_dbmax_set" "', argument " "2"" of type '" "CvMat *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->dbmax = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -107437,350 +96677,222 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvMorphology_init_binary_element (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[3]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
-  };
+static octave_value_list _wrap_CvStereoBMState_dbmax_get (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (argc == 2) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        return _wrap_CvMorphology_init_binary_element__SWIG_1(args, nargout);
-      }
-    }
+  if (!SWIG_check_num_args("CvStereoBMState_dbmax_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvPoint, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvMorphology_init_binary_element__SWIG_0(args, nargout);
-        }
-      }
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoBMState_dbmax_get" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
+  arg1 = (CvStereoBMState *)(argp1);
+  result = (CvMat *) ((arg1)->dbmax);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static swig_octave_member swig_CvMorphology_members[] = {
-{"init",_wrap_CvMorphology_init,0,0,0,0},
-{"clear",_wrap_CvMorphology_clear,0,0,0,0},
-{"get_element",_wrap_CvMorphology_get_element,0,0,0,0},
-{"get_element_shape",_wrap_CvMorphology_get_element_shape,0,0,0,0},
-{"get_operation",_wrap_CvMorphology_get_operation,0,0,0,0},
-{"get_element_sparse_buf",_wrap_CvMorphology_get_element_sparse_buf,0,0,0,0},
-{"get_element_sparse_count",_wrap_CvMorphology_get_element_sparse_count,0,0,0,0},
-{"init_binary_element",_wrap_CvMorphology_init_binary_element,0,0,1,0},
-{0,0,0,0}
-};
-static const char *swig_CvMorphology_base_names[] = {"_p_CvBaseImageFilter",0};
-static const swig_type_info *swig_CvMorphology_base[] = {0,0};
-static swig_octave_class _wrap_class_CvMorphology = {"CvMorphology", &SWIGTYPE_p_CvMorphology,0,_wrap_new_CvMorphology,0,_wrap_delete_CvMorphology,swig_CvMorphology_members,swig_CvMorphology_base_names,swig_CvMorphology_base };
-
-static octave_value_list _wrap_new_CvLevMarq__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvStereoBMState (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvLevMarq *result = 0 ;
+  CvStereoBMState *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvLevMarq",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("new_CvStereoBMState",args.length(),0,0,0)) {
     SWIG_fail;
   }
   {
     try {
-      result = (CvLevMarq *)new CvLevMarq(); 
+      result = (CvStereoBMState *)new CvStereoBMState(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLevMarq, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStereoBMState, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvLevMarq__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  CvTermCriteria arg3 ;
-  bool arg4 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  void *argp3 ;
-  int res3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
+static octave_value_list _wrap_delete_CvStereoBMState (const octave_value_list& args, int nargout) {
+  CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvLevMarq *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvLevMarq",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("delete_CvStereoBMState",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLevMarq" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLevMarq" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  {
-    res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvTermCriteria,  0 );
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvLevMarq" "', argument " "3"" of type '" "CvTermCriteria""'"); 
-    }  
-    if (!argp3) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvLevMarq" "', argument " "3"" of type '" "CvTermCriteria""'");
-    } else {
-      arg3 = *((CvTermCriteria *)(argp3));
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoBMState, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvStereoBMState" "', argument " "1"" of type '" "CvStereoBMState *""'"); 
   }
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvLevMarq" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
+  arg1 = (CvStereoBMState *)(argp1);
   {
     try {
-      result = (CvLevMarq *)new CvLevMarq(arg1,arg2,arg3,arg4)
+      delete arg1
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLevMarq, 1 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvLevMarq__SWIG_2 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  CvTermCriteria arg3 ;
+static swig_octave_member swig_CvStereoBMState_members[] = {
+{"preFilterType",0,_wrap_CvStereoBMState_preFilterType_get,_wrap_CvStereoBMState_preFilterType_set,0,0},
+{"preFilterSize",0,_wrap_CvStereoBMState_preFilterSize_get,_wrap_CvStereoBMState_preFilterSize_set,0,0},
+{"preFilterCap",0,_wrap_CvStereoBMState_preFilterCap_get,_wrap_CvStereoBMState_preFilterCap_set,0,0},
+{"SADWindowSize",0,_wrap_CvStereoBMState_SADWindowSize_get,_wrap_CvStereoBMState_SADWindowSize_set,0,0},
+{"minDisparity",0,_wrap_CvStereoBMState_minDisparity_get,_wrap_CvStereoBMState_minDisparity_set,0,0},
+{"numberOfDisparities",0,_wrap_CvStereoBMState_numberOfDisparities_get,_wrap_CvStereoBMState_numberOfDisparities_set,0,0},
+{"textureThreshold",0,_wrap_CvStereoBMState_textureThreshold_get,_wrap_CvStereoBMState_textureThreshold_set,0,0},
+{"uniquenessRatio",0,_wrap_CvStereoBMState_uniquenessRatio_get,_wrap_CvStereoBMState_uniquenessRatio_set,0,0},
+{"speckleWindowSize",0,_wrap_CvStereoBMState_speckleWindowSize_get,_wrap_CvStereoBMState_speckleWindowSize_set,0,0},
+{"speckleRange",0,_wrap_CvStereoBMState_speckleRange_get,_wrap_CvStereoBMState_speckleRange_set,0,0},
+{"trySmallerWindows",0,_wrap_CvStereoBMState_trySmallerWindows_get,_wrap_CvStereoBMState_trySmallerWindows_set,0,0},
+{"preFilteredImg0",0,_wrap_CvStereoBMState_preFilteredImg0_get,_wrap_CvStereoBMState_preFilteredImg0_set,0,0},
+{"preFilteredImg1",0,_wrap_CvStereoBMState_preFilteredImg1_get,_wrap_CvStereoBMState_preFilteredImg1_set,0,0},
+{"slidingSumBuf",0,_wrap_CvStereoBMState_slidingSumBuf_get,_wrap_CvStereoBMState_slidingSumBuf_set,0,0},
+{"dbmin",0,_wrap_CvStereoBMState_dbmin_get,_wrap_CvStereoBMState_dbmin_set,0,0},
+{"dbmax",0,_wrap_CvStereoBMState_dbmax_get,_wrap_CvStereoBMState_dbmax_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvStereoBMState_base_names[] = {0};
+static const swig_type_info *swig_CvStereoBMState_base[] = {0};
+static swig_octave_class _wrap_class_CvStereoBMState = {"CvStereoBMState", &SWIGTYPE_p_CvStereoBMState,0,_wrap_new_CvStereoBMState,0,_wrap_delete_CvStereoBMState,swig_CvStereoBMState_members,swig_CvStereoBMState_base_names,swig_CvStereoBMState_base };
+
+static octave_value_list _wrap_cvCreateStereoBMState (const octave_value_list& args, int nargout) {
+  int arg1 = (int) 0 ;
+  int arg2 = (int) 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  void *argp3 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvLevMarq *result = 0 ;
+  CvStereoBMState *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvLevMarq",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("cvCreateStereoBMState",args.length(),2,0,0)) {
     SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLevMarq" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLevMarq" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  {
-    res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvTermCriteria,  0 );
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvLevMarq" "', argument " "3"" of type '" "CvTermCriteria""'"); 
-    }  
-    if (!argp3) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvLevMarq" "', argument " "3"" of type '" "CvTermCriteria""'");
-    } else {
-      arg3 = *((CvTermCriteria *)(argp3));
-    }
+  if (0<args.length()) {
+    ecode1 = SWIG_AsVal_int(args(0), &val1);
+    if (!SWIG_IsOK(ecode1)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCreateStereoBMState" "', argument " "1"" of type '" "int""'");
+    } 
+    arg1 = (int)(val1);
+  }
+  if (1<args.length()) {
+    ecode2 = SWIG_AsVal_int(args(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvCreateStereoBMState" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = (int)(val2);
   }
   {
     try {
-      result = (CvLevMarq *)new CvLevMarq(arg1,arg2,arg3); 
+      result = (CvStereoBMState *)cvCreateStereoBMState(arg1,arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLevMarq, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStereoBMState, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvLevMarq__SWIG_3 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+static octave_value_list _wrap_cvReleaseStereoBMState (const octave_value_list& args, int nargout) {
+  CvStereoBMState **arg1 = (CvStereoBMState **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvLevMarq *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvLevMarq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvReleaseStereoBMState",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvLevMarq" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvLevMarq" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvStereoBMState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleaseStereoBMState" "', argument " "1"" of type '" "CvStereoBMState **""'"); 
+  }
+  arg1 = (CvStereoBMState **)(argp1);
   {
     try {
-      result = (CvLevMarq *)new CvLevMarq(arg1,arg2); 
+      cvReleaseStereoBMState(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvLevMarq, 1 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvLevMarq (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[4]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvLevMarq__SWIG_0(args, nargout);
-  }
-  if (argc == 2) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        return _wrap_new_CvLevMarq__SWIG_3(args, nargout);
-      }
-    }
-  }
-  if (argc == 3) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvTermCriteria, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_new_CvLevMarq__SWIG_2(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvTermCriteria, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_new_CvLevMarq__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvLevMarq (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+static octave_value_list _wrap_cvFindStereoCorrespondenceBM (const octave_value_list& args, int nargout) {
+  CvArr *arg1 = (CvArr *) 0 ;
+  CvArr *arg2 = (CvArr *) 0 ;
+  CvArr *arg3 = (CvArr *) 0 ;
+  CvStereoBMState *arg4 = (CvStereoBMState *) 0 ;
+  bool freearg1 = false ;
+  bool freearg2 = false ;
+  bool freearg3 = false ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("delete_CvLevMarq",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvFindStereoCorrespondenceBM",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvLevMarq" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+  {
+    arg1 = OctObject_to_CvArr(args(0), &freearg1);
+  }
+  {
+    arg2 = OctObject_to_CvArr(args(1), &freearg2);
+  }
+  {
+    arg3 = OctObject_to_CvArr(args(2), &freearg3);
+  }
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "cvFindStereoCorrespondenceBM" "', argument " "4"" of type '" "CvStereoBMState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
+  arg4 = (CvStereoBMState *)(argp4);
   {
     try {
-      delete arg1
+      cvFindStereoCorrespondenceBM((void const *)arg1,(void const *)arg2,arg3,arg4)
     } 
     catch (...) 
     {
@@ -107789,184 +96901,168 @@ static octave_value_list _wrap_delete_CvLevMarq (const octave_value_list& args,
   }
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    if(arg1!=NULL && freearg1){
+      cvReleaseData( arg1 );
+      cvFree(&(arg1));
+    }
+  }
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg3!=NULL && freearg3){
+      cvReleaseData( arg3 );
+      cvFree(&(arg3));
+    }
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_init__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_Ithreshold_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   int arg2 ;
-  int arg3 ;
-  CvTermCriteria arg4 ;
-  bool arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 ;
-  int res4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_init",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_Ithreshold_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_init" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_Ithreshold_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
+  arg1 = (CvStereoGCState *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_init" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_Ithreshold_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLevMarq_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvTermCriteria,  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvLevMarq_init" "', argument " "4"" of type '" "CvTermCriteria""'"); 
-    }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_init" "', argument " "4"" of type '" "CvTermCriteria""'");
-    } else {
-      arg4 = *((CvTermCriteria *)(argp4));
-    }
+  if (arg1) (arg1)->Ithreshold = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStereoGCState_Ithreshold_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvStereoGCState_Ithreshold_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvLevMarq_init" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4,arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_Ithreshold_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (int) ((arg1)->Ithreshold);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_init__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_interactionRadius_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   int arg2 ;
-  int arg3 ;
-  CvTermCriteria arg4 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_init",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_interactionRadius_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_init" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_interactionRadius_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
+  arg1 = (CvStereoGCState *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_init" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_interactionRadius_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLevMarq_init" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  {
-    res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_CvTermCriteria,  0 );
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvLevMarq_init" "', argument " "4"" of type '" "CvTermCriteria""'"); 
-    }  
-    if (!argp4) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_init" "', argument " "4"" of type '" "CvTermCriteria""'");
-    } else {
-      arg4 = *((CvTermCriteria *)(argp4));
-    }
+  if (arg1) (arg1)->interactionRadius = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvStereoGCState_interactionRadius_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvStereoGCState_interactionRadius_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  {
-    try {
-      (arg1)->init(arg2,arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_interactionRadius_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (int) ((arg1)->interactionRadius);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_init__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  int arg2 ;
-  int arg3 ;
+static octave_value_list _wrap_CvStereoGCState_K_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  float arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
+  float val2 ;
   int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_init",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_K_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_init" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_K_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  arg1 = (CvStereoGCState *)(argp1);
+  ecode2 = SWIG_AsVal_float(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_init" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvLevMarq_init" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_K_set" "', argument " "2"" of type '" "float""'");
   } 
-  arg3 = (int)(val3);
-  {
-    try {
-      (arg1)->init(arg2,arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
+  arg2 = (float)(val2);
+  if (arg1) (arg1)->K = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -107974,265 +97070,113 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_init (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[5]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
-  };
+static octave_value_list _wrap_CvStereoGCState_K_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
   
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLevMarq, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          return _wrap_CvLevMarq_init__SWIG_2(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLevMarq, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvTermCriteria, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvLevMarq_init__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
+  if (!SWIG_check_num_args("CvStereoGCState_K_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvLevMarq, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvTermCriteria, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              return _wrap_CvLevMarq_init__SWIG_0(args, nargout);
-            }
-          }
-        }
-      }
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_K_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (float) ((arg1)->K);
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_update (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  CvMat **arg2 = 0 ;
-  CvMat **arg3 = 0 ;
-  CvMat **arg4 = 0 ;
+static octave_value_list _wrap_CvStereoGCState_lambda_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  float arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvLevMarq_update",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_lambda_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_update" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_p_CvMat,  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_update" "', argument " "2"" of type '" "CvMat const *&""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_update" "', argument " "2"" of type '" "CvMat const *&""'"); 
-  }
-  arg2 = (CvMat **)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_p_CvMat,  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvLevMarq_update" "', argument " "3"" of type '" "CvMat *&""'"); 
-  }
-  if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_update" "', argument " "3"" of type '" "CvMat *&""'"); 
-  }
-  arg3 = (CvMat **)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_p_CvMat,  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvLevMarq_update" "', argument " "4"" of type '" "CvMat *&""'"); 
-  }
-  if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_update" "', argument " "4"" of type '" "CvMat *&""'"); 
-  }
-  arg4 = (CvMat **)(argp4);
-  {
-    try {
-      result = (bool)(arg1)->update((CvMat const *&)*arg2,*arg3,*arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  arg1 = (CvStereoGCState *)(argp1);
+  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_lambda_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = (float)(val2);
+  if (arg1) (arg1)->lambda = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_updateAlt (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  CvMat **arg2 = 0 ;
-  CvMat **arg3 = 0 ;
-  CvMat **arg4 = 0 ;
-  double **arg5 = 0 ;
+static octave_value_list _wrap_CvStereoGCState_lambda_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  float result;
   
-  if (!SWIG_check_num_args("CvLevMarq_updateAlt",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_lambda_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_updateAlt" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_p_CvMat,  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_updateAlt" "', argument " "2"" of type '" "CvMat const *&""'"); 
-  }
-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_updateAlt" "', argument " "2"" of type '" "CvMat const *&""'"); 
-  }
-  arg2 = (CvMat **)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_p_CvMat,  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvLevMarq_updateAlt" "', argument " "3"" of type '" "CvMat *&""'"); 
-  }
-  if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_updateAlt" "', argument " "3"" of type '" "CvMat *&""'"); 
-  }
-  arg3 = (CvMat **)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4, SWIGTYPE_p_p_CvMat,  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvLevMarq_updateAlt" "', argument " "4"" of type '" "CvMat *&""'"); 
-  }
-  if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_updateAlt" "', argument " "4"" of type '" "CvMat *&""'"); 
-  }
-  arg4 = (CvMat **)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_p_double,  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvLevMarq_updateAlt" "', argument " "5"" of type '" "double *&""'"); 
-  }
-  if (!argp5) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvLevMarq_updateAlt" "', argument " "5"" of type '" "double *&""'"); 
-  }
-  arg5 = (double **)(argp5);
-  {
-    try {
-      result = (bool)(arg1)->updateAlt((CvMat const *&)*arg2,*arg3,*arg4,*arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (float) ((arg1)->lambda);
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_clear (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_lambda1_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  float arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_clear",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_lambda1_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_clear" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  {
-    try {
-      (arg1)->clear(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda1_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
+  arg1 = (CvStereoGCState *)(argp1);
+  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_lambda1_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = (float)(val2);
+  if (arg1) (arg1)->lambda1 = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108240,63 +97184,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_step (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_lambda1_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  float result;
   
-  if (!SWIG_check_num_args("CvLevMarq_step",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_lambda1_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_step" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  {
-    try {
-      (arg1)->step(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda1_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (float) ((arg1)->lambda1);
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_mask_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_lambda2_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  float arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_mask_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_lambda2_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_mask_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_mask_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda2_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->mask = arg2;
+  arg1 = (CvStereoGCState *)(argp1);
+  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_lambda2_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = (float)(val2);
+  if (arg1) (arg1)->lambda2 = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108304,56 +97241,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_mask_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_lambda2_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  float result;
   
-  if (!SWIG_check_num_args("CvLevMarq_mask_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_lambda2_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_mask_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_lambda2_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->mask);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (float) ((arg1)->lambda2);
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_prevParam_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_occlusionCost_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_prevParam_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_occlusionCost_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_prevParam_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_prevParam_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_occlusionCost_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->prevParam = arg2;
+  arg1 = (CvStereoGCState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_occlusionCost_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->occlusionCost = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108361,56 +97298,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_prevParam_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_occlusionCost_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvLevMarq_prevParam_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_occlusionCost_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_prevParam_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_occlusionCost_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->prevParam);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (int) ((arg1)->occlusionCost);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_param_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_minDisparity_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_param_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_minDisparity_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_param_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_param_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_minDisparity_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->param = arg2;
+  arg1 = (CvStereoGCState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_minDisparity_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->minDisparity = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108418,56 +97355,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_param_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_minDisparity_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvLevMarq_param_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_minDisparity_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_param_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_minDisparity_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->param);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (int) ((arg1)->minDisparity);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_J_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_numberOfDisparities_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_J_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_numberOfDisparities_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_J_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_J_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_numberOfDisparities_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->J = arg2;
+  arg1 = (CvStereoGCState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_numberOfDisparities_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->numberOfDisparities = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108475,56 +97412,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_J_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_numberOfDisparities_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvLevMarq_J_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_numberOfDisparities_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_J_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_numberOfDisparities_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->J);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (int) ((arg1)->numberOfDisparities);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_err_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_maxIters_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_err_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_maxIters_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_err_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_err_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_maxIters_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->err = arg2;
+  arg1 = (CvStereoGCState *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvStereoGCState_maxIters_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->maxIters = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108532,33 +97469,33 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_err_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_maxIters_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvLevMarq_err_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_maxIters_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_err_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_maxIters_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->err);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (int) ((arg1)->maxIters);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtJ_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_left_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -108568,20 +97505,20 @@ static octave_value_list _wrap_CvLevMarq_JtJ_set (const octave_value_list& args,
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtJ_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_left_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtJ_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_left_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
+  arg1 = (CvStereoGCState *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_JtJ_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_left_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->JtJ = arg2;
+  if (arg1) (arg1)->left = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108589,8 +97526,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtJ_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_left_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -108598,15 +97535,15 @@ static octave_value_list _wrap_CvLevMarq_JtJ_get (const octave_value_list& args,
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtJ_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_left_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtJ_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_left_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->JtJ);
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (CvMat *) ((arg1)->left);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108614,8 +97551,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtJN_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_right_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -108625,20 +97562,20 @@ static octave_value_list _wrap_CvLevMarq_JtJN_set (const octave_value_list& args
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtJN_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_right_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtJN_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_right_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
+  arg1 = (CvStereoGCState *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_JtJN_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_right_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->JtJN = arg2;
+  if (arg1) (arg1)->right = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108646,8 +97583,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtJN_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_right_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -108655,15 +97592,15 @@ static octave_value_list _wrap_CvLevMarq_JtJN_get (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtJN_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_right_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtJN_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_right_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->JtJN);
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (CvMat *) ((arg1)->right);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108671,8 +97608,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtErr_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_dispLeft_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -108682,20 +97619,20 @@ static octave_value_list _wrap_CvLevMarq_JtErr_set (const octave_value_list& arg
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtErr_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_dispLeft_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtErr_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_dispLeft_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
+  arg1 = (CvStereoGCState *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_JtErr_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_dispLeft_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->JtErr = arg2;
+  if (arg1) (arg1)->dispLeft = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108703,8 +97640,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtErr_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_dispLeft_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -108712,15 +97649,15 @@ static octave_value_list _wrap_CvLevMarq_JtErr_get (const octave_value_list& arg
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtErr_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_dispLeft_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtErr_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_dispLeft_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->JtErr);
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (CvMat *) ((arg1)->dispLeft);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108728,8 +97665,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtJV_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_dispRight_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -108739,20 +97676,20 @@ static octave_value_list _wrap_CvLevMarq_JtJV_set (const octave_value_list& args
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtJV_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_dispRight_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtJV_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_dispRight_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
+  arg1 = (CvStereoGCState *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_JtJV_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_dispRight_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->JtJV = arg2;
+  if (arg1) (arg1)->dispRight = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108760,8 +97697,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtJV_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_dispRight_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -108769,15 +97706,15 @@ static octave_value_list _wrap_CvLevMarq_JtJV_get (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtJV_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_dispRight_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtJV_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_dispRight_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->JtJV);
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (CvMat *) ((arg1)->dispRight);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108785,8 +97722,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtJW_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_ptrLeft_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -108796,20 +97733,20 @@ static octave_value_list _wrap_CvLevMarq_JtJW_set (const octave_value_list& args
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtJW_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_ptrLeft_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtJW_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_ptrLeft_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
+  arg1 = (CvStereoGCState *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_JtJW_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_ptrLeft_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->JtJW = arg2;
+  if (arg1) (arg1)->ptrLeft = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108817,8 +97754,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_JtJW_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_ptrLeft_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
@@ -108826,15 +97763,15 @@ static octave_value_list _wrap_CvLevMarq_JtJW_get (const octave_value_list& args
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_JtJW_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_ptrLeft_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_JtJW_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_ptrLeft_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvMat *) ((arg1)->JtJW);
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (CvMat *) ((arg1)->ptrLeft);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108842,31 +97779,31 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_prevErrNorm_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_CvStereoGCState_ptrRight_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_prevErrNorm_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_ptrRight_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_prevErrNorm_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_ptrRight_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_prevErrNorm_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->prevErrNorm = arg2;
+  arg1 = (CvStereoGCState *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_ptrRight_set" "', argument " "2"" of type '" "CvMat *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->ptrRight = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108874,56 +97811,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_prevErrNorm_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_ptrRight_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_prevErrNorm_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_ptrRight_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_prevErrNorm_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_ptrRight_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (double) ((arg1)->prevErrNorm);
-  _outv = SWIG_From_double((double)(result));
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (CvMat *) ((arg1)->ptrRight);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_errNorm_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_CvStereoGCState_vtxBuf_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_errNorm_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_vtxBuf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_errNorm_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_vtxBuf_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_errNorm_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->errNorm = arg2;
+  arg1 = (CvStereoGCState *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_vtxBuf_set" "', argument " "2"" of type '" "CvMat *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->vtxBuf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108931,56 +97868,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_errNorm_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_vtxBuf_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_errNorm_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_vtxBuf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_errNorm_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_vtxBuf_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (double) ((arg1)->errNorm);
-  _outv = SWIG_From_double((double)(result));
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (CvMat *) ((arg1)->vtxBuf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_lambdaLg10_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_CvStereoGCState_edgeBuf_set (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_lambdaLg10_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_edgeBuf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_lambdaLg10_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_edgeBuf_set" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_lambdaLg10_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->lambdaLg10 = arg2;
+  arg1 = (CvStereoGCState *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvStereoGCState_edgeBuf_set" "', argument " "2"" of type '" "CvMat *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->edgeBuf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -108988,287 +97925,374 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvLevMarq_lambdaLg10_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_CvStereoGCState_edgeBuf_get (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_lambdaLg10_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvStereoGCState_edgeBuf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_lambdaLg10_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvStereoGCState_edgeBuf_get" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (int) ((arg1)->lambdaLg10);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvStereoGCState *)(argp1);
+  result = (CvMat *) ((arg1)->edgeBuf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_criteria_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  CvTermCriteria *arg2 = (CvTermCriteria *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+static octave_value_list _wrap_new_CvStereoGCState (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvStereoGCState *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_criteria_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("new_CvStereoGCState",args.length(),0,0,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_criteria_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvTermCriteria, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvLevMarq_criteria_set" "', argument " "2"" of type '" "CvTermCriteria *""'"); 
+  {
+    try {
+      result = (CvStereoGCState *)new CvStereoGCState(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg2 = (CvTermCriteria *)(argp2);
-  if (arg1) (arg1)->criteria = *arg2;
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStereoGCState, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_criteria_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_delete_CvStereoGCState (const octave_value_list& args, int nargout) {
+  CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvTermCriteria *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_criteria_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("delete_CvStereoGCState",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvStereoGCState, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_criteria_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvStereoGCState" "', argument " "1"" of type '" "CvStereoGCState *""'"); 
+  }
+  arg1 = (CvStereoGCState *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (CvTermCriteria *)& ((arg1)->criteria);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTermCriteria, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_state_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static swig_octave_member swig_CvStereoGCState_members[] = {
+{"Ithreshold",0,_wrap_CvStereoGCState_Ithreshold_get,_wrap_CvStereoGCState_Ithreshold_set,0,0},
+{"interactionRadius",0,_wrap_CvStereoGCState_interactionRadius_get,_wrap_CvStereoGCState_interactionRadius_set,0,0},
+{"K",0,_wrap_CvStereoGCState_K_get,_wrap_CvStereoGCState_K_set,0,0},
+{"lambda",0,_wrap_CvStereoGCState_lambda_get,_wrap_CvStereoGCState_lambda_set,0,0},
+{"lambda1",0,_wrap_CvStereoGCState_lambda1_get,_wrap_CvStereoGCState_lambda1_set,0,0},
+{"lambda2",0,_wrap_CvStereoGCState_lambda2_get,_wrap_CvStereoGCState_lambda2_set,0,0},
+{"occlusionCost",0,_wrap_CvStereoGCState_occlusionCost_get,_wrap_CvStereoGCState_occlusionCost_set,0,0},
+{"minDisparity",0,_wrap_CvStereoGCState_minDisparity_get,_wrap_CvStereoGCState_minDisparity_set,0,0},
+{"numberOfDisparities",0,_wrap_CvStereoGCState_numberOfDisparities_get,_wrap_CvStereoGCState_numberOfDisparities_set,0,0},
+{"maxIters",0,_wrap_CvStereoGCState_maxIters_get,_wrap_CvStereoGCState_maxIters_set,0,0},
+{"left",0,_wrap_CvStereoGCState_left_get,_wrap_CvStereoGCState_left_set,0,0},
+{"right",0,_wrap_CvStereoGCState_right_get,_wrap_CvStereoGCState_right_set,0,0},
+{"dispLeft",0,_wrap_CvStereoGCState_dispLeft_get,_wrap_CvStereoGCState_dispLeft_set,0,0},
+{"dispRight",0,_wrap_CvStereoGCState_dispRight_get,_wrap_CvStereoGCState_dispRight_set,0,0},
+{"ptrLeft",0,_wrap_CvStereoGCState_ptrLeft_get,_wrap_CvStereoGCState_ptrLeft_set,0,0},
+{"ptrRight",0,_wrap_CvStereoGCState_ptrRight_get,_wrap_CvStereoGCState_ptrRight_set,0,0},
+{"vtxBuf",0,_wrap_CvStereoGCState_vtxBuf_get,_wrap_CvStereoGCState_vtxBuf_set,0,0},
+{"edgeBuf",0,_wrap_CvStereoGCState_edgeBuf_get,_wrap_CvStereoGCState_edgeBuf_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvStereoGCState_base_names[] = {0};
+static const swig_type_info *swig_CvStereoGCState_base[] = {0};
+static swig_octave_class _wrap_class_CvStereoGCState = {"CvStereoGCState", &SWIGTYPE_p_CvStereoGCState,0,_wrap_new_CvStereoGCState,0,_wrap_delete_CvStereoGCState,swig_CvStereoGCState_members,swig_CvStereoGCState_base_names,swig_CvStereoGCState_base };
+
+static octave_value_list _wrap_cvCreateStereoGCState (const octave_value_list& args, int nargout) {
+  int arg1 ;
   int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvStereoGCState *result = 0 ;
   
-  if (!SWIG_check_num_args("CvLevMarq_state_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvCreateStereoGCState",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_state_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
-  }
-  arg1 = (CvLevMarq *)(argp1);
+  ecode1 = SWIG_AsVal_int(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCreateStereoGCState" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_state_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvCreateStereoGCState" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->state = arg2;
-  _outv = octave_value();
+  {
+    try {
+      result = (CvStereoGCState *)cvCreateStereoGCState(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvStereoGCState, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_state_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_cvReleaseStereoGCState (const octave_value_list& args, int nargout) {
+  CvStereoGCState **arg1 = (CvStereoGCState **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvLevMarq_state_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvReleaseStereoGCState",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvStereoGCState, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_state_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvReleaseStereoGCState" "', argument " "1"" of type '" "CvStereoGCState **""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (int) ((arg1)->state);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvStereoGCState **)(argp1);
+  {
+    try {
+      cvReleaseStereoGCState(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_iters_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+static octave_value_list _wrap_cvFindStereoCorrespondenceGC (const octave_value_list& args, int nargout) {
+  CvArr *arg1 = (CvArr *) 0 ;
+  CvArr *arg2 = (CvArr *) 0 ;
+  CvArr *arg3 = (CvArr *) 0 ;
+  CvArr *arg4 = (CvArr *) 0 ;
+  CvStereoGCState *arg5 = (CvStereoGCState *) 0 ;
+  int arg6 = (int) 0 ;
+  bool freearg1 = false ;
+  bool freearg2 = false ;
+  bool freearg3 = false ;
+  bool freearg4 = false ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_iters_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvFindStereoCorrespondenceGC",args.length(),6,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_iters_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+  {
+    arg1 = OctObject_to_CvArr(args(0), &freearg1);
+  }
+  {
+    arg2 = OctObject_to_CvArr(args(1), &freearg2);
+  }
+  {
+    arg3 = OctObject_to_CvArr(args(2), &freearg3);
+  }
+  {
+    arg4 = OctObject_to_CvArr(args(3), &freearg4);
+  }
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvFindStereoCorrespondenceGC" "', argument " "5"" of type '" "CvStereoGCState *""'"); 
+  }
+  arg5 = (CvStereoGCState *)(argp5);
+  if (5<args.length()) {
+    ecode6 = SWIG_AsVal_int(args(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvFindStereoCorrespondenceGC" "', argument " "6"" of type '" "int""'");
+    } 
+    arg6 = (int)(val6);
+  }
+  {
+    try {
+      cvFindStereoCorrespondenceGC((void const *)arg1,(void const *)arg2,arg3,arg4,arg5,arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_iters_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->iters = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvLevMarq_iters_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvLevMarq_iters_get",args.length(),1,1,0)) {
-    SWIG_fail;
+  {
+    if(arg1!=NULL && freearg1){
+      cvReleaseData( arg1 );
+      cvFree(&(arg1));
+    }
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_iters_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg3!=NULL && freearg3){
+      cvReleaseData( arg3 );
+      cvFree(&(arg3));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (int) ((arg1)->iters);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_completeSymmFlag_set (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
-  bool arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool val2 ;
-  int ecode2 = 0 ;
+static octave_value_list _wrap_cvReprojectImageTo3D (const octave_value_list& args, int nargout) {
+  CvArr *arg1 = (CvArr *) 0 ;
+  CvArr *arg2 = (CvArr *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  int arg4 = (int) 0 ;
+  bool freearg1 = false ;
+  bool freearg2 = false ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvLevMarq_completeSymmFlag_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvReprojectImageTo3D",args.length(),4,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_completeSymmFlag_set" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+  {
+    arg1 = OctObject_to_CvArr(args(0), &freearg1);
+  }
+  {
+    arg2 = OctObject_to_CvArr(args(1), &freearg2);
+  }
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvReprojectImageTo3D" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  if (3<args.length()) {
+    ecode4 = SWIG_AsVal_int(args(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvReprojectImageTo3D" "', argument " "4"" of type '" "int""'");
+    } 
+    arg4 = (int)(val4);
+  }
+  {
+    try {
+      cvReprojectImageTo3D((void const *)arg1,arg2,(CvMat const *)arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  ecode2 = SWIG_AsVal_bool(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvLevMarq_completeSymmFlag_set" "', argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = (bool)(val2);
-  if (arg1) (arg1)->completeSymmFlag = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  {
+    if(arg1!=NULL && freearg1){
+      cvReleaseData( arg1 );
+      cvFree(&(arg1));
+    }
+  }
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvLevMarq_completeSymmFlag_get (const octave_value_list& args, int nargout) {
-  CvLevMarq *arg1 = (CvLevMarq *) 0 ;
+static octave_value_list _wrap_delete_CvLSH (const octave_value_list& args, int nargout) {
+  CvLSH *arg1 = (CvLSH *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvLevMarq_completeSymmFlag_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("delete_CvLSH",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLevMarq, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvLSH, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvLevMarq_completeSymmFlag_get" "', argument " "1"" of type '" "CvLevMarq *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvLSH" "', argument " "1"" of type '" "CvLSH *""'"); 
   }
-  arg1 = (CvLevMarq *)(argp1);
-  result = (bool) ((arg1)->completeSymmFlag);
-  _outv = SWIG_From_bool((bool)(result));
+  arg1 = (CvLSH *)(argp1);
+  {
+    try {
+      delete_CvLSH(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static swig_octave_member swig_CvLevMarq_members[] = {
-{"init",_wrap_CvLevMarq_init,0,0,0,0},
-{"update",_wrap_CvLevMarq_update,0,0,0,0},
-{"updateAlt",_wrap_CvLevMarq_updateAlt,0,0,0,0},
-{"clear",_wrap_CvLevMarq_clear,0,0,0,0},
-{"step",_wrap_CvLevMarq_step,0,0,0,0},
-{"mask",0,_wrap_CvLevMarq_mask_get,_wrap_CvLevMarq_mask_set,0,0},
-{"prevParam",0,_wrap_CvLevMarq_prevParam_get,_wrap_CvLevMarq_prevParam_set,0,0},
-{"param",0,_wrap_CvLevMarq_param_get,_wrap_CvLevMarq_param_set,0,0},
-{"J",0,_wrap_CvLevMarq_J_get,_wrap_CvLevMarq_J_set,0,0},
-{"err",0,_wrap_CvLevMarq_err_get,_wrap_CvLevMarq_err_set,0,0},
-{"JtJ",0,_wrap_CvLevMarq_JtJ_get,_wrap_CvLevMarq_JtJ_set,0,0},
-{"JtJN",0,_wrap_CvLevMarq_JtJN_get,_wrap_CvLevMarq_JtJN_set,0,0},
-{"JtErr",0,_wrap_CvLevMarq_JtErr_get,_wrap_CvLevMarq_JtErr_set,0,0},
-{"JtJV",0,_wrap_CvLevMarq_JtJV_get,_wrap_CvLevMarq_JtJV_set,0,0},
-{"JtJW",0,_wrap_CvLevMarq_JtJW_get,_wrap_CvLevMarq_JtJW_set,0,0},
-{"prevErrNorm",0,_wrap_CvLevMarq_prevErrNorm_get,_wrap_CvLevMarq_prevErrNorm_set,0,0},
-{"errNorm",0,_wrap_CvLevMarq_errNorm_get,_wrap_CvLevMarq_errNorm_set,0,0},
-{"lambdaLg10",0,_wrap_CvLevMarq_lambdaLg10_get,_wrap_CvLevMarq_lambdaLg10_set,0,0},
-{"criteria",0,_wrap_CvLevMarq_criteria_get,_wrap_CvLevMarq_criteria_set,0,0},
-{"state",0,_wrap_CvLevMarq_state_get,_wrap_CvLevMarq_state_set,0,0},
-{"iters",0,_wrap_CvLevMarq_iters_get,_wrap_CvLevMarq_iters_set,0,0},
-{"completeSymmFlag",0,_wrap_CvLevMarq_completeSymmFlag_get,_wrap_CvLevMarq_completeSymmFlag_set,0,0},
+static swig_octave_member swig_CvLSH_members[] = {
 {0,0,0,0}
 };
-static const char *swig_CvLevMarq_base_names[] = {0};
-static const swig_type_info *swig_CvLevMarq_base[] = {0};
-static swig_octave_class _wrap_class_CvLevMarq = {"CvLevMarq", &SWIGTYPE_p_CvLevMarq,0,_wrap_new_CvLevMarq,0,_wrap_delete_CvLevMarq,swig_CvLevMarq_members,swig_CvLevMarq_base_names,swig_CvLevMarq_base };
+static const char *swig_CvLSH_base_names[] = {0};
+static const swig_type_info *swig_CvLSH_base[] = {0};
+static swig_octave_class _wrap_class_CvLSH = {"CvLSH", &SWIGTYPE_p_CvLSH,0,0,0,_wrap_delete_CvLSH,swig_CvLSH_members,swig_CvLSH_base_names,swig_CvLSH_base };
 
 static octave_value_list _wrap_CvTuple_CvPoint_2_val_set (const octave_value_list& args, int nargout) {
   CvTuple< CvPoint,2 > *arg1 = (CvTuple< CvPoint,2 > *) 0 ;
@@ -109361,10 +98385,7 @@ static octave_value_list _wrap_CvTuple_CvPoint_2___paren (const octave_value_lis
   arg2 = (int)(val2);
   {
     try {
-      {
-        CvPoint const &_result_ref = (arg1)->__paren(arg2);
-        result = (CvPoint *) &_result_ref;
-      } 
+      result = (CvPoint *) &(arg1)->__paren(arg2); 
     } 
     catch (...) 
     {
@@ -109453,10 +98474,7 @@ static octave_value_list _wrap_CvTuple_CvPoint_2___brace (const octave_value_lis
   arg2 = (int)(val2);
   {
     try {
-      {
-        CvPoint const &_result_ref = (arg1)->__brace(arg2);
-        result = (CvPoint *) &_result_ref;
-      } 
+      result = (CvPoint *) &(arg1)->__brace(arg2); 
     } 
     catch (...) 
     {
@@ -109678,10 +98696,7 @@ static octave_value_list _wrap_CvTuple_float_2___paren (const octave_value_list&
   arg2 = (int)(val2);
   {
     try {
-      {
-        float const &_result_ref = (arg1)->__paren(arg2);
-        result = (float *) &_result_ref;
-      } 
+      result = (float *) &(arg1)->__paren(arg2); 
     } 
     catch (...) 
     {
@@ -109770,10 +98785,7 @@ static octave_value_list _wrap_CvTuple_float_2___brace (const octave_value_list&
   arg2 = (int)(val2);
   {
     try {
-      {
-        float const &_result_ref = (arg1)->__brace(arg2);
-        result = (float *) &_result_ref;
-      } 
+      result = (float *) &(arg1)->__brace(arg2); 
     } 
     catch (...) 
     {
@@ -109995,10 +99007,7 @@ static octave_value_list _wrap_CvTuple_float_3___paren (const octave_value_list&
   arg2 = (int)(val2);
   {
     try {
-      {
-        float const &_result_ref = (arg1)->__paren(arg2);
-        result = (float *) &_result_ref;
-      } 
+      result = (float *) &(arg1)->__paren(arg2); 
     } 
     catch (...) 
     {
@@ -110087,10 +99096,7 @@ static octave_value_list _wrap_CvTuple_float_3___brace (const octave_value_list&
   arg2 = (int)(val2);
   {
     try {
-      {
-        float const &_result_ref = (arg1)->__brace(arg2);
-        result = (float *) &_result_ref;
-      } 
+      result = (float *) &(arg1)->__brace(arg2); 
     } 
     catch (...) 
     {
@@ -113499,14 +102505,14 @@ static const struct swig_octave_member swig_globals[] = {
 {"new_CvRNG_Wrapper",_wrap_new_CvRNG_Wrapper,0,0,2,_wrap_new_CvRNG_Wrapper_texinfo},
 {"CvRNG_Wrapper_ptr",_wrap_CvRNG_Wrapper_ptr,0,0,2,_wrap_CvRNG_Wrapper_ptr_texinfo},
 {"CvRNG_Wrapper_ref",_wrap_CvRNG_Wrapper_ref,0,0,2,_wrap_CvRNG_Wrapper_ref_texinfo},
-{"CvRNG_Wrapper___eq",_wrap_CvRNG_Wrapper___eq,0,0,2,_wrap_CvRNG_Wrapper___eq_texinfo},
-{"CvRNG_Wrapper___ne",_wrap_CvRNG_Wrapper___ne,0,0,2,_wrap_CvRNG_Wrapper___ne_texinfo},
+{"CvRNG_Wrapper___eq__",_wrap_CvRNG_Wrapper___eq__,0,0,2,_wrap_CvRNG_Wrapper___eq___texinfo},
+{"CvRNG_Wrapper___ne__",_wrap_CvRNG_Wrapper___ne__,0,0,2,_wrap_CvRNG_Wrapper___ne___texinfo},
 {"delete_CvRNG_Wrapper",_wrap_delete_CvRNG_Wrapper,0,0,2,_wrap_delete_CvRNG_Wrapper_texinfo},
 {"new_CvSubdiv2DEdge_Wrapper",_wrap_new_CvSubdiv2DEdge_Wrapper,0,0,2,_wrap_new_CvSubdiv2DEdge_Wrapper_texinfo},
 {"CvSubdiv2DEdge_Wrapper_ptr",_wrap_CvSubdiv2DEdge_Wrapper_ptr,0,0,2,_wrap_CvSubdiv2DEdge_Wrapper_ptr_texinfo},
 {"CvSubdiv2DEdge_Wrapper_ref",_wrap_CvSubdiv2DEdge_Wrapper_ref,0,0,2,_wrap_CvSubdiv2DEdge_Wrapper_ref_texinfo},
-{"CvSubdiv2DEdge_Wrapper___eq",_wrap_CvSubdiv2DEdge_Wrapper___eq,0,0,2,_wrap_CvSubdiv2DEdge_Wrapper___eq_texinfo},
-{"CvSubdiv2DEdge_Wrapper___ne",_wrap_CvSubdiv2DEdge_Wrapper___ne,0,0,2,_wrap_CvSubdiv2DEdge_Wrapper___ne_texinfo},
+{"CvSubdiv2DEdge_Wrapper___eq__",_wrap_CvSubdiv2DEdge_Wrapper___eq__,0,0,2,_wrap_CvSubdiv2DEdge_Wrapper___eq___texinfo},
+{"CvSubdiv2DEdge_Wrapper___ne__",_wrap_CvSubdiv2DEdge_Wrapper___ne__,0,0,2,_wrap_CvSubdiv2DEdge_Wrapper___ne___texinfo},
 {"delete_CvSubdiv2DEdge_Wrapper",_wrap_delete_CvSubdiv2DEdge_Wrapper,0,0,2,_wrap_delete_CvSubdiv2DEdge_Wrapper_texinfo},
 {"delete_OctSwigIterator",_wrap_delete_OctSwigIterator,0,0,2,_wrap_delete_OctSwigIterator_texinfo},
 {"OctSwigIterator_value",_wrap_OctSwigIterator_value,0,0,2,_wrap_OctSwigIterator_value_texinfo},
@@ -113518,15 +102524,15 @@ static const struct swig_octave_member swig_globals[] = {
 {"OctSwigIterator_next",_wrap_OctSwigIterator_next,0,0,2,_wrap_OctSwigIterator_next_texinfo},
 {"OctSwigIterator_previous",_wrap_OctSwigIterator_previous,0,0,2,_wrap_OctSwigIterator_previous_texinfo},
 {"OctSwigIterator_advance",_wrap_OctSwigIterator_advance,0,0,2,_wrap_OctSwigIterator_advance_texinfo},
-{"OctSwigIterator___eq",_wrap_OctSwigIterator___eq,0,0,2,_wrap_OctSwigIterator___eq_texinfo},
-{"OctSwigIterator___ne",_wrap_OctSwigIterator___ne,0,0,2,_wrap_OctSwigIterator___ne_texinfo},
-{"OctSwigIterator___incr",_wrap_OctSwigIterator___incr,0,0,2,_wrap_OctSwigIterator___incr_texinfo},
-{"OctSwigIterator___decr",_wrap_OctSwigIterator___decr,0,0,2,_wrap_OctSwigIterator___decr_texinfo},
-{"OctSwigIterator___add",_wrap_OctSwigIterator___add,0,0,2,_wrap_OctSwigIterator___add_texinfo},
-{"OctSwigIterator___sub",_wrap_OctSwigIterator___sub,0,0,2,_wrap_OctSwigIterator___sub_texinfo},
+{"OctSwigIterator___eq__",_wrap_OctSwigIterator___eq__,0,0,2,_wrap_OctSwigIterator___eq___texinfo},
+{"OctSwigIterator___ne__",_wrap_OctSwigIterator___ne__,0,0,2,_wrap_OctSwigIterator___ne___texinfo},
+{"OctSwigIterator___incr__",_wrap_OctSwigIterator___incr__,0,0,2,_wrap_OctSwigIterator___incr___texinfo},
+{"OctSwigIterator___decr__",_wrap_OctSwigIterator___decr__,0,0,2,_wrap_OctSwigIterator___decr___texinfo},
+{"OctSwigIterator___add__",_wrap_OctSwigIterator___add__,0,0,2,_wrap_OctSwigIterator___add___texinfo},
+{"OctSwigIterator___sub__",_wrap_OctSwigIterator___sub__,0,0,2,_wrap_OctSwigIterator___sub___texinfo},
 {"FloatVector_pop",_wrap_FloatVector_pop,0,0,2,_wrap_FloatVector_pop_texinfo},
-{"FloatVector___paren",_wrap_FloatVector___paren,0,0,2,_wrap_FloatVector___paren_texinfo},
-{"FloatVector___paren_asgn",_wrap_FloatVector___paren_asgn,0,0,2,_wrap_FloatVector___paren_asgn_texinfo},
+{"FloatVector___paren__",_wrap_FloatVector___paren__,0,0,2,_wrap_FloatVector___paren___texinfo},
+{"FloatVector___paren_asgn__",_wrap_FloatVector___paren_asgn__,0,0,2,_wrap_FloatVector___paren_asgn___texinfo},
 {"FloatVector_append",_wrap_FloatVector_append,0,0,2,_wrap_FloatVector_append_texinfo},
 {"FloatVector_empty",_wrap_FloatVector_empty,0,0,2,_wrap_FloatVector_empty_texinfo},
 {"FloatVector_size",_wrap_FloatVector_size,0,0,2,_wrap_FloatVector_size_texinfo},
@@ -113550,8 +102556,8 @@ static const struct swig_octave_member swig_globals[] = {
 {"FloatVector_capacity",_wrap_FloatVector_capacity,0,0,2,_wrap_FloatVector_capacity_texinfo},
 {"delete_FloatVector",_wrap_delete_FloatVector,0,0,2,_wrap_delete_FloatVector_texinfo},
 {"CvPointVector_pop",_wrap_CvPointVector_pop,0,0,2,_wrap_CvPointVector_pop_texinfo},
-{"CvPointVector___paren",_wrap_CvPointVector___paren,0,0,2,_wrap_CvPointVector___paren_texinfo},
-{"CvPointVector___paren_asgn",_wrap_CvPointVector___paren_asgn,0,0,2,_wrap_CvPointVector___paren_asgn_texinfo},
+{"CvPointVector___paren__",_wrap_CvPointVector___paren__,0,0,2,_wrap_CvPointVector___paren___texinfo},
+{"CvPointVector___paren_asgn__",_wrap_CvPointVector___paren_asgn__,0,0,2,_wrap_CvPointVector___paren_asgn___texinfo},
 {"CvPointVector_append",_wrap_CvPointVector_append,0,0,2,_wrap_CvPointVector_append_texinfo},
 {"CvPointVector_empty",_wrap_CvPointVector_empty,0,0,2,_wrap_CvPointVector_empty_texinfo},
 {"CvPointVector_size",_wrap_CvPointVector_size,0,0,2,_wrap_CvPointVector_size_texinfo},
@@ -113599,6 +102605,7 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvSqrt",_wrap_cvSqrt,0,0,2,_wrap_cvSqrt_texinfo},
 {"CV_IS_IMAGE_HDR",_wrap_CV_IS_IMAGE_HDR,0,0,2,_wrap_CV_IS_IMAGE_HDR_texinfo},
 {"CV_IS_IMAGE",_wrap_CV_IS_IMAGE,0,0,2,_wrap_CV_IS_IMAGE_texinfo},
+{"CV_MAT_DEPTH",_wrap_CV_MAT_DEPTH,0,0,2,_wrap_CV_MAT_DEPTH_texinfo},
 {"CV_MAKETYPE",_wrap_CV_MAKETYPE,0,0,2,_wrap_CV_MAKETYPE_texinfo},
 {"CV_8UC",_wrap_CV_8UC,0,0,2,_wrap_CV_8UC_texinfo},
 {"CV_8SC",_wrap_CV_8SC,0,0,2,_wrap_CV_8SC_texinfo},
@@ -113608,7 +102615,6 @@ static const struct swig_octave_member swig_globals[] = {
 {"CV_32FC",_wrap_CV_32FC,0,0,2,_wrap_CV_32FC_texinfo},
 {"CV_64FC",_wrap_CV_64FC,0,0,2,_wrap_CV_64FC_texinfo},
 {"CV_MAT_CN",_wrap_CV_MAT_CN,0,0,2,_wrap_CV_MAT_CN_texinfo},
-{"CV_MAT_DEPTH",_wrap_CV_MAT_DEPTH,0,0,2,_wrap_CV_MAT_DEPTH_texinfo},
 {"CV_MAT_TYPE",_wrap_CV_MAT_TYPE,0,0,2,_wrap_CV_MAT_TYPE_texinfo},
 {"CV_IS_MAT_CONT",_wrap_CV_IS_MAT_CONT,0,0,2,_wrap_CV_IS_MAT_CONT_texinfo},
 {"CV_IS_TEMP_MAT",_wrap_CV_IS_TEMP_MAT,0,0,2,_wrap_CV_IS_TEMP_MAT_texinfo},
@@ -113743,17 +102749,17 @@ static const struct swig_octave_member swig_globals[] = {
 {"IplImage_widthStep_set",_wrap_IplImage_widthStep_set,0,0,2,0},
 {"IplImage_widthStep_get",_wrap_IplImage_widthStep_get,0,0,2,0},
 {"delete_IplImage",_wrap_delete_IplImage,0,0,2,_wrap_delete_IplImage_texinfo},
-{"IplImage___add",_wrap_IplImage___add,0,0,2,_wrap_IplImage___add_texinfo},
-{"IplImage___xor",_wrap_IplImage___xor,0,0,2,_wrap_IplImage___xor_texinfo},
-{"IplImage___sub",_wrap_IplImage___sub,0,0,2,_wrap_IplImage___sub_texinfo},
-{"IplImage___ge",_wrap_IplImage___ge,0,0,2,_wrap_IplImage___ge_texinfo},
-{"IplImage___eq",_wrap_IplImage___eq,0,0,2,_wrap_IplImage___eq_texinfo},
-{"IplImage___le",_wrap_IplImage___le,0,0,2,_wrap_IplImage___le_texinfo},
-{"IplImage___ne",_wrap_IplImage___ne,0,0,2,_wrap_IplImage___ne_texinfo},
-{"IplImage___lt",_wrap_IplImage___lt,0,0,2,_wrap_IplImage___lt_texinfo},
-{"IplImage___gt",_wrap_IplImage___gt,0,0,2,_wrap_IplImage___gt_texinfo},
-{"IplImage___mul",_wrap_IplImage___mul,0,0,2,_wrap_IplImage___mul_texinfo},
-{"IplImage___div",_wrap_IplImage___div,0,0,2,_wrap_IplImage___div_texinfo},
+{"IplImage___add__",_wrap_IplImage___add__,0,0,2,_wrap_IplImage___add___texinfo},
+{"IplImage___xor__",_wrap_IplImage___xor__,0,0,2,_wrap_IplImage___xor___texinfo},
+{"IplImage___sub__",_wrap_IplImage___sub__,0,0,2,_wrap_IplImage___sub___texinfo},
+{"IplImage___ge__",_wrap_IplImage___ge__,0,0,2,_wrap_IplImage___ge___texinfo},
+{"IplImage___eq__",_wrap_IplImage___eq__,0,0,2,_wrap_IplImage___eq___texinfo},
+{"IplImage___le__",_wrap_IplImage___le__,0,0,2,_wrap_IplImage___le___texinfo},
+{"IplImage___ne__",_wrap_IplImage___ne__,0,0,2,_wrap_IplImage___ne___texinfo},
+{"IplImage___lt__",_wrap_IplImage___lt__,0,0,2,_wrap_IplImage___lt___texinfo},
+{"IplImage___gt__",_wrap_IplImage___gt__,0,0,2,_wrap_IplImage___gt___texinfo},
+{"IplImage___mul__",_wrap_IplImage___mul__,0,0,2,_wrap_IplImage___mul___texinfo},
+{"IplImage___div__",_wrap_IplImage___div__,0,0,2,_wrap_IplImage___div___texinfo},
 {"IplImage___radd__",_wrap_IplImage___radd__,0,0,2,_wrap_IplImage___radd___texinfo},
 {"IplImage___rsub__",_wrap_IplImage___rsub__,0,0,2,_wrap_IplImage___rsub___texinfo},
 {"IplImage___rmul__",_wrap_IplImage___rmul__,0,0,2,_wrap_IplImage___rmul___texinfo},
@@ -113818,27 +102824,37 @@ static const struct swig_octave_member swig_globals[] = {
 {"CvMat_hdr_refcount_get",_wrap_CvMat_hdr_refcount_get,0,0,2,0},
 {"CvMat_data_get",_wrap_CvMat_data_get,0,0,2,0},
 {"delete_CvMat",_wrap_delete_CvMat,0,0,2,_wrap_delete_CvMat_texinfo},
+{"CvMat_depth_set",_wrap_CvMat_depth_set,0,0,2,0},
 {"CvMat_depth_get",_wrap_CvMat_depth_get,0,0,2,0},
+{"CvMat_nChannels_set",_wrap_CvMat_nChannels_set,0,0,2,0},
 {"CvMat_nChannels_get",_wrap_CvMat_nChannels_get,0,0,2,0},
+{"CvMat_dataOrder_set",_wrap_CvMat_dataOrder_set,0,0,2,0},
 {"CvMat_dataOrder_get",_wrap_CvMat_dataOrder_get,0,0,2,0},
+{"CvMat_origin_set",_wrap_CvMat_origin_set,0,0,2,0},
 {"CvMat_origin_get",_wrap_CvMat_origin_get,0,0,2,0},
+{"CvMat_width_set",_wrap_CvMat_width_set,0,0,2,0},
 {"CvMat_width_get",_wrap_CvMat_width_get,0,0,2,0},
+{"CvMat_height_set",_wrap_CvMat_height_set,0,0,2,0},
 {"CvMat_height_get",_wrap_CvMat_height_get,0,0,2,0},
+{"CvMat_imageSize_set",_wrap_CvMat_imageSize_set,0,0,2,0},
 {"CvMat_imageSize_get",_wrap_CvMat_imageSize_get,0,0,2,0},
+{"CvMat_widthStep_set",_wrap_CvMat_widthStep_set,0,0,2,0},
 {"CvMat_widthStep_get",_wrap_CvMat_widthStep_get,0,0,2,0},
+{"CvMat_rows_set",_wrap_CvMat_rows_set,0,0,2,0},
 {"CvMat_rows_get",_wrap_CvMat_rows_get,0,0,2,0},
+{"CvMat_cols_set",_wrap_CvMat_cols_set,0,0,2,0},
 {"CvMat_cols_get",_wrap_CvMat_cols_get,0,0,2,0},
-{"CvMat___add",_wrap_CvMat___add,0,0,2,_wrap_CvMat___add_texinfo},
-{"CvMat___xor",_wrap_CvMat___xor,0,0,2,_wrap_CvMat___xor_texinfo},
-{"CvMat___sub",_wrap_CvMat___sub,0,0,2,_wrap_CvMat___sub_texinfo},
-{"CvMat___ge",_wrap_CvMat___ge,0,0,2,_wrap_CvMat___ge_texinfo},
-{"CvMat___eq",_wrap_CvMat___eq,0,0,2,_wrap_CvMat___eq_texinfo},
-{"CvMat___le",_wrap_CvMat___le,0,0,2,_wrap_CvMat___le_texinfo},
-{"CvMat___ne",_wrap_CvMat___ne,0,0,2,_wrap_CvMat___ne_texinfo},
-{"CvMat___lt",_wrap_CvMat___lt,0,0,2,_wrap_CvMat___lt_texinfo},
-{"CvMat___gt",_wrap_CvMat___gt,0,0,2,_wrap_CvMat___gt_texinfo},
-{"CvMat___mul",_wrap_CvMat___mul,0,0,2,_wrap_CvMat___mul_texinfo},
-{"CvMat___div",_wrap_CvMat___div,0,0,2,_wrap_CvMat___div_texinfo},
+{"CvMat___add__",_wrap_CvMat___add__,0,0,2,_wrap_CvMat___add___texinfo},
+{"CvMat___xor__",_wrap_CvMat___xor__,0,0,2,_wrap_CvMat___xor___texinfo},
+{"CvMat___sub__",_wrap_CvMat___sub__,0,0,2,_wrap_CvMat___sub___texinfo},
+{"CvMat___ge__",_wrap_CvMat___ge__,0,0,2,_wrap_CvMat___ge___texinfo},
+{"CvMat___eq__",_wrap_CvMat___eq__,0,0,2,_wrap_CvMat___eq___texinfo},
+{"CvMat___le__",_wrap_CvMat___le__,0,0,2,_wrap_CvMat___le___texinfo},
+{"CvMat___ne__",_wrap_CvMat___ne__,0,0,2,_wrap_CvMat___ne___texinfo},
+{"CvMat___lt__",_wrap_CvMat___lt__,0,0,2,_wrap_CvMat___lt___texinfo},
+{"CvMat___gt__",_wrap_CvMat___gt__,0,0,2,_wrap_CvMat___gt___texinfo},
+{"CvMat___mul__",_wrap_CvMat___mul__,0,0,2,_wrap_CvMat___mul___texinfo},
+{"CvMat___div__",_wrap_CvMat___div__,0,0,2,_wrap_CvMat___div___texinfo},
 {"CvMat___radd__",_wrap_CvMat___radd__,0,0,2,_wrap_CvMat___radd___texinfo},
 {"CvMat___rsub__",_wrap_CvMat___rsub__,0,0,2,_wrap_CvMat___rsub___texinfo},
 {"CvMat___rmul__",_wrap_CvMat___rmul__,0,0,2,_wrap_CvMat___rmul___texinfo},
@@ -113873,7 +102889,7 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvMat",_wrap_cvMat,0,0,2,_wrap_cvMat_texinfo},
 {"cvmGet",_wrap_cvmGet,0,0,2,_wrap_cvmGet_texinfo},
 {"cvmSet",_wrap_cvmSet,0,0,2,_wrap_cvmSet_texinfo},
-{"cvCvToIplDepth",_wrap_cvCvToIplDepth,0,0,2,_wrap_cvCvToIplDepth_texinfo},
+{"cvIplDepth",_wrap_cvIplDepth,0,0,2,_wrap_cvIplDepth_texinfo},
 {"CvMatND_type_set",_wrap_CvMatND_type_set,0,0,2,0},
 {"CvMatND_type_get",_wrap_CvMatND_type_get,0,0,2,0},
 {"CvMatND_dims_set",_wrap_CvMatND_dims_set,0,0,2,0},
@@ -115215,6 +104231,7 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvRemap",_wrap_cvRemap,0,0,2,_wrap_cvRemap_texinfo},
 {"cvConvertMaps",_wrap_cvConvertMaps,0,0,2,_wrap_cvConvertMaps_texinfo},
 {"cvLogPolar",_wrap_cvLogPolar,0,0,2,_wrap_cvLogPolar_texinfo},
+{"cvLinearPolar",_wrap_cvLinearPolar,0,0,2,_wrap_cvLinearPolar_texinfo},
 {"cvCreateStructuringElementEx",_wrap_cvCreateStructuringElementEx,0,0,2,_wrap_cvCreateStructuringElementEx_texinfo},
 {"cvReleaseStructuringElement",_wrap_cvReleaseStructuringElement,0,0,2,_wrap_cvReleaseStructuringElement_texinfo},
 {"cvErode",_wrap_cvErode,0,0,2,_wrap_cvErode_texinfo},
@@ -115330,6 +104347,13 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvReleaseFeatureTree",_wrap_cvReleaseFeatureTree,0,0,2,_wrap_cvReleaseFeatureTree_texinfo},
 {"cvFindFeatures",_wrap_cvFindFeatures,0,0,2,_wrap_cvFindFeatures_texinfo},
 {"cvFindFeaturesBoxed",_wrap_cvFindFeaturesBoxed,0,0,2,_wrap_cvFindFeaturesBoxed_texinfo},
+{"cvCreateLSH",_wrap_cvCreateLSH,0,0,2,_wrap_cvCreateLSH_texinfo},
+{"cvCreateMemoryLSH",_wrap_cvCreateMemoryLSH,0,0,2,_wrap_cvCreateMemoryLSH_texinfo},
+{"cvReleaseLSH",_wrap_cvReleaseLSH,0,0,2,_wrap_cvReleaseLSH_texinfo},
+{"LSHSize",_wrap_LSHSize,0,0,2,_wrap_LSHSize_texinfo},
+{"cvLSHAdd",_wrap_cvLSHAdd,0,0,2,_wrap_cvLSHAdd_texinfo},
+{"cvLSHRemove",_wrap_cvLSHRemove,0,0,2,_wrap_cvLSHRemove_texinfo},
+{"cvLSHQuery",_wrap_cvLSHQuery,0,0,2,_wrap_cvLSHQuery_texinfo},
 {"CvSURFPoint_pt_set",_wrap_CvSURFPoint_pt_set,0,0,2,0},
 {"CvSURFPoint_pt_get",_wrap_CvSURFPoint_pt_get,0,0,2,0},
 {"CvSURFPoint_laplacian_set",_wrap_CvSURFPoint_laplacian_set,0,0,2,0},
@@ -115355,6 +104379,28 @@ static const struct swig_octave_member swig_globals[] = {
 {"delete_CvSURFParams",_wrap_delete_CvSURFParams,0,0,2,_wrap_delete_CvSURFParams_texinfo},
 {"cvSURFParams",_wrap_cvSURFParams,0,0,2,_wrap_cvSURFParams_texinfo},
 {"cvExtractSURF",_wrap_cvExtractSURF,0,0,2,_wrap_cvExtractSURF_texinfo},
+{"CvMSERParams_delta_set",_wrap_CvMSERParams_delta_set,0,0,2,0},
+{"CvMSERParams_delta_get",_wrap_CvMSERParams_delta_get,0,0,2,0},
+{"CvMSERParams_maxArea_set",_wrap_CvMSERParams_maxArea_set,0,0,2,0},
+{"CvMSERParams_maxArea_get",_wrap_CvMSERParams_maxArea_get,0,0,2,0},
+{"CvMSERParams_minArea_set",_wrap_CvMSERParams_minArea_set,0,0,2,0},
+{"CvMSERParams_minArea_get",_wrap_CvMSERParams_minArea_get,0,0,2,0},
+{"CvMSERParams_maxVariation_set",_wrap_CvMSERParams_maxVariation_set,0,0,2,0},
+{"CvMSERParams_maxVariation_get",_wrap_CvMSERParams_maxVariation_get,0,0,2,0},
+{"CvMSERParams_minDiversity_set",_wrap_CvMSERParams_minDiversity_set,0,0,2,0},
+{"CvMSERParams_minDiversity_get",_wrap_CvMSERParams_minDiversity_get,0,0,2,0},
+{"CvMSERParams_maxEvolution_set",_wrap_CvMSERParams_maxEvolution_set,0,0,2,0},
+{"CvMSERParams_maxEvolution_get",_wrap_CvMSERParams_maxEvolution_get,0,0,2,0},
+{"CvMSERParams_areaThreshold_set",_wrap_CvMSERParams_areaThreshold_set,0,0,2,0},
+{"CvMSERParams_areaThreshold_get",_wrap_CvMSERParams_areaThreshold_get,0,0,2,0},
+{"CvMSERParams_minMargin_set",_wrap_CvMSERParams_minMargin_set,0,0,2,0},
+{"CvMSERParams_minMargin_get",_wrap_CvMSERParams_minMargin_get,0,0,2,0},
+{"CvMSERParams_edgeBlurSize_set",_wrap_CvMSERParams_edgeBlurSize_set,0,0,2,0},
+{"CvMSERParams_edgeBlurSize_get",_wrap_CvMSERParams_edgeBlurSize_get,0,0,2,0},
+{"new_CvMSERParams",_wrap_new_CvMSERParams,0,0,2,_wrap_new_CvMSERParams_texinfo},
+{"delete_CvMSERParams",_wrap_delete_CvMSERParams,0,0,2,_wrap_delete_CvMSERParams_texinfo},
+{"cvMSERParams",_wrap_cvMSERParams,0,0,2,_wrap_cvMSERParams_texinfo},
+{"cvExtractMSER",_wrap_cvExtractMSER,0,0,2,_wrap_cvExtractMSER_texinfo},
 {"CvStarKeypoint_pt_set",_wrap_CvStarKeypoint_pt_set,0,0,2,0},
 {"CvStarKeypoint_pt_get",_wrap_CvStarKeypoint_pt_get,0,0,2,0},
 {"CvStarKeypoint_size_set",_wrap_CvStarKeypoint_size_set,0,0,2,0},
@@ -115409,6 +104455,8 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvConvertPointsHomogeneous",_wrap_cvConvertPointsHomogeneous,0,0,2,_wrap_cvConvertPointsHomogeneous_texinfo},
 {"cvFindFundamentalMat",_wrap_cvFindFundamentalMat,0,0,2,_wrap_cvFindFundamentalMat_texinfo},
 {"cvComputeCorrespondEpilines",_wrap_cvComputeCorrespondEpilines,0,0,2,_wrap_cvComputeCorrespondEpilines_texinfo},
+{"cvTriangulatePoints",_wrap_cvTriangulatePoints,0,0,2,_wrap_cvTriangulatePoints_texinfo},
+{"cvCorrectMatches",_wrap_cvCorrectMatches,0,0,2,_wrap_cvCorrectMatches_texinfo},
 {"CvStereoBMState_preFilterType_set",_wrap_CvStereoBMState_preFilterType_set,0,0,2,0},
 {"CvStereoBMState_preFilterType_get",_wrap_CvStereoBMState_preFilterType_get,0,0,2,0},
 {"CvStereoBMState_preFilterSize_set",_wrap_CvStereoBMState_preFilterSize_set,0,0,2,0},
@@ -115429,12 +104477,18 @@ static const struct swig_octave_member swig_globals[] = {
 {"CvStereoBMState_speckleWindowSize_get",_wrap_CvStereoBMState_speckleWindowSize_get,0,0,2,0},
 {"CvStereoBMState_speckleRange_set",_wrap_CvStereoBMState_speckleRange_set,0,0,2,0},
 {"CvStereoBMState_speckleRange_get",_wrap_CvStereoBMState_speckleRange_get,0,0,2,0},
+{"CvStereoBMState_trySmallerWindows_set",_wrap_CvStereoBMState_trySmallerWindows_set,0,0,2,0},
+{"CvStereoBMState_trySmallerWindows_get",_wrap_CvStereoBMState_trySmallerWindows_get,0,0,2,0},
 {"CvStereoBMState_preFilteredImg0_set",_wrap_CvStereoBMState_preFilteredImg0_set,0,0,2,0},
 {"CvStereoBMState_preFilteredImg0_get",_wrap_CvStereoBMState_preFilteredImg0_get,0,0,2,0},
 {"CvStereoBMState_preFilteredImg1_set",_wrap_CvStereoBMState_preFilteredImg1_set,0,0,2,0},
 {"CvStereoBMState_preFilteredImg1_get",_wrap_CvStereoBMState_preFilteredImg1_get,0,0,2,0},
 {"CvStereoBMState_slidingSumBuf_set",_wrap_CvStereoBMState_slidingSumBuf_set,0,0,2,0},
 {"CvStereoBMState_slidingSumBuf_get",_wrap_CvStereoBMState_slidingSumBuf_get,0,0,2,0},
+{"CvStereoBMState_dbmin_set",_wrap_CvStereoBMState_dbmin_set,0,0,2,0},
+{"CvStereoBMState_dbmin_get",_wrap_CvStereoBMState_dbmin_get,0,0,2,0},
+{"CvStereoBMState_dbmax_set",_wrap_CvStereoBMState_dbmax_set,0,0,2,0},
+{"CvStereoBMState_dbmax_get",_wrap_CvStereoBMState_dbmax_get,0,0,2,0},
 {"new_CvStereoBMState",_wrap_new_CvStereoBMState,0,0,2,_wrap_new_CvStereoBMState_texinfo},
 {"delete_CvStereoBMState",_wrap_delete_CvStereoBMState,0,0,2,_wrap_delete_CvStereoBMState_texinfo},
 {"cvCreateStereoBMState",_wrap_cvCreateStereoBMState,0,0,2,_wrap_cvCreateStereoBMState_texinfo},
@@ -115482,102 +104536,7 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvReleaseStereoGCState",_wrap_cvReleaseStereoGCState,0,0,2,_wrap_cvReleaseStereoGCState_texinfo},
 {"cvFindStereoCorrespondenceGC",_wrap_cvFindStereoCorrespondenceGC,0,0,2,_wrap_cvFindStereoCorrespondenceGC_texinfo},
 {"cvReprojectImageTo3D",_wrap_cvReprojectImageTo3D,0,0,2,_wrap_cvReprojectImageTo3D_texinfo},
-{"new_CvBaseImageFilter",_wrap_new_CvBaseImageFilter,0,0,2,_wrap_new_CvBaseImageFilter_texinfo},
-{"delete_CvBaseImageFilter",_wrap_delete_CvBaseImageFilter,0,0,2,_wrap_delete_CvBaseImageFilter_texinfo},
-{"CvBaseImageFilter_init",_wrap_CvBaseImageFilter_init,0,0,2,_wrap_CvBaseImageFilter_init_texinfo},
-{"CvBaseImageFilter_clear",_wrap_CvBaseImageFilter_clear,0,0,2,_wrap_CvBaseImageFilter_clear_texinfo},
-{"CvBaseImageFilter_process",_wrap_CvBaseImageFilter_process,0,0,2,_wrap_CvBaseImageFilter_process_texinfo},
-{"CvBaseImageFilter_get_src_type",_wrap_CvBaseImageFilter_get_src_type,0,0,2,_wrap_CvBaseImageFilter_get_src_type_texinfo},
-{"CvBaseImageFilter_get_dst_type",_wrap_CvBaseImageFilter_get_dst_type,0,0,2,_wrap_CvBaseImageFilter_get_dst_type_texinfo},
-{"CvBaseImageFilter_get_work_type",_wrap_CvBaseImageFilter_get_work_type,0,0,2,_wrap_CvBaseImageFilter_get_work_type_texinfo},
-{"CvBaseImageFilter_get_kernel_size",_wrap_CvBaseImageFilter_get_kernel_size,0,0,2,_wrap_CvBaseImageFilter_get_kernel_size_texinfo},
-{"CvBaseImageFilter_get_anchor",_wrap_CvBaseImageFilter_get_anchor,0,0,2,_wrap_CvBaseImageFilter_get_anchor_texinfo},
-{"CvBaseImageFilter_get_width",_wrap_CvBaseImageFilter_get_width,0,0,2,_wrap_CvBaseImageFilter_get_width_texinfo},
-{"CvBaseImageFilter_get_x_filter_func",_wrap_CvBaseImageFilter_get_x_filter_func,0,0,2,_wrap_CvBaseImageFilter_get_x_filter_func_texinfo},
-{"CvBaseImageFilter_get_y_filter_func",_wrap_CvBaseImageFilter_get_y_filter_func,0,0,2,_wrap_CvBaseImageFilter_get_y_filter_func_texinfo},
-{"new_CvSepFilter",_wrap_new_CvSepFilter,0,0,2,_wrap_new_CvSepFilter_texinfo},
-{"delete_CvSepFilter",_wrap_delete_CvSepFilter,0,0,2,_wrap_delete_CvSepFilter_texinfo},
-{"CvSepFilter_init_deriv",_wrap_CvSepFilter_init_deriv,0,0,2,_wrap_CvSepFilter_init_deriv_texinfo},
-{"CvSepFilter_init_gaussian",_wrap_CvSepFilter_init_gaussian,0,0,2,_wrap_CvSepFilter_init_gaussian_texinfo},
-{"CvSepFilter_init",_wrap_CvSepFilter_init,0,0,2,_wrap_CvSepFilter_init_texinfo},
-{"CvSepFilter_clear",_wrap_CvSepFilter_clear,0,0,2,_wrap_CvSepFilter_clear_texinfo},
-{"CvSepFilter_get_x_kernel",_wrap_CvSepFilter_get_x_kernel,0,0,2,_wrap_CvSepFilter_get_x_kernel_texinfo},
-{"CvSepFilter_get_y_kernel",_wrap_CvSepFilter_get_y_kernel,0,0,2,_wrap_CvSepFilter_get_y_kernel_texinfo},
-{"CvSepFilter_get_x_kernel_flags",_wrap_CvSepFilter_get_x_kernel_flags,0,0,2,_wrap_CvSepFilter_get_x_kernel_flags_texinfo},
-{"CvSepFilter_get_y_kernel_flags",_wrap_CvSepFilter_get_y_kernel_flags,0,0,2,_wrap_CvSepFilter_get_y_kernel_flags_texinfo},
-{"CvSepFilter_init_gaussian_kernel",_wrap_CvSepFilter_init_gaussian_kernel,0,0,2,_wrap_CvSepFilter_init_gaussian_kernel_texinfo},
-{"CvSepFilter_init_sobel_kernel",_wrap_CvSepFilter_init_sobel_kernel,0,0,2,_wrap_CvSepFilter_init_sobel_kernel_texinfo},
-{"CvSepFilter_init_scharr_kernel",_wrap_CvSepFilter_init_scharr_kernel,0,0,2,_wrap_CvSepFilter_init_scharr_kernel_texinfo},
-{"new_CvLinearFilter",_wrap_new_CvLinearFilter,0,0,2,_wrap_new_CvLinearFilter_texinfo},
-{"delete_CvLinearFilter",_wrap_delete_CvLinearFilter,0,0,2,_wrap_delete_CvLinearFilter_texinfo},
-{"CvLinearFilter_init",_wrap_CvLinearFilter_init,0,0,2,_wrap_CvLinearFilter_init_texinfo},
-{"CvLinearFilter_clear",_wrap_CvLinearFilter_clear,0,0,2,_wrap_CvLinearFilter_clear_texinfo},
-{"CvLinearFilter_get_kernel",_wrap_CvLinearFilter_get_kernel,0,0,2,_wrap_CvLinearFilter_get_kernel_texinfo},
-{"CvLinearFilter_get_kernel_sparse_buf",_wrap_CvLinearFilter_get_kernel_sparse_buf,0,0,2,_wrap_CvLinearFilter_get_kernel_sparse_buf_texinfo},
-{"CvLinearFilter_get_kernel_sparse_count",_wrap_CvLinearFilter_get_kernel_sparse_count,0,0,2,_wrap_CvLinearFilter_get_kernel_sparse_count_texinfo},
-{"new_CvBoxFilter",_wrap_new_CvBoxFilter,0,0,2,_wrap_new_CvBoxFilter_texinfo},
-{"CvBoxFilter_init",_wrap_CvBoxFilter_init,0,0,2,_wrap_CvBoxFilter_init_texinfo},
-{"delete_CvBoxFilter",_wrap_delete_CvBoxFilter,0,0,2,_wrap_delete_CvBoxFilter_texinfo},
-{"CvBoxFilter_is_normalized",_wrap_CvBoxFilter_is_normalized,0,0,2,_wrap_CvBoxFilter_is_normalized_texinfo},
-{"CvBoxFilter_get_scale",_wrap_CvBoxFilter_get_scale,0,0,2,_wrap_CvBoxFilter_get_scale_texinfo},
-{"CvBoxFilter_get_sum_buf",_wrap_CvBoxFilter_get_sum_buf,0,0,2,_wrap_CvBoxFilter_get_sum_buf_texinfo},
-{"CvBoxFilter_get_sum_count_ptr",_wrap_CvBoxFilter_get_sum_count_ptr,0,0,2,_wrap_CvBoxFilter_get_sum_count_ptr_texinfo},
-{"new_CvLaplaceFilter",_wrap_new_CvLaplaceFilter,0,0,2,_wrap_new_CvLaplaceFilter_texinfo},
-{"delete_CvLaplaceFilter",_wrap_delete_CvLaplaceFilter,0,0,2,_wrap_delete_CvLaplaceFilter_texinfo},
-{"CvLaplaceFilter_init",_wrap_CvLaplaceFilter_init,0,0,2,_wrap_CvLaplaceFilter_init_texinfo},
-{"CvLaplaceFilter_is_normalized",_wrap_CvLaplaceFilter_is_normalized,0,0,2,_wrap_CvLaplaceFilter_is_normalized_texinfo},
-{"CvLaplaceFilter_is_basic_laplacian",_wrap_CvLaplaceFilter_is_basic_laplacian,0,0,2,_wrap_CvLaplaceFilter_is_basic_laplacian_texinfo},
-{"new_CvMorphology",_wrap_new_CvMorphology,0,0,2,_wrap_new_CvMorphology_texinfo},
-{"delete_CvMorphology",_wrap_delete_CvMorphology,0,0,2,_wrap_delete_CvMorphology_texinfo},
-{"CvMorphology_init",_wrap_CvMorphology_init,0,0,2,_wrap_CvMorphology_init_texinfo},
-{"CvMorphology_clear",_wrap_CvMorphology_clear,0,0,2,_wrap_CvMorphology_clear_texinfo},
-{"CvMorphology_get_element",_wrap_CvMorphology_get_element,0,0,2,_wrap_CvMorphology_get_element_texinfo},
-{"CvMorphology_get_element_shape",_wrap_CvMorphology_get_element_shape,0,0,2,_wrap_CvMorphology_get_element_shape_texinfo},
-{"CvMorphology_get_operation",_wrap_CvMorphology_get_operation,0,0,2,_wrap_CvMorphology_get_operation_texinfo},
-{"CvMorphology_get_element_sparse_buf",_wrap_CvMorphology_get_element_sparse_buf,0,0,2,_wrap_CvMorphology_get_element_sparse_buf_texinfo},
-{"CvMorphology_get_element_sparse_count",_wrap_CvMorphology_get_element_sparse_count,0,0,2,_wrap_CvMorphology_get_element_sparse_count_texinfo},
-{"CvMorphology_init_binary_element",_wrap_CvMorphology_init_binary_element,0,0,2,_wrap_CvMorphology_init_binary_element_texinfo},
-{"new_CvLevMarq",_wrap_new_CvLevMarq,0,0,2,_wrap_new_CvLevMarq_texinfo},
-{"delete_CvLevMarq",_wrap_delete_CvLevMarq,0,0,2,_wrap_delete_CvLevMarq_texinfo},
-{"CvLevMarq_init",_wrap_CvLevMarq_init,0,0,2,_wrap_CvLevMarq_init_texinfo},
-{"CvLevMarq_update",_wrap_CvLevMarq_update,0,0,2,_wrap_CvLevMarq_update_texinfo},
-{"CvLevMarq_updateAlt",_wrap_CvLevMarq_updateAlt,0,0,2,_wrap_CvLevMarq_updateAlt_texinfo},
-{"CvLevMarq_clear",_wrap_CvLevMarq_clear,0,0,2,_wrap_CvLevMarq_clear_texinfo},
-{"CvLevMarq_step",_wrap_CvLevMarq_step,0,0,2,_wrap_CvLevMarq_step_texinfo},
-{"CvLevMarq_mask_set",_wrap_CvLevMarq_mask_set,0,0,2,0},
-{"CvLevMarq_mask_get",_wrap_CvLevMarq_mask_get,0,0,2,0},
-{"CvLevMarq_prevParam_set",_wrap_CvLevMarq_prevParam_set,0,0,2,0},
-{"CvLevMarq_prevParam_get",_wrap_CvLevMarq_prevParam_get,0,0,2,0},
-{"CvLevMarq_param_set",_wrap_CvLevMarq_param_set,0,0,2,0},
-{"CvLevMarq_param_get",_wrap_CvLevMarq_param_get,0,0,2,0},
-{"CvLevMarq_J_set",_wrap_CvLevMarq_J_set,0,0,2,0},
-{"CvLevMarq_J_get",_wrap_CvLevMarq_J_get,0,0,2,0},
-{"CvLevMarq_err_set",_wrap_CvLevMarq_err_set,0,0,2,0},
-{"CvLevMarq_err_get",_wrap_CvLevMarq_err_get,0,0,2,0},
-{"CvLevMarq_JtJ_set",_wrap_CvLevMarq_JtJ_set,0,0,2,0},
-{"CvLevMarq_JtJ_get",_wrap_CvLevMarq_JtJ_get,0,0,2,0},
-{"CvLevMarq_JtJN_set",_wrap_CvLevMarq_JtJN_set,0,0,2,0},
-{"CvLevMarq_JtJN_get",_wrap_CvLevMarq_JtJN_get,0,0,2,0},
-{"CvLevMarq_JtErr_set",_wrap_CvLevMarq_JtErr_set,0,0,2,0},
-{"CvLevMarq_JtErr_get",_wrap_CvLevMarq_JtErr_get,0,0,2,0},
-{"CvLevMarq_JtJV_set",_wrap_CvLevMarq_JtJV_set,0,0,2,0},
-{"CvLevMarq_JtJV_get",_wrap_CvLevMarq_JtJV_get,0,0,2,0},
-{"CvLevMarq_JtJW_set",_wrap_CvLevMarq_JtJW_set,0,0,2,0},
-{"CvLevMarq_JtJW_get",_wrap_CvLevMarq_JtJW_get,0,0,2,0},
-{"CvLevMarq_prevErrNorm_set",_wrap_CvLevMarq_prevErrNorm_set,0,0,2,0},
-{"CvLevMarq_prevErrNorm_get",_wrap_CvLevMarq_prevErrNorm_get,0,0,2,0},
-{"CvLevMarq_errNorm_set",_wrap_CvLevMarq_errNorm_set,0,0,2,0},
-{"CvLevMarq_errNorm_get",_wrap_CvLevMarq_errNorm_get,0,0,2,0},
-{"CvLevMarq_lambdaLg10_set",_wrap_CvLevMarq_lambdaLg10_set,0,0,2,0},
-{"CvLevMarq_lambdaLg10_get",_wrap_CvLevMarq_lambdaLg10_get,0,0,2,0},
-{"CvLevMarq_criteria_set",_wrap_CvLevMarq_criteria_set,0,0,2,0},
-{"CvLevMarq_criteria_get",_wrap_CvLevMarq_criteria_get,0,0,2,0},
-{"CvLevMarq_state_set",_wrap_CvLevMarq_state_set,0,0,2,0},
-{"CvLevMarq_state_get",_wrap_CvLevMarq_state_get,0,0,2,0},
-{"CvLevMarq_iters_set",_wrap_CvLevMarq_iters_set,0,0,2,0},
-{"CvLevMarq_iters_get",_wrap_CvLevMarq_iters_get,0,0,2,0},
-{"CvLevMarq_completeSymmFlag_set",_wrap_CvLevMarq_completeSymmFlag_set,0,0,2,0},
-{"CvLevMarq_completeSymmFlag_get",_wrap_CvLevMarq_completeSymmFlag_get,0,0,2,0},
+{"delete_CvLSH",_wrap_delete_CvLSH,0,0,2,_wrap_delete_CvLSH_texinfo},
 {"CvTuple_CvPoint_2_val_set",_wrap_CvTuple_CvPoint_2_val_set,0,0,2,0},
 {"CvTuple_CvPoint_2_val_get",_wrap_CvTuple_CvPoint_2_val_get,0,0,2,0},
 {"CvTuple_CvPoint_2___paren",_wrap_CvTuple_CvPoint_2___paren,0,0,2,_wrap_CvTuple_CvPoint_2___paren_texinfo},
@@ -115688,9 +104647,6 @@ static const struct swig_octave_member swig_globals[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_CvLaplaceFilterTo_p_CvSepFilter(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((CvSepFilter *)  ((CvLaplaceFilter *) x));
-}
 static void *_p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvSeq **)  ((CvTypedSeq< CvTuple< CvPoint,2 > > **) x));
 }
@@ -115745,28 +104701,11 @@ static void *_p_CvTypedSeqT_CvQuadEdge2D_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPAR
 static void *_p_CvTypedSeqT_CvPoint2D32f_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvSeq *)  ((CvTypedSeq< CvPoint2D32f > *) x));
 }
-static void *_p_CvMorphologyTo_p_CvBaseImageFilter(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((CvBaseImageFilter *)  ((CvMorphology *) x));
-}
-static void *_p_CvSepFilterTo_p_CvBaseImageFilter(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((CvBaseImageFilter *)  ((CvSepFilter *) x));
-}
-static void *_p_CvLinearFilterTo_p_CvBaseImageFilter(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((CvBaseImageFilter *)  ((CvLinearFilter *) x));
-}
-static void *_p_CvBoxFilterTo_p_CvBaseImageFilter(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((CvBaseImageFilter *)  ((CvBoxFilter *) x));
-}
-static void *_p_CvLaplaceFilterTo_p_CvBaseImageFilter(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((CvBaseImageFilter *) (CvSepFilter *) ((CvLaplaceFilter *) x));
-}
 static swig_type_info _swigt__p_Cv32suf = {"_p_Cv32suf", "Cv32suf *", 0, 0, (void*)&_wrap_class_Cv32suf, 0};
 static swig_type_info _swigt__p_Cv64suf = {"_p_Cv64suf", "Cv64suf *", 0, 0, (void*)&_wrap_class_Cv64suf, 0};
 static swig_type_info _swigt__p_CvAttrList = {"_p_CvAttrList", "CvAttrList *", 0, 0, (void*)&_wrap_class_CvAttrList, 0};
 static swig_type_info _swigt__p_CvAvgComp = {"_p_CvAvgComp", "CvAvgComp *", 0, 0, (void*)&_wrap_class_CvAvgComp, 0};
-static swig_type_info _swigt__p_CvBaseImageFilter = {"_p_CvBaseImageFilter", "CvBaseImageFilter *", 0, 0, (void*)&_wrap_class_CvBaseImageFilter, 0};
 static swig_type_info _swigt__p_CvBox2D = {"_p_CvBox2D", "CvBox2D *", 0, 0, (void*)&_wrap_class_CvBox2D, 0};
-static swig_type_info _swigt__p_CvBoxFilter = {"_p_CvBoxFilter", "CvBoxFilter *", 0, 0, (void*)&_wrap_class_CvBoxFilter, 0};
 static swig_type_info _swigt__p_CvChain = {"_p_CvChain", "CvChain *", 0, 0, (void*)&_wrap_class_CvChain, 0};
 static swig_type_info _swigt__p_CvChainPtReader = {"_p_CvChainPtReader", "CvChainPtReader *", 0, 0, (void*)&_wrap_class_CvChainPtReader, 0};
 static swig_type_info _swigt__p_CvConDensation = {"_p_CvConDensation", "CvConDensation *", 0, 0, (void*)&_wrap_class_CvConDensation, 0};
@@ -115796,10 +104735,10 @@ static swig_type_info _swigt__p_CvHistogram = {"_p_CvHistogram", "CvHistogram *"
 static swig_type_info _swigt__p_CvHuMoments = {"_p_CvHuMoments", "CvHuMoments *", 0, 0, (void*)&_wrap_class_CvHuMoments, 0};
 static swig_type_info _swigt__p_CvImage = {"_p_CvImage", "CvImage *", 0, 0, (void*)&_wrap_class_CvImage, 0};
 static swig_type_info _swigt__p_CvKalman = {"_p_CvKalman", "CvKalman *", 0, 0, (void*)&_wrap_class_CvKalman, 0};
-static swig_type_info _swigt__p_CvLaplaceFilter = {"_p_CvLaplaceFilter", "CvLaplaceFilter *", 0, 0, (void*)&_wrap_class_CvLaplaceFilter, 0};
-static swig_type_info _swigt__p_CvLevMarq = {"_p_CvLevMarq", "CvLevMarq *", 0, 0, (void*)&_wrap_class_CvLevMarq, 0};
+static swig_type_info _swigt__p_CvLSH = {"_p_CvLSH", "CvLSH *", 0, 0, (void*)&_wrap_class_CvLSH, 0};
+static swig_type_info _swigt__p_CvLSHOperations = {"_p_CvLSHOperations", "CvLSHOperations *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvLineIterator = {"_p_CvLineIterator", "CvLineIterator *", 0, 0, (void*)&_wrap_class_CvLineIterator, 0};
-static swig_type_info _swigt__p_CvLinearFilter = {"_p_CvLinearFilter", "CvLinearFilter *", 0, 0, (void*)&_wrap_class_CvLinearFilter, 0};
+static swig_type_info _swigt__p_CvMSERParams = {"_p_CvMSERParams", "CvMSERParams *", 0, 0, (void*)&_wrap_class_CvMSERParams, 0};
 static swig_type_info _swigt__p_CvMat = {"_p_CvMat", "CvMat *", 0, 0, (void*)&_wrap_class_CvMat, 0};
 static swig_type_info _swigt__p_CvMatND = {"_p_CvMatND", "CvMatND *", 0, 0, (void*)&_wrap_class_CvMatND, 0};
 static swig_type_info _swigt__p_CvMatND_data = {"_p_CvMatND_data", "CvMatND_data *", 0, 0, (void*)&_wrap_class_CvMatND_data, 0};
@@ -115813,7 +104752,6 @@ static swig_type_info _swigt__p_CvMemStoragePos = {"_p_CvMemStoragePos", "CvMemS
 static swig_type_info _swigt__p_CvModule = {"_p_CvModule", "CvModule *", 0, 0, (void*)&_wrap_class_CvModule, 0};
 static swig_type_info _swigt__p_CvModuleInfo = {"_p_CvModuleInfo", "CvModuleInfo *", 0, 0, (void*)&_wrap_class_CvModuleInfo, 0};
 static swig_type_info _swigt__p_CvMoments = {"_p_CvMoments", "CvMoments *", 0, 0, (void*)&_wrap_class_CvMoments, 0};
-static swig_type_info _swigt__p_CvMorphology = {"_p_CvMorphology", "CvMorphology *", 0, 0, (void*)&_wrap_class_CvMorphology, 0};
 static swig_type_info _swigt__p_CvNArrayIterator = {"_p_CvNArrayIterator", "CvNArrayIterator *", 0, 0, (void*)&_wrap_class_CvNArrayIterator, 0};
 static swig_type_info _swigt__p_CvNextEdgeType = {"_p_CvNextEdgeType", "enum CvNextEdgeType *|CvNextEdgeType *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvPOSITObject = {"_p_CvPOSITObject", "CvPOSITObject *", 0, 0, (void*)0, 0};
@@ -115830,7 +104768,6 @@ static swig_type_info _swigt__p_CvRect = {"_p_CvRect", "CvRect *", 0, 0, (void*)
 static swig_type_info _swigt__p_CvSURFParams = {"_p_CvSURFParams", "CvSURFParams *", 0, 0, (void*)&_wrap_class_CvSURFParams, 0};
 static swig_type_info _swigt__p_CvSURFPoint = {"_p_CvSURFPoint", "CvSURFPoint *", 0, 0, (void*)&_wrap_class_CvSURFPoint, 0};
 static swig_type_info _swigt__p_CvScalar = {"_p_CvScalar", "CvScalar *", 0, 0, (void*)&_wrap_class_CvScalar, 0};
-static swig_type_info _swigt__p_CvSepFilter = {"_p_CvSepFilter", "CvSepFilter *", 0, 0, (void*)&_wrap_class_CvSepFilter, 0};
 static swig_type_info _swigt__p_CvSeq = {"_p_CvSeq", "CvSeq *", 0, 0, (void*)&_wrap_class_CvSeq, 0};
 static swig_type_info _swigt__p_CvSeqBlock = {"_p_CvSeqBlock", "CvSeqBlock *", 0, 0, (void*)&_wrap_class_CvSeqBlock, 0};
 static swig_type_info _swigt__p_CvSeqReader = {"_p_CvSeqReader", "CvSeqReader *", 0, 0, (void*)&_wrap_class_CvSeqReader, 0};
@@ -115889,15 +104826,13 @@ static swig_type_info _swigt__p_f_p_CvFileStorage_p_CvFileNode__p_void = {"_p_f_
 static swig_type_info _swigt__p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void = {"_p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void", "void (*)(CvFileStorage *,char const *,void const *,CvAttrList)|CvWriteFunc", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p__IplImage_int__void = {"_p_f_p__IplImage_int__void", "Cv_iplDeallocate|void (*)(_IplImage *,int)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p__IplImage_int_int__void = {"_p_f_p__IplImage_int_int__void", "Cv_iplAllocateImageData|void (*)(_IplImage *,int,int)", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_p_unsigned_char_p_unsigned_char_int_int_p_void__void = {"_p_f_p_p_unsigned_char_p_unsigned_char_int_int_p_void__void", "void (*)(unsigned char **,unsigned char *,int,int,void *)|CvColumnFilterFunc", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_void__void = {"_p_f_p_p_void__void", "void (*)(void **)|CvReleaseFunc", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__IplImage__p__IplImage = {"_p_f_p_q_const__IplImage__p__IplImage", "_IplImage *(*)(IplImage const *)|Cv_iplCloneImage", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_int__p_CvMat = {"_p_f_p_q_const__char_int__p_CvMat", "CvMat *(*)(char const *,int)|CvLoadImageMFunc", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_int__p__IplImage = {"_p_f_p_q_const__char_int__p__IplImage", "CvLoadImageFunc|_IplImage *(*)(char const *,int)", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__void__int = {"_p_f_p_q_const__char_p_q_const__void__int", "CvSaveImageFunc|int (*)(char const *,void const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__void__void = {"_p_f_p_q_const__char_p_q_const__void__void", "CvShowImageFunc|void (*)(char const *,void const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__void_p_q_const__int__int = {"_p_f_p_q_const__char_p_q_const__void_p_q_const__int__int", "CvSaveImageFunc|int (*)(char const *,void const *,int const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__float_p_q_const__float_p_void__float = {"_p_f_p_q_const__float_p_q_const__float_p_void__float", "CvDistanceFunction|float (*)(float const *,float const *,void *)", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__unsigned_char_p_unsigned_char_p_void__void = {"_p_f_p_q_const__unsigned_char_p_unsigned_char_p_void__void", "CvRowFilterFunc|void (*)(unsigned char const *,unsigned char *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__void__int = {"_p_f_p_q_const__void__int", "CvIsInstanceFunc|int (*)(void const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__void__p_void = {"_p_f_p_q_const__void__p_void", "CvCloneFunc|void *(*)(void const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__void_p_q_const__void_p_void__int = {"_p_f_p_q_const__void_p_q_const__void_p_void__int", "CvCmpFunc|int (*)(void const *,void const *,void *)", 0, 0, (void*)0, 0};
@@ -115914,6 +104849,7 @@ static swig_type_info _swigt__p_p_CvGraphVtx = {"_p_p_CvGraphVtx", "CvGraphVtx *
 static swig_type_info _swigt__p_p_CvHaarClassifierCascade = {"_p_p_CvHaarClassifierCascade", "CvHaarClassifierCascade **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvHistogram = {"_p_p_CvHistogram", "CvHistogram **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvKalman = {"_p_p_CvKalman", "CvKalman **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_CvLSH = {"_p_p_CvLSH", "CvLSH **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvMat = {"_p_p_CvMat", "CvMat **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvMatND = {"_p_p_CvMatND", "CvMatND **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvMemStorage = {"_p_p_CvMemStorage", "CvMemStorage **", 0, 0, (void*)0, 0};
@@ -115939,7 +104875,6 @@ static swig_type_info _swigt__p_p__CvContourScanner = {"_p_p__CvContourScanner",
 static swig_type_info _swigt__p_p__IplConvKernel = {"_p_p__IplConvKernel", "_IplConvKernel **|IplConvKernel **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p__IplImage = {"_p_p__IplImage", "_IplImage **|IplImage **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_double = {"_p_p_double", "double **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_float = {"_p_p_float", "float **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_p_CvMat = {"_p_p_p_CvMat", "CvMat ***", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_unsigned_char = {"_p_p_unsigned_char", "unsigned char **|uchar **", 0, 0, (void*)0, 0};
@@ -115966,9 +104901,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_Cv64suf,
   &_swigt__p_CvAttrList,
   &_swigt__p_CvAvgComp,
-  &_swigt__p_CvBaseImageFilter,
   &_swigt__p_CvBox2D,
-  &_swigt__p_CvBoxFilter,
   &_swigt__p_CvChain,
   &_swigt__p_CvChainPtReader,
   &_swigt__p_CvConDensation,
@@ -115998,10 +104931,10 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvHuMoments,
   &_swigt__p_CvImage,
   &_swigt__p_CvKalman,
-  &_swigt__p_CvLaplaceFilter,
-  &_swigt__p_CvLevMarq,
+  &_swigt__p_CvLSH,
+  &_swigt__p_CvLSHOperations,
   &_swigt__p_CvLineIterator,
-  &_swigt__p_CvLinearFilter,
+  &_swigt__p_CvMSERParams,
   &_swigt__p_CvMat,
   &_swigt__p_CvMatND,
   &_swigt__p_CvMatND_data,
@@ -116015,7 +104948,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvModule,
   &_swigt__p_CvModuleInfo,
   &_swigt__p_CvMoments,
-  &_swigt__p_CvMorphology,
   &_swigt__p_CvNArrayIterator,
   &_swigt__p_CvNextEdgeType,
   &_swigt__p_CvPOSITObject,
@@ -116032,7 +104964,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvSURFParams,
   &_swigt__p_CvSURFPoint,
   &_swigt__p_CvScalar,
-  &_swigt__p_CvSepFilter,
   &_swigt__p_CvSeq,
   &_swigt__p_CvSeqBlock,
   &_swigt__p_CvSeqReader,
@@ -116091,15 +105022,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void,
   &_swigt__p_f_p__IplImage_int__void,
   &_swigt__p_f_p__IplImage_int_int__void,
-  &_swigt__p_f_p_p_unsigned_char_p_unsigned_char_int_int_p_void__void,
   &_swigt__p_f_p_p_void__void,
   &_swigt__p_f_p_q_const__IplImage__p__IplImage,
   &_swigt__p_f_p_q_const__char_int__p_CvMat,
   &_swigt__p_f_p_q_const__char_int__p__IplImage,
-  &_swigt__p_f_p_q_const__char_p_q_const__void__int,
   &_swigt__p_f_p_q_const__char_p_q_const__void__void,
+  &_swigt__p_f_p_q_const__char_p_q_const__void_p_q_const__int__int,
   &_swigt__p_f_p_q_const__float_p_q_const__float_p_void__float,
-  &_swigt__p_f_p_q_const__unsigned_char_p_unsigned_char_p_void__void,
   &_swigt__p_f_p_q_const__void__int,
   &_swigt__p_f_p_q_const__void__p_void,
   &_swigt__p_f_p_q_const__void_p_q_const__void_p_void__int,
@@ -116116,6 +105045,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_CvHaarClassifierCascade,
   &_swigt__p_p_CvHistogram,
   &_swigt__p_p_CvKalman,
+  &_swigt__p_p_CvLSH,
   &_swigt__p_p_CvMat,
   &_swigt__p_p_CvMatND,
   &_swigt__p_p_CvMemStorage,
@@ -116141,7 +105071,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p__IplConvKernel,
   &_swigt__p_p__IplImage,
   &_swigt__p_p_char,
-  &_swigt__p_p_double,
   &_swigt__p_p_float,
   &_swigt__p_p_p_CvMat,
   &_swigt__p_p_unsigned_char,
@@ -116168,9 +105097,7 @@ static swig_cast_info _swigc__p_Cv32suf[] = {  {&_swigt__p_Cv32suf, 0, 0, 0},{0,
 static swig_cast_info _swigc__p_Cv64suf[] = {  {&_swigt__p_Cv64suf, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvAttrList[] = {  {&_swigt__p_CvAttrList, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvAvgComp[] = {  {&_swigt__p_CvAvgComp, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvBaseImageFilter[] = {  {&_swigt__p_CvMorphology, _p_CvMorphologyTo_p_CvBaseImageFilter, 0, 0},  {&_swigt__p_CvSepFilter, _p_CvSepFilterTo_p_CvBaseImageFilter, 0, 0},  {&_swigt__p_CvLinearFilter, _p_CvLinearFilterTo_p_CvBaseImageFilter, 0, 0},  {&_swigt__p_CvBoxFilter, _p_CvBoxFilterTo_p_CvBaseImageFilter, 0, 0},  {&_swigt__p_CvBaseImageFilter, 0, 0, 0},  {&_swigt__p_CvLaplaceFilter, _p_CvLaplaceFilterTo_p_CvBaseImageFilter, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvBox2D[] = {  {&_swigt__p_CvBox2D, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvBoxFilter[] = {  {&_swigt__p_CvBoxFilter, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvChain[] = {  {&_swigt__p_CvChain, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvChainPtReader[] = {  {&_swigt__p_CvChainPtReader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvConDensation[] = {  {&_swigt__p_CvConDensation, 0, 0, 0},{0, 0, 0, 0}};
@@ -116200,10 +105127,10 @@ static swig_cast_info _swigc__p_CvHistogram[] = {  {&_swigt__p_CvHistogram, 0, 0
 static swig_cast_info _swigc__p_CvHuMoments[] = {  {&_swigt__p_CvHuMoments, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvImage[] = {  {&_swigt__p_CvImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvKalman[] = {  {&_swigt__p_CvKalman, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvLaplaceFilter[] = {  {&_swigt__p_CvLaplaceFilter, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvLevMarq[] = {  {&_swigt__p_CvLevMarq, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvLSH[] = {  {&_swigt__p_CvLSH, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvLSHOperations[] = {  {&_swigt__p_CvLSHOperations, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvLineIterator[] = {  {&_swigt__p_CvLineIterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvLinearFilter[] = {  {&_swigt__p_CvLinearFilter, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvMSERParams[] = {  {&_swigt__p_CvMSERParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMat[] = {  {&_swigt__p_CvMat, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMatND[] = {  {&_swigt__p_CvMatND, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMatND_data[] = {  {&_swigt__p_CvMatND_data, 0, 0, 0},{0, 0, 0, 0}};
@@ -116217,7 +105144,6 @@ static swig_cast_info _swigc__p_CvMemStoragePos[] = {  {&_swigt__p_CvMemStorageP
 static swig_cast_info _swigc__p_CvModule[] = {  {&_swigt__p_CvModule, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvModuleInfo[] = {  {&_swigt__p_CvModuleInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMoments[] = {  {&_swigt__p_CvMoments, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvMorphology[] = {  {&_swigt__p_CvMorphology, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvNArrayIterator[] = {  {&_swigt__p_CvNArrayIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvNextEdgeType[] = {  {&_swigt__p_CvNextEdgeType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPOSITObject[] = {  {&_swigt__p_CvPOSITObject, 0, 0, 0},{0, 0, 0, 0}};
@@ -116234,7 +105160,6 @@ static swig_cast_info _swigc__p_CvRect[] = {  {&_swigt__p_CvRect, 0, 0, 0},{0, 0
 static swig_cast_info _swigc__p_CvSURFParams[] = {  {&_swigt__p_CvSURFParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSURFPoint[] = {  {&_swigt__p_CvSURFPoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvScalar[] = {  {&_swigt__p_CvScalar, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvSepFilter[] = {  {&_swigt__p_CvSepFilter, 0, 0, 0},  {&_swigt__p_CvLaplaceFilter, _p_CvLaplaceFilterTo_p_CvSepFilter, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeq[] = {  {&_swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, _p_CvTypedSeqT_CvTupleT_CvPoint_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t, _p_CvTypedSeqT_CvTupleT_float_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvRect_t, _p_CvTypedSeqT_CvRect_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvPoint_t, _p_CvTypedSeqT_CvPoint_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvQuadEdge2D_t, _p_CvTypedSeqT_CvQuadEdge2D_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvSeq_p_t, _p_CvTypedSeqT_CvSeq_p_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvPoint2D32f_t, _p_CvTypedSeqT_CvPoint2D32f_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvSeq, 0, 0, 0},  {&_swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t, _p_CvTypedSeqT_CvTupleT_float_3_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvConnectedComp_t, _p_CvTypedSeqT_CvConnectedComp_tTo_p_CvSeq, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeqBlock[] = {  {&_swigt__p_CvSeqBlock, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeqReader[] = {  {&_swigt__p_CvSeqReader, 0, 0, 0},{0, 0, 0, 0}};
@@ -116293,15 +105218,13 @@ static swig_cast_info _swigc__p_f_p_CvFileStorage_p_CvFileNode__p_void[] = {  {&
 static swig_cast_info _swigc__p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void[] = {  {&_swigt__p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p__IplImage_int__void[] = {  {&_swigt__p_f_p__IplImage_int__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p__IplImage_int_int__void[] = {  {&_swigt__p_f_p__IplImage_int_int__void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_p_unsigned_char_p_unsigned_char_int_int_p_void__void[] = {  {&_swigt__p_f_p_p_unsigned_char_p_unsigned_char_int_int_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_void__void[] = {  {&_swigt__p_f_p_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__IplImage__p__IplImage[] = {  {&_swigt__p_f_p_q_const__IplImage__p__IplImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_int__p_CvMat[] = {  {&_swigt__p_f_p_q_const__char_int__p_CvMat, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_int__p__IplImage[] = {  {&_swigt__p_f_p_q_const__char_int__p__IplImage, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__void__int[] = {  {&_swigt__p_f_p_q_const__char_p_q_const__void__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__void__void[] = {  {&_swigt__p_f_p_q_const__char_p_q_const__void__void, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__void_p_q_const__int__int[] = {  {&_swigt__p_f_p_q_const__char_p_q_const__void_p_q_const__int__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__float_p_q_const__float_p_void__float[] = {  {&_swigt__p_f_p_q_const__float_p_q_const__float_p_void__float, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_q_const__unsigned_char_p_unsigned_char_p_void__void[] = {  {&_swigt__p_f_p_q_const__unsigned_char_p_unsigned_char_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__void__int[] = {  {&_swigt__p_f_p_q_const__void__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__void__p_void[] = {  {&_swigt__p_f_p_q_const__void__p_void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__void_p_q_const__void_p_void__int[] = {  {&_swigt__p_f_p_q_const__void_p_q_const__void_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
@@ -116318,6 +105241,7 @@ static swig_cast_info _swigc__p_p_CvGraphVtx[] = {  {&_swigt__p_p_CvGraphVtx, 0,
 static swig_cast_info _swigc__p_p_CvHaarClassifierCascade[] = {  {&_swigt__p_p_CvHaarClassifierCascade, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvHistogram[] = {  {&_swigt__p_p_CvHistogram, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvKalman[] = {  {&_swigt__p_p_CvKalman, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvLSH[] = {  {&_swigt__p_p_CvLSH, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvMat[] = {  {&_swigt__p_p_CvMat, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvMatND[] = {  {&_swigt__p_p_CvMatND, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvMemStorage[] = {  {&_swigt__p_p_CvMemStorage, 0, 0, 0},{0, 0, 0, 0}};
@@ -116343,7 +105267,6 @@ static swig_cast_info _swigc__p_p__CvContourScanner[] = {  {&_swigt__p_p__CvCont
 static swig_cast_info _swigc__p_p__IplConvKernel[] = {  {&_swigt__p_p__IplConvKernel, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p__IplImage[] = {  {&_swigt__p_p__IplImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_double[] = {  {&_swigt__p_p_double, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_float[] = {  {&_swigt__p_p_float, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_p_CvMat[] = {  {&_swigt__p_p_p_CvMat, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_unsigned_char[] = {  {&_swigt__p_p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
@@ -116370,9 +105293,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_Cv64suf,
   _swigc__p_CvAttrList,
   _swigc__p_CvAvgComp,
-  _swigc__p_CvBaseImageFilter,
   _swigc__p_CvBox2D,
-  _swigc__p_CvBoxFilter,
   _swigc__p_CvChain,
   _swigc__p_CvChainPtReader,
   _swigc__p_CvConDensation,
@@ -116402,10 +105323,10 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvHuMoments,
   _swigc__p_CvImage,
   _swigc__p_CvKalman,
-  _swigc__p_CvLaplaceFilter,
-  _swigc__p_CvLevMarq,
+  _swigc__p_CvLSH,
+  _swigc__p_CvLSHOperations,
   _swigc__p_CvLineIterator,
-  _swigc__p_CvLinearFilter,
+  _swigc__p_CvMSERParams,
   _swigc__p_CvMat,
   _swigc__p_CvMatND,
   _swigc__p_CvMatND_data,
@@ -116419,7 +105340,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvModule,
   _swigc__p_CvModuleInfo,
   _swigc__p_CvMoments,
-  _swigc__p_CvMorphology,
   _swigc__p_CvNArrayIterator,
   _swigc__p_CvNextEdgeType,
   _swigc__p_CvPOSITObject,
@@ -116436,7 +105356,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvSURFParams,
   _swigc__p_CvSURFPoint,
   _swigc__p_CvScalar,
-  _swigc__p_CvSepFilter,
   _swigc__p_CvSeq,
   _swigc__p_CvSeqBlock,
   _swigc__p_CvSeqReader,
@@ -116495,15 +105414,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void,
   _swigc__p_f_p__IplImage_int__void,
   _swigc__p_f_p__IplImage_int_int__void,
-  _swigc__p_f_p_p_unsigned_char_p_unsigned_char_int_int_p_void__void,
   _swigc__p_f_p_p_void__void,
   _swigc__p_f_p_q_const__IplImage__p__IplImage,
   _swigc__p_f_p_q_const__char_int__p_CvMat,
   _swigc__p_f_p_q_const__char_int__p__IplImage,
-  _swigc__p_f_p_q_const__char_p_q_const__void__int,
   _swigc__p_f_p_q_const__char_p_q_const__void__void,
+  _swigc__p_f_p_q_const__char_p_q_const__void_p_q_const__int__int,
   _swigc__p_f_p_q_const__float_p_q_const__float_p_void__float,
-  _swigc__p_f_p_q_const__unsigned_char_p_unsigned_char_p_void__void,
   _swigc__p_f_p_q_const__void__int,
   _swigc__p_f_p_q_const__void__p_void,
   _swigc__p_f_p_q_const__void_p_q_const__void_p_void__int,
@@ -116520,6 +105437,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_CvHaarClassifierCascade,
   _swigc__p_p_CvHistogram,
   _swigc__p_p_CvKalman,
+  _swigc__p_p_CvLSH,
   _swigc__p_p_CvMat,
   _swigc__p_p_CvMatND,
   _swigc__p_p_CvMemStorage,
@@ -116545,7 +105463,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p__IplConvKernel,
   _swigc__p_p__IplImage,
   _swigc__p_p_char,
-  _swigc__p_p_double,
   _swigc__p_p_float,
   _swigc__p_p_p_CvMat,
   _swigc__p_p_unsigned_char,
@@ -116908,7 +105825,9 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_LU",SWIG_From_int((int)(0)));
   SWIG_Octave_SetConstant(module_ns,"CV_SVD",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CV_SVD_SYM",SWIG_From_int((int)(2)));
-  SWIG_Octave_SetConstant(module_ns,"CV_LSQ",SWIG_From_int((int)(8)));
+  SWIG_Octave_SetConstant(module_ns,"CV_CHOLESKY",SWIG_From_int((int)(3)));
+  SWIG_Octave_SetConstant(module_ns,"CV_QR",SWIG_From_int((int)(4)));
+  SWIG_Octave_SetConstant(module_ns,"CV_NORMAL",SWIG_From_int((int)(16)));
   SWIG_Octave_SetConstant(module_ns,"CV_COVAR_SCRAMBLED",SWIG_From_int((int)(0)));
   SWIG_Octave_SetConstant(module_ns,"CV_COVAR_NORMAL",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CV_COVAR_USE_AVG",SWIG_From_int((int)(2)));
@@ -116975,8 +105894,7 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_ErrModeSilent",SWIG_From_int((int)(2)));
   SWIG_Octave_SetConstant(module_ns,"CV_MAJOR_VERSION",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CV_MINOR_VERSION",SWIG_From_int((int)(1)));
-  SWIG_Octave_SetConstant(module_ns,"CV_SUBMINOR_VERSION",SWIG_From_int((int)(0)));
-  SWIG_Octave_SetConstant(module_ns,"CV_VERSION",SWIG_FromCharPtr("1.1.0"));
+  SWIG_Octave_SetConstant(module_ns,"CV_SUBMINOR_VERSION",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CV_PI",octave_value(3.1415926535897932384626433832795));
   SWIG_Octave_SetConstant(module_ns,"CV_LOG2",octave_value(0.69314718055994530941723212145818));
   SWIG_Octave_SetConstant(module_ns,"IPL_DEPTH_SIGN",SWIG_From_int((int)(0x80000000)));
@@ -117018,37 +105936,37 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_32F",SWIG_From_int((int)(5)));
   SWIG_Octave_SetConstant(module_ns,"CV_64F",SWIG_From_int((int)(6)));
   SWIG_Octave_SetConstant(module_ns,"CV_USRTYPE1",SWIG_From_int((int)(7)));
-  SWIG_Octave_SetConstant(module_ns,"CV_8UC1",SWIG_From_int((int)(((0) +(((1) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_8UC2",SWIG_From_int((int)(((0) +(((2) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_8UC3",SWIG_From_int((int)(((0) +(((3) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_8UC4",SWIG_From_int((int)(((0) +(((4) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_8SC1",SWIG_From_int((int)(((1) +(((1) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_8SC2",SWIG_From_int((int)(((1) +(((2) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_8SC3",SWIG_From_int((int)(((1) +(((3) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_8SC4",SWIG_From_int((int)(((1) +(((4) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_16UC1",SWIG_From_int((int)(((2) +(((1) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_16UC2",SWIG_From_int((int)(((2) +(((2) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_16UC3",SWIG_From_int((int)(((2) +(((3) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_16UC4",SWIG_From_int((int)(((2) +(((4) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_16SC1",SWIG_From_int((int)(((3) +(((1) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_16SC2",SWIG_From_int((int)(((3) +(((2) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_16SC3",SWIG_From_int((int)(((3) +(((3) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_16SC4",SWIG_From_int((int)(((3) +(((4) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_32SC1",SWIG_From_int((int)(((4) +(((1) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_32SC2",SWIG_From_int((int)(((4) +(((2) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_32SC3",SWIG_From_int((int)(((4) +(((3) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_32SC4",SWIG_From_int((int)(((4) +(((4) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_32FC1",SWIG_From_int((int)(((5) +(((1) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_32FC2",SWIG_From_int((int)(((5) +(((2) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_32FC3",SWIG_From_int((int)(((5) +(((3) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_32FC4",SWIG_From_int((int)(((5) +(((4) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_64FC1",SWIG_From_int((int)(((6) +(((1) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_64FC2",SWIG_From_int((int)(((6) +(((2) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_64FC3",SWIG_From_int((int)(((6) +(((3) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_64FC4",SWIG_From_int((int)(((6) +(((4) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_MAT_DEPTH_MASK",SWIG_From_int((int)(((1 << 3) -1))));
+  SWIG_Octave_SetConstant(module_ns,"CV_8UC1",SWIG_From_int((int)((((0) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_8UC2",SWIG_From_int((int)((((0) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_8UC3",SWIG_From_int((int)((((0) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_8UC4",SWIG_From_int((int)((((0) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_8SC1",SWIG_From_int((int)((((1) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_8SC2",SWIG_From_int((int)((((1) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_8SC3",SWIG_From_int((int)((((1) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_8SC4",SWIG_From_int((int)((((1) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_16UC1",SWIG_From_int((int)((((2) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_16UC2",SWIG_From_int((int)((((2) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_16UC3",SWIG_From_int((int)((((2) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_16UC4",SWIG_From_int((int)((((2) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_16SC1",SWIG_From_int((int)((((3) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_16SC2",SWIG_From_int((int)((((3) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_16SC3",SWIG_From_int((int)((((3) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_16SC4",SWIG_From_int((int)((((3) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_32SC1",SWIG_From_int((int)((((4) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_32SC2",SWIG_From_int((int)((((4) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_32SC3",SWIG_From_int((int)((((4) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_32SC4",SWIG_From_int((int)((((4) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_32FC1",SWIG_From_int((int)((((5) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_32FC2",SWIG_From_int((int)((((5) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_32FC3",SWIG_From_int((int)((((5) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_32FC4",SWIG_From_int((int)((((5) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_64FC1",SWIG_From_int((int)((((6) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_64FC2",SWIG_From_int((int)((((6) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_64FC3",SWIG_From_int((int)((((6) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_64FC4",SWIG_From_int((int)((((6) &((1 << 3) -1)) +(((4) -1) << 3)))));
   SWIG_Octave_SetConstant(module_ns,"CV_AUTO_STEP",SWIG_From_int((int)(0x7fffffff)));
   SWIG_Octave_SetConstant(module_ns,"CV_MAT_CN_MASK",SWIG_From_int((int)(((64-1) << 3))));
-  SWIG_Octave_SetConstant(module_ns,"CV_MAT_DEPTH_MASK",SWIG_From_int((int)(((1 << 3) -1))));
   SWIG_Octave_SetConstant(module_ns,"CV_MAT_TYPE_MASK",SWIG_From_int((int)(((1 << 3) *64-1))));
   SWIG_Octave_SetConstant(module_ns,"CV_MAT_CONT_FLAG_SHIFT",SWIG_From_int((int)(14)));
   SWIG_Octave_SetConstant(module_ns,"CV_MAT_CONT_FLAG",SWIG_From_int((int)((1 << 14))));
@@ -117083,17 +106001,17 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_SET_MAGIC_VAL",SWIG_From_int((int)(0x42980000)));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_BITS",SWIG_From_int((int)(9)));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_MASK",SWIG_From_int((int)(((1 << 9) -1))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_POINT",SWIG_From_int((int)(((4) +(((2) -1) << 3)))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_CODE",SWIG_From_int((int)(((0) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_POINT",SWIG_From_int((int)((((4) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_CODE",SWIG_From_int((int)((((0) &((1 << 3) -1)) +(((1) -1) << 3)))));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_GENERIC",SWIG_From_int((int)(0)));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_PTR",SWIG_From_int((int)(7)));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_PPOINT",SWIG_From_int((int)(7)));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_INDEX",SWIG_From_int((int)(((4) +(((1) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_INDEX",SWIG_From_int((int)((((4) &((1 << 3) -1)) +(((1) -1) << 3)))));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_GRAPH_EDGE",SWIG_From_int((int)(0)));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_GRAPH_VERTEX",SWIG_From_int((int)(0)));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_TRIAN_ATR",SWIG_From_int((int)(0)));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_CONNECTED_COMP",SWIG_From_int((int)(0)));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_POINT3D",SWIG_From_int((int)(((5) +(((3) -1) << 3)))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_ELTYPE_POINT3D",SWIG_From_int((int)((((5) &((1 << 3) -1)) +(((3) -1) << 3)))));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_KIND_BITS",SWIG_From_int((int)(3)));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_KIND_MASK",SWIG_From_int((int)((((1 << 3) -1) << 9))));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_KIND_GENERIC",SWIG_From_int((int)((0 << 9))));
@@ -117109,17 +106027,17 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_GRAPH_FLAG_ORIENTED",SWIG_From_int((int)((1 << (3+9)))));
   SWIG_Octave_SetConstant(module_ns,"CV_GRAPH",SWIG_From_int((int)((3 << 9))));
   SWIG_Octave_SetConstant(module_ns,"CV_ORIENTED_GRAPH",SWIG_From_int((int)(((3 << 9)|(1 << (3+9))))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POINT_SET",SWIG_From_int((int)(((0 << 9)|((4) +(((2) -1) << 3))))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POINT3D_SET",SWIG_From_int((int)(((0 << 9)|((5) +(((3) -1) << 3))))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POLYLINE",SWIG_From_int((int)(((1 << 9)|((4) +(((2) -1) << 3))))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POLYGON",SWIG_From_int((int)(((1 << (3+9))|((1 << 9)|((4) +(((2) -1) << 3)))))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_CONTOUR",SWIG_From_int((int)(((1 << (3+9))|((1 << 9)|((4) +(((2) -1) << 3)))))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_SIMPLE_POLYGON",SWIG_From_int((int)(((2 << (3+9))|((1 << (3+9))|((1 << 9)|((4) +(((2) -1) << 3))))))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_CHAIN",SWIG_From_int((int)(((1 << 9)|((0) +(((1) -1) << 3))))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_CHAIN_CONTOUR",SWIG_From_int((int)(((1 << (3+9))|((1 << 9)|((0) +(((1) -1) << 3)))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POINT_SET",SWIG_From_int((int)(((0 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POINT3D_SET",SWIG_From_int((int)(((0 << 9)|(((5) &((1 << 3) -1)) +(((3) -1) << 3))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POLYLINE",SWIG_From_int((int)(((1 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POLYGON",SWIG_From_int((int)(((1 << (3+9))|((1 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3)))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_CONTOUR",SWIG_From_int((int)(((1 << (3+9))|((1 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3)))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_SIMPLE_POLYGON",SWIG_From_int((int)(((2 << (3+9))|((1 << (3+9))|((1 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3))))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_CHAIN",SWIG_From_int((int)(((1 << 9)|(((0) &((1 << 3) -1)) +(((1) -1) << 3))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_CHAIN_CONTOUR",SWIG_From_int((int)(((1 << (3+9))|((1 << 9)|(((0) &((1 << 3) -1)) +(((1) -1) << 3)))))));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_POLYGON_TREE",SWIG_From_int((int)(((2 << 9)|0))));
   SWIG_Octave_SetConstant(module_ns,"CV_SEQ_CONNECTED_COMP",SWIG_From_int((int)(((0 << 9)|0))));
-  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_INDEX",SWIG_From_int((int)(((0 << 9)|((4) +(((1) -1) << 3))))));
+  SWIG_Octave_SetConstant(module_ns,"CV_SEQ_INDEX",SWIG_From_int((int)(((0 << 9)|(((4) &((1 << 3) -1)) +(((1) -1) << 3))))));
   SWIG_Octave_SetConstant(module_ns,"CV_STORAGE_READ",SWIG_From_int((int)(0)));
   SWIG_Octave_SetConstant(module_ns,"CV_STORAGE_WRITE",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CV_STORAGE_WRITE_TEXT",SWIG_From_int((int)(1)));
@@ -117187,6 +106105,7 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_StsParseError",SWIG_From_int((int)(-212)));
   SWIG_Octave_SetConstant(module_ns,"CV_StsNotImplemented",SWIG_From_int((int)(-213)));
   SWIG_Octave_SetConstant(module_ns,"CV_StsBadMemBlock",SWIG_From_int((int)(-214)));
+  SWIG_Octave_SetConstant(module_ns,"CV_StsAssert",SWIG_From_int((int)(-215)));
   SWIG_Octave_SetConstant(module_ns,"CV_BLUR_NO_SCALE",SWIG_From_int((int)(0)));
   SWIG_Octave_SetConstant(module_ns,"CV_BLUR",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CV_GAUSSIAN",SWIG_From_int((int)(2)));
@@ -117393,26 +106312,6 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_PREV_AROUND_LEFT",SWIG_From_int((int)(CV_PREV_AROUND_LEFT)));
   SWIG_Octave_SetConstant(module_ns,"CV_PREV_AROUND_RIGHT",SWIG_From_int((int)(CV_PREV_AROUND_RIGHT)));
   SWIG_Octave_SetConstant(module_ns,"CV_GAUSSIAN_5x5",SWIG_From_int((int)(CV_GAUSSIAN_5x5)));
-  SWIG_Octave_SetConstant(module_ns,"CvSepFilter_GENERIC",SWIG_From_int((int)(CvSepFilter::GENERIC)));
-  SWIG_Octave_SetConstant(module_ns,"CvSepFilter_ASYMMETRICAL",SWIG_From_int((int)(CvSepFilter::ASYMMETRICAL)));
-  SWIG_Octave_SetConstant(module_ns,"CvSepFilter_SYMMETRICAL",SWIG_From_int((int)(CvSepFilter::SYMMETRICAL)));
-  SWIG_Octave_SetConstant(module_ns,"CvSepFilter_POSITIVE",SWIG_From_int((int)(CvSepFilter::POSITIVE)));
-  SWIG_Octave_SetConstant(module_ns,"CvSepFilter_SUM_TO_1",SWIG_From_int((int)(CvSepFilter::SUM_TO_1)));
-  SWIG_Octave_SetConstant(module_ns,"CvSepFilter_INTEGER",SWIG_From_int((int)(CvSepFilter::INTEGER)));
-  SWIG_Octave_SetConstant(module_ns,"CvSepFilter_NORMALIZE_KERNEL",SWIG_From_int((int)(CvSepFilter::NORMALIZE_KERNEL)));
-  SWIG_Octave_SetConstant(module_ns,"CvSepFilter_FLIP_KERNEL",SWIG_From_int((int)(CvSepFilter::FLIP_KERNEL)));
-  SWIG_Octave_SetConstant(module_ns,"CvMorphology_RECT",SWIG_From_int((int)(CvMorphology::RECT)));
-  SWIG_Octave_SetConstant(module_ns,"CvMorphology_CROSS",SWIG_From_int((int)(CvMorphology::CROSS)));
-  SWIG_Octave_SetConstant(module_ns,"CvMorphology_ELLIPSE",SWIG_From_int((int)(CvMorphology::ELLIPSE)));
-  SWIG_Octave_SetConstant(module_ns,"CvMorphology_CUSTOM",SWIG_From_int((int)(CvMorphology::CUSTOM)));
-  SWIG_Octave_SetConstant(module_ns,"CvMorphology_BINARY",SWIG_From_int((int)(CvMorphology::BINARY)));
-  SWIG_Octave_SetConstant(module_ns,"CvMorphology_GRAYSCALE",SWIG_From_int((int)(CvMorphology::GRAYSCALE)));
-  SWIG_Octave_SetConstant(module_ns,"CvMorphology_ERODE",SWIG_From_int((int)(CvMorphology::ERODE)));
-  SWIG_Octave_SetConstant(module_ns,"CvMorphology_DILATE",SWIG_From_int((int)(CvMorphology::DILATE)));
-  SWIG_Octave_SetConstant(module_ns,"CvLevMarq_DONE",SWIG_From_int((int)(CvLevMarq::DONE)));
-  SWIG_Octave_SetConstant(module_ns,"CvLevMarq_STARTED",SWIG_From_int((int)(CvLevMarq::STARTED)));
-  SWIG_Octave_SetConstant(module_ns,"CvLevMarq_CALC_J",SWIG_From_int((int)(CvLevMarq::CALC_J)));
-  SWIG_Octave_SetConstant(module_ns,"CvLevMarq_CHECK_ERR",SWIG_From_int((int)(CvLevMarq::CHECK_ERR)));
   
   cvRedirectError(function_ptr_generator(), void_ptr_generator(), void_ptrptr_generator());
   
index a41bea5d96f08f1658fff959280b9b4fa9631a7d..5bd2a31378d88e4ff3406fd426f71a647672d7a6 100644 (file)
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.36
+ * Version 1.3.39
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -8,22 +8,27 @@
  * interface file instead. 
  * ----------------------------------------------------------------------------- */
 
+#define SWIGOCTAVE
 #define SWIG_name_d      "highgui"
 #define SWIG_name        highgui
 
+
 #ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
-    T *tt;
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
-    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
 
 template <typename T> T SwigValueInit() {
@@ -145,11 +150,12 @@ template <typename T> T SwigValueInit() {
 #include <octave/parse.h>
 #include <octave/ov-fcn-handle.h>
 #include <octave/Cell.h>
+#include <octave/oct-map.h>
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
  * type checking.
  * ----------------------------------------------------------------------------- */
 
@@ -168,11 +174,11 @@ template <typename T> T SwigValueInit() {
 
 /*
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the swig runtime code.
-  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  creating a static or dynamic library from the SWIG runtime code.
+  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
   
-  But only do this if is strictly necessary, ie, if you have problems
-  with your compiler or so.
+  But only do this if strictly necessary, ie, if you have problems
+  with your compiler or suchlike.
 */
 
 #ifndef SWIGRUNTIME
@@ -199,14 +205,14 @@ template <typename T> T SwigValueInit() {
 /* 
    Flags/methods for returning states.
    
-   The swig conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
    Use the following macros/flags to set or process the returning
    states.
    
-   In old swig versions, you usually write code as:
+   In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
        // success code
@@ -214,7 +220,7 @@ template <typename T> T SwigValueInit() {
        //fail code
      }
 
-   Now you can be more explicit as:
+   Now you can be more explicit:
 
     int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
     if (SWIG_IsOK(res)) {
@@ -223,7 +229,7 @@ template <typename T> T SwigValueInit() {
       // fail code
     }
 
-   that seems to be the same, but now you can also do
+   which is the same really, but now you can also do
 
     Type *ptr;
     int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -241,7 +247,7 @@ template <typename T> T SwigValueInit() {
     
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
-   requires also to SWIG_ConvertPtr to return new result values, as
+   also requires SWIG_ConvertPtr to return new result values, such as
 
       int SWIG_ConvertPtr(obj, ptr,...) {         
         if (<obj is ok>) {                            
@@ -259,7 +265,7 @@ template <typename T> T SwigValueInit() {
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
    more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   swig errors code.
+   SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
    allows to return the 'cast rank', for example, if you have this
@@ -273,9 +279,8 @@ template <typename T> T SwigValueInit() {
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
+*/
 
-
- */
 #define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
@@ -300,7 +305,6 @@ template <typename T> T SwigValueInit() {
 #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
 #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
 
-
 /* Cast-Rank Mode */
 #if defined(SWIG_CASTRANK_MODE)
 #  ifndef SWIG_TypeRank
@@ -323,8 +327,6 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
-
-
 #include <string.h>
 
 #ifdef __cplusplus
@@ -421,40 +423,58 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
 }
 
 
-/* think of this as a c++ template<> or a scheme macro */
-#define SWIG_TypeCheck_Template(comparison, ty)         \
-  if (ty) {                                             \
-    swig_cast_info *iter = ty->cast;                    \
-    while (iter) {                                      \
-      if (comparison) {                                 \
-        if (iter == ty->cast) return iter;              \
-        /* Move iter to the top of the linked list */   \
-        iter->prev->next = iter->next;                  \
-        if (iter->next)                                 \
-          iter->next->prev = iter->prev;                \
-        iter->next = ty->cast;                          \
-        iter->prev = 0;                                 \
-        if (ty->cast) ty->cast->prev = iter;            \
-        ty->cast = iter;                                \
-        return iter;                                    \
-      }                                                 \
-      iter = iter->next;                                \
-    }                                                   \
-  }                                                     \
-  return 0
-
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (strcmp(iter->type->name, c) == 0) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
-/* Same as previous function, except strcmp is replaced with a pointer comparison */
+/* 
+  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
-  SWIG_TypeCheck_Template(iter->type == from, into);
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (iter->type == from) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
 /*
@@ -1324,7 +1344,7 @@ namespace Swig {
       // index operator
       else {
        if (ops[skip] == '(' || ops[skip] == '{') {
-         const char *op_name = ops[skip] == '(' ? "__paren" : "__brace";
+         const char *op_name = ops[skip] == '(' ? "__paren__" : "__brace__";
          octave_value_list args;
          args.append(*idx_it++);
          ++skip;
@@ -1363,7 +1383,7 @@ namespace Swig {
       }
 
       else if (ops[skip] == '(' || ops[skip] == '{') {
-       const char *op_name = ops[skip] == '(' ? "__paren_asgn" : "__brace_asgn";
+       const char *op_name = ops[skip] == '(' ? "__paren_asgn__" : "__brace_asgn__";
        member_value_pair *m = find_member(op_name, false);
        if (m) {
          octave_value_list args;
@@ -1401,40 +1421,27 @@ namespace Swig {
 
     virtual bool is_string() const {
       octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      return !!nc_this->find_member("__str", false);
+      return !!nc_this->find_member("__str__", false);
     }
 
     virtual std::string string_value(bool force = false) const {
       octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member("__str", false);
+      member_value_pair *m = nc_this->find_member("__str__", false);
       if (!m) {
-       error("__str method not defined");
+       error("__str__ method not defined");
        return std::string();
       }
       octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
       if (outarg.length() < 1 || !outarg(0).is_string()) {
-       error("__str method did not return a string");
+       error("__str__ method did not return a string");
        return std::string();
       }
       return outarg(0).string_value();
     }
 
-    /*
     virtual Octave_map map_value() const {
-      octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member("__str", false);
-      if (!m) {
-       error("__map method not defined");
-       return std::string();
-      }
-      octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
-      if (outarg.length() < 1 || !outarg(0).is_map()) {
-       error("__map method did not return a string");
-       return std::string();
-      }
-      return outarg(0).map_value();
+      return Octave_map();
     }
-    */
 
     virtual string_vector map_keys() const {
       member_map tmp;
@@ -1448,6 +1455,35 @@ namespace Swig {
       return keys;
     }
 
+    virtual bool save_ascii (std::ostream& os) {
+      return true;
+    }
+
+    virtual bool load_ascii (std::istream& is) {
+      return true;
+    }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
+      return true;
+    }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt) {
+      return true;
+    }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
+      return true;
+    }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
+      return true;
+    }
+#endif
+
     virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const {
       return string_value();
     }
@@ -1472,7 +1508,7 @@ namespace Swig {
       assert(ost);
 
       octave_value ret;
-      if (ost->dispatch_unary_op(std::string("__") + op_name, ret))
+      if (ost->dispatch_unary_op(std::string("__") + op_name + std::string("__"), ret))
        return ret;
       std::string symbol = "op_" + ost->swig_type_name() + "_" + op_name;
       octave_value_list args;
@@ -1489,7 +1525,7 @@ namespace Swig {
       octave_swig_type *rhs_ost = Swig::swig_value_deref(rhs);
 
       octave_value ret;
-      if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name, rhs, ret))
+      if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name + std::string("__"), rhs, ret))
        return ret;
 
       std::string symbol;
@@ -1611,9 +1647,35 @@ namespace Swig {
     virtual std::string string_value(bool force = false) const 
       { return ptr->string_value(force); }
 
+    virtual Octave_map map_value() const
+      { return ptr->map_value(); }
+
     virtual string_vector map_keys() const
       { return ptr->map_keys(); }
 
+    virtual bool save_ascii (std::ostream& os)
+      { return ptr->save_ascii(os); }
+
+    virtual bool load_ascii (std::istream& is)
+      { return ptr->load_ascii(is); }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats)
+      { return ptr->save_binary(os, save_as_floats); }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt)
+      { return ptr->load_binary(is, swap, fmt); }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
+      { return ptr->save_hdf5(loc_id, name, save_as_floats); }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug)
+      { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); }
+#endif
+
     virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const
       { return ptr->convert_to_str(pad, force, type); }
 
@@ -1662,6 +1724,37 @@ namespace Swig {
     void print(std::ostream &os, bool pr_as_read_syntax = false) const {
       os << "swig packed type: name = " << (type ? type->name : std::string()) << ", len = " << buf.size() << std::endl;
     }
+
+
+    virtual bool save_ascii (std::ostream& os) {
+      return true;
+    }
+
+    virtual bool load_ascii (std::istream& is) {
+      return true;
+    }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
+      return true;
+    }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt) {
+      return true;
+    }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
+      return true;
+    }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
+      return true;
+    }
+#endif
+
   private:
     DECLARE_OCTAVE_ALLOCATOR;
     DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
@@ -2063,98 +2156,100 @@ SWIGRUNTIME void SWIG_Octave_SetModule(void *clientdata, swig_module_info *point
 #define SWIGTYPE_p_CvHuMoments swig_types[29]
 #define SWIGTYPE_p_CvKalman swig_types[30]
 #define SWIGTYPE_p_CvLineIterator swig_types[31]
-#define SWIGTYPE_p_CvMat swig_types[32]
-#define SWIGTYPE_p_CvMatND swig_types[33]
-#define SWIGTYPE_p_CvMatrix3 swig_types[34]
-#define SWIGTYPE_p_CvMemBlock swig_types[35]
-#define SWIGTYPE_p_CvMemStorage swig_types[36]
-#define SWIGTYPE_p_CvMemStoragePos swig_types[37]
-#define SWIGTYPE_p_CvModuleInfo swig_types[38]
-#define SWIGTYPE_p_CvMoments swig_types[39]
-#define SWIGTYPE_p_CvNArrayIterator swig_types[40]
-#define SWIGTYPE_p_CvNextEdgeType swig_types[41]
-#define SWIGTYPE_p_CvPOSITObject swig_types[42]
-#define SWIGTYPE_p_CvPluginFuncInfo swig_types[43]
-#define SWIGTYPE_p_CvPoint swig_types[44]
-#define SWIGTYPE_p_CvPoint2D32f swig_types[45]
-#define SWIGTYPE_p_CvPoint2D64f swig_types[46]
-#define SWIGTYPE_p_CvPoint3D32f swig_types[47]
-#define SWIGTYPE_p_CvPoint3D64f swig_types[48]
-#define SWIGTYPE_p_CvQuadEdge2D swig_types[49]
-#define SWIGTYPE_p_CvRNG_Wrapper swig_types[50]
-#define SWIGTYPE_p_CvRect swig_types[51]
-#define SWIGTYPE_p_CvSURFParams swig_types[52]
-#define SWIGTYPE_p_CvSURFPoint swig_types[53]
-#define SWIGTYPE_p_CvScalar swig_types[54]
-#define SWIGTYPE_p_CvSeq swig_types[55]
-#define SWIGTYPE_p_CvSeqBlock swig_types[56]
-#define SWIGTYPE_p_CvSeqReader swig_types[57]
-#define SWIGTYPE_p_CvSeqWriter swig_types[58]
-#define SWIGTYPE_p_CvSet swig_types[59]
-#define SWIGTYPE_p_CvSetElem swig_types[60]
-#define SWIGTYPE_p_CvSize swig_types[61]
-#define SWIGTYPE_p_CvSize2D32f swig_types[62]
-#define SWIGTYPE_p_CvSlice swig_types[63]
-#define SWIGTYPE_p_CvSparseMat swig_types[64]
-#define SWIGTYPE_p_CvSparseMatIterator swig_types[65]
-#define SWIGTYPE_p_CvSparseNode swig_types[66]
-#define SWIGTYPE_p_CvStarDetectorParams swig_types[67]
-#define SWIGTYPE_p_CvStarKeypoint swig_types[68]
-#define SWIGTYPE_p_CvStereoBMState swig_types[69]
-#define SWIGTYPE_p_CvStereoGCState swig_types[70]
-#define SWIGTYPE_p_CvString swig_types[71]
-#define SWIGTYPE_p_CvStringHashNode swig_types[72]
-#define SWIGTYPE_p_CvSubdiv2D swig_types[73]
-#define SWIGTYPE_p_CvSubdiv2DEdge_Wrapper swig_types[74]
-#define SWIGTYPE_p_CvSubdiv2DPoint swig_types[75]
-#define SWIGTYPE_p_CvSubdiv2DPointLocation swig_types[76]
-#define SWIGTYPE_p_CvTermCriteria swig_types[77]
-#define SWIGTYPE_p_CvTreeNodeIterator swig_types[78]
-#define SWIGTYPE_p_CvTypeInfo swig_types[79]
-#define SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t swig_types[80]
-#define SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t swig_types[81]
-#define SWIGTYPE_p_CvTypedSeqT_CvPoint_t swig_types[82]
-#define SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[83]
-#define SWIGTYPE_p_CvTypedSeqT_CvRect_t swig_types[84]
-#define SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t swig_types[85]
-#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[86]
-#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[87]
-#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[88]
-#define SWIGTYPE_p_CvVideoWriter swig_types[89]
-#define SWIGTYPE_p_CvvImage swig_types[90]
-#define SWIGTYPE_p__IplConvKernel swig_types[91]
-#define SWIGTYPE_p__IplConvKernelFP swig_types[92]
-#define SWIGTYPE_p__IplImage swig_types[93]
-#define SWIGTYPE_p__IplROI swig_types[94]
-#define SWIGTYPE_p__IplTileInfo swig_types[95]
-#define SWIGTYPE_p_allocator_type swig_types[96]
-#define SWIGTYPE_p_char swig_types[97]
-#define SWIGTYPE_p_difference_type swig_types[98]
-#define SWIGTYPE_p_f_int__void swig_types[99]
-#define SWIGTYPE_p_f_int_int_int_int_p_void__void swig_types[100]
-#define SWIGTYPE_p_int swig_types[101]
-#define SWIGTYPE_p_long_long swig_types[102]
-#define SWIGTYPE_p_octave_value swig_types[103]
-#define SWIGTYPE_p_p_CvCapture swig_types[104]
-#define SWIGTYPE_p_p_CvVideoWriter swig_types[105]
-#define SWIGTYPE_p_p_char swig_types[106]
-#define SWIGTYPE_p_signed_char swig_types[107]
-#define SWIGTYPE_p_size_t swig_types[108]
-#define SWIGTYPE_p_size_type swig_types[109]
-#define SWIGTYPE_p_unsigned_char swig_types[110]
-#define SWIGTYPE_p_unsigned_long_long swig_types[111]
-#define SWIGTYPE_p_unsigned_short swig_types[112]
-#define SWIGTYPE_p_value_type swig_types[113]
-#define SWIGTYPE_p_void swig_types[114]
-static swig_type_info *swig_types[116];
-static swig_module_info swig_module = {swig_types, 115, 0, 0, 0, 0};
+#define SWIGTYPE_p_CvMSERParams swig_types[32]
+#define SWIGTYPE_p_CvMat swig_types[33]
+#define SWIGTYPE_p_CvMatND swig_types[34]
+#define SWIGTYPE_p_CvMatrix3 swig_types[35]
+#define SWIGTYPE_p_CvMemBlock swig_types[36]
+#define SWIGTYPE_p_CvMemStorage swig_types[37]
+#define SWIGTYPE_p_CvMemStoragePos swig_types[38]
+#define SWIGTYPE_p_CvModuleInfo swig_types[39]
+#define SWIGTYPE_p_CvMoments swig_types[40]
+#define SWIGTYPE_p_CvNArrayIterator swig_types[41]
+#define SWIGTYPE_p_CvNextEdgeType swig_types[42]
+#define SWIGTYPE_p_CvPOSITObject swig_types[43]
+#define SWIGTYPE_p_CvPluginFuncInfo swig_types[44]
+#define SWIGTYPE_p_CvPoint swig_types[45]
+#define SWIGTYPE_p_CvPoint2D32f swig_types[46]
+#define SWIGTYPE_p_CvPoint2D64f swig_types[47]
+#define SWIGTYPE_p_CvPoint3D32f swig_types[48]
+#define SWIGTYPE_p_CvPoint3D64f swig_types[49]
+#define SWIGTYPE_p_CvQuadEdge2D swig_types[50]
+#define SWIGTYPE_p_CvRNG_Wrapper swig_types[51]
+#define SWIGTYPE_p_CvRect swig_types[52]
+#define SWIGTYPE_p_CvSURFParams swig_types[53]
+#define SWIGTYPE_p_CvSURFPoint swig_types[54]
+#define SWIGTYPE_p_CvScalar swig_types[55]
+#define SWIGTYPE_p_CvSeq swig_types[56]
+#define SWIGTYPE_p_CvSeqBlock swig_types[57]
+#define SWIGTYPE_p_CvSeqReader swig_types[58]
+#define SWIGTYPE_p_CvSeqWriter swig_types[59]
+#define SWIGTYPE_p_CvSet swig_types[60]
+#define SWIGTYPE_p_CvSetElem swig_types[61]
+#define SWIGTYPE_p_CvSize swig_types[62]
+#define SWIGTYPE_p_CvSize2D32f swig_types[63]
+#define SWIGTYPE_p_CvSlice swig_types[64]
+#define SWIGTYPE_p_CvSparseMat swig_types[65]
+#define SWIGTYPE_p_CvSparseMatIterator swig_types[66]
+#define SWIGTYPE_p_CvSparseNode swig_types[67]
+#define SWIGTYPE_p_CvStarDetectorParams swig_types[68]
+#define SWIGTYPE_p_CvStarKeypoint swig_types[69]
+#define SWIGTYPE_p_CvStereoBMState swig_types[70]
+#define SWIGTYPE_p_CvStereoGCState swig_types[71]
+#define SWIGTYPE_p_CvString swig_types[72]
+#define SWIGTYPE_p_CvStringHashNode swig_types[73]
+#define SWIGTYPE_p_CvSubdiv2D swig_types[74]
+#define SWIGTYPE_p_CvSubdiv2DEdge_Wrapper swig_types[75]
+#define SWIGTYPE_p_CvSubdiv2DPoint swig_types[76]
+#define SWIGTYPE_p_CvSubdiv2DPointLocation swig_types[77]
+#define SWIGTYPE_p_CvTermCriteria swig_types[78]
+#define SWIGTYPE_p_CvTreeNodeIterator swig_types[79]
+#define SWIGTYPE_p_CvTypeInfo swig_types[80]
+#define SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t swig_types[81]
+#define SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t swig_types[82]
+#define SWIGTYPE_p_CvTypedSeqT_CvPoint_t swig_types[83]
+#define SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[84]
+#define SWIGTYPE_p_CvTypedSeqT_CvRect_t swig_types[85]
+#define SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t swig_types[86]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[87]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[88]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[89]
+#define SWIGTYPE_p_CvVideoWriter swig_types[90]
+#define SWIGTYPE_p_CvvImage swig_types[91]
+#define SWIGTYPE_p__IplConvKernel swig_types[92]
+#define SWIGTYPE_p__IplConvKernelFP swig_types[93]
+#define SWIGTYPE_p__IplImage swig_types[94]
+#define SWIGTYPE_p__IplROI swig_types[95]
+#define SWIGTYPE_p__IplTileInfo swig_types[96]
+#define SWIGTYPE_p_allocator_type swig_types[97]
+#define SWIGTYPE_p_char swig_types[98]
+#define SWIGTYPE_p_difference_type swig_types[99]
+#define SWIGTYPE_p_f_int__void swig_types[100]
+#define SWIGTYPE_p_f_int_int_int_int_p_void__void swig_types[101]
+#define SWIGTYPE_p_f_int_p_void__void swig_types[102]
+#define SWIGTYPE_p_int swig_types[103]
+#define SWIGTYPE_p_long_long swig_types[104]
+#define SWIGTYPE_p_octave_value swig_types[105]
+#define SWIGTYPE_p_p_CvCapture swig_types[106]
+#define SWIGTYPE_p_p_CvVideoWriter swig_types[107]
+#define SWIGTYPE_p_p_char swig_types[108]
+#define SWIGTYPE_p_signed_char swig_types[109]
+#define SWIGTYPE_p_size_t swig_types[110]
+#define SWIGTYPE_p_size_type swig_types[111]
+#define SWIGTYPE_p_unsigned_char swig_types[112]
+#define SWIGTYPE_p_unsigned_long_long swig_types[113]
+#define SWIGTYPE_p_unsigned_short swig_types[114]
+#define SWIGTYPE_p_value_type swig_types[115]
+#define SWIGTYPE_p_void swig_types[116]
+static swig_type_info *swig_types[118];
+static swig_module_info swig_module = {swig_types, 117, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 /* -------- TYPES TABLE (END) -------- */
 
 
-#define SWIGVERSION 0x010336 
+#define SWIGVERSION 0x010339 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2917,7 +3012,7 @@ namespace swig {
   struct traits_asptr {   
     static int asptr(const octave_value& obj, Type **val) {
       Type *p;
-      int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0;
+      int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
       if (SWIG_IsOK(res)) {
        if (val) *val = p;
       }
@@ -3406,7 +3501,7 @@ namespace swig
     
     operator T () const
     {
-      //      swig::PyObject_var item = OctSequence_GetItem(_seq, _index);
+      //      swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, _index);
       octave_value item; // * todo
       try {
        return swig::as<T>(item, true);
@@ -3612,7 +3707,7 @@ namespace swig
     {
       int s = size();
       for (int i = 0; i < s; ++i) {
-       //      swig::PyObject_var item = OctSequence_GetItem(_seq, i);
+       //      swig::SwigVar_PyObject item = OctSequence_GetItem(_seq, i);
        octave_value item; // * todo
        if (!swig::check<value_type>(item)) {
          if (set_err) {
@@ -3803,6 +3898,8 @@ SWIG_AsVal_char (octave_value obj, char *val)
   return res;
 }
 
+SWIGINTERN void delete_CvCapture(CvCapture *self){ CvCapture *     dummy = self; cvReleaseCapture     (& dummy); }
+SWIGINTERN void delete_CvVideoWriter(CvVideoWriter *self){ CvVideoWriter * dummy = self; cvReleaseVideoWriter (& dummy); }
 
 
 class ndim_iterator {
@@ -4173,14 +4270,22 @@ const char* _wrap_cvDestroyAllWindows_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvDestroyAllWindows ()\n\
 \n\
 @end deftypefn";
+const char* _wrap_cvDecodeImage_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvDecodeImage (@var{buf}, @var{iscolor} = 1)\n\
+@var{buf} is of type CvMat. @var{iscolor} is of type int. @var{retval} is of type . \n\
+@end deftypefn";
 const char* _wrap_cvSaveImage_texinfo = "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} @var{retval} = cvSaveImage (@var{filename}, @var{image})\n\
-@var{filename} is of type char. @var{image} is of type CvArr. @var{retval} is of type int. \n\
+@deftypefn {Loadable Function} @var{retval} = cvSaveImage (@var{filename}, @var{image}, @var{params} = 0)\n\
+@var{filename} is of type char. @var{image} is of type CvArr. @var{params} is of type int. @var{retval} is of type int. \n\
 @end deftypefn";
 const char* _wrap_cvGetWindowHandle_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetWindowHandle (@var{name})\n\
 @var{name} is of type char. @var{retval} is of type void. \n\
 @end deftypefn";
+const char* _wrap_cvEncodeImage_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvEncodeImage (@var{ext}, @var{image}, @var{params} = 0)\n\
+@var{ext} is of type char. @var{image} is of type CvArr. @var{params} is of type int. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_CvvImage_Fill_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} Fill (@var{self}, @var{color})\n\
 @var{self} is of type CvvImage. @var{color} is of type int. \n\
@@ -4239,6 +4344,10 @@ const char* _wrap_CvvImage_Bpp_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = Bpp (@var{self})\n\
 @var{self} is of type CvvImage. @var{retval} is of type int. \n\
 @end deftypefn";
+const char* _wrap_cvCreateTrackbar2_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvCreateTrackbar2 (@var{trackbar_name}, @var{window_name}, @var{value}, @var{count}, @var{on_change}, @var{userdata} = 0)\n\
+@var{trackbar_name} is of type char. @var{window_name} is of type char. @var{value} is of type int. @var{count} is of type int. @var{on_change} is of type CvTrackbarCallback2. @var{userdata} is of type void. @var{retval} is of type int. \n\
+@end deftypefn";
 const char* _wrap_cvCreateVideoWriter_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvCreateVideoWriter (@var{filename}, @var{fourcc}, @var{fps}, @var{frame_size}, @var{is_color} = 1)\n\
 @var{filename} is of type char. @var{fourcc} is of type int. @var{fps} is of type double. @var{frame_size} is of type CvSize. @var{is_color} is of type int. @var{retval} is of type CvVideoWriter. \n\
@@ -4247,6 +4356,10 @@ const char* _wrap_cvReleaseVideoWriter_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvReleaseVideoWriter (@var{writer})\n\
 @var{writer} is of type CvVideoWriter. \n\
 @end deftypefn";
+const char* _wrap_delete_CvVideoWriter_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} CvVideoWriter (@var{self})\n\
+@var{self} is of type CvVideoWriter. \n\
+@end deftypefn";
 const char* _wrap_CvvImage_Show_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} Show (@var{self}, @var{window})\n\
 @var{self} is of type CvvImage. @var{window} is of type char. \n\
@@ -4263,6 +4376,10 @@ const char* _wrap_cvResizeWindow_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvResizeWindow (@var{name}, @var{width}, @var{height})\n\
 @var{name} is of type char. @var{width} is of type int. @var{height} is of type int. \n\
 @end deftypefn";
+const char* _wrap_cvGetCaptureDomain_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvGetCaptureDomain (@var{capture})\n\
+@var{capture} is of type CvCapture. @var{retval} is of type int. \n\
+@end deftypefn";
 const char* _wrap_cvGetWindowName_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetWindowName (@var{window_handle})\n\
 @var{window_handle} is of type void. @var{retval} is of type char. \n\
@@ -4302,6 +4419,10 @@ const char* _wrap_CvvImage_Height_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = Height (@var{self})\n\
 @var{self} is of type CvvImage. @var{retval} is of type int. \n\
 @end deftypefn";
+const char* _wrap_cvDecodeImageM_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} @var{retval} = cvDecodeImageM (@var{buf}, @var{iscolor} = 1)\n\
+@var{buf} is of type CvMat. @var{iscolor} is of type int. @var{retval} is of type CvMat. \n\
+@end deftypefn";
 const char* _wrap_cvGetCaptureProperty_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{retval} = cvGetCaptureProperty (@var{capture}, @var{property_id})\n\
 @var{capture} is of type CvCapture. @var{property_id} is of type int. @var{retval} is of type double. \n\
@@ -4351,6 +4472,10 @@ const char* _wrap_cvReleaseCapture_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} cvReleaseCapture (@var{capture})\n\
 @var{capture} is of type CvCapture. \n\
 @end deftypefn";
+const char* _wrap_delete_CvCapture_texinfo = "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} CvCapture (@var{self})\n\
+@var{self} is of type CvCapture. \n\
+@end deftypefn";
 const char* _wrap_cv2im_texinfo = "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} @var{im} = cv2im (@var{I})\n\
 Convert the OpenCV image or 2D matrix @var{I} into an Octave image @var{im}.\n\
@@ -4444,10 +4569,7 @@ static octave_value_list _wrap_CvRNG_Wrapper_ref (const octave_value_list& args,
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper_ref" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
-  {
-    CvRNG &_result_ref = (arg1)->ref();
-    result = (CvRNG *) &_result_ref;
-  }
+  result = (CvRNG *) &(arg1)->ref();
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_long_long, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -4455,7 +4577,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRNG_Wrapper___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRNG_Wrapper___eq__ (const octave_value_list& args, int nargout) {
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -4467,20 +4589,20 @@ static octave_value_list _wrap_CvRNG_Wrapper___eq (const octave_value_list& args
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRNG_Wrapper___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRNG_Wrapper___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___eq" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___eq__" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvRNG_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___eq" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___eq__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___eq" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___eq__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   arg2 = (CvRNG_Wrapper *)(argp2);
   result = (bool)(arg1)->operator ==((CvRNG_Wrapper const &)*arg2);
@@ -4491,7 +4613,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRNG_Wrapper___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRNG_Wrapper___ne__ (const octave_value_list& args, int nargout) {
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -4503,20 +4625,20 @@ static octave_value_list _wrap_CvRNG_Wrapper___ne (const octave_value_list& args
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRNG_Wrapper___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRNG_Wrapper___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___ne" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___ne__" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvRNG_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___ne" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___ne__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___ne" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___ne__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   arg2 = (CvRNG_Wrapper *)(argp2);
   result = (bool)(arg1)->operator !=((CvRNG_Wrapper const &)*arg2);
@@ -4562,8 +4684,8 @@ fail:
 static swig_octave_member swig_CvRNG_Wrapper_members[] = {
 {"ptr",_wrap_CvRNG_Wrapper_ptr,0,0,0,0},
 {"ref",_wrap_CvRNG_Wrapper_ref,0,0,0,0},
-{"__eq",_wrap_CvRNG_Wrapper___eq,0,0,0,0},
-{"__ne",_wrap_CvRNG_Wrapper___ne,0,0,0,0},
+{"__eq__",_wrap_CvRNG_Wrapper___eq__,0,0,0,0},
+{"__ne__",_wrap_CvRNG_Wrapper___ne__,0,0,0,0},
 {0,0,0,0}
 };
 static const char *swig_CvRNG_Wrapper_base_names[] = {0};
@@ -4639,10 +4761,7 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper_ref (const octave_value_li
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper_ref" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
-  {
-    CvSubdiv2DEdge &_result_ref = (arg1)->ref();
-    result = (CvSubdiv2DEdge *) &_result_ref;
-  }
+  result = (CvSubdiv2DEdge *) &(arg1)->ref();
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_size_t, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -4650,7 +4769,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq__ (const octave_value_list& args, int nargout) {
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -4662,20 +4781,20 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq (const octave_value_l
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSubdiv2DEdge_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   arg2 = (CvSubdiv2DEdge_Wrapper *)(argp2);
   result = (bool)(arg1)->operator ==((CvSubdiv2DEdge_Wrapper const &)*arg2);
@@ -4686,7 +4805,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne__ (const octave_value_list& args, int nargout) {
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -4698,20 +4817,20 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne (const octave_value_l
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSubdiv2DEdge_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   arg2 = (CvSubdiv2DEdge_Wrapper *)(argp2);
   result = (bool)(arg1)->operator !=((CvSubdiv2DEdge_Wrapper const &)*arg2);
@@ -4757,8 +4876,8 @@ fail:
 static swig_octave_member swig_CvSubdiv2DEdge_Wrapper_members[] = {
 {"ptr",_wrap_CvSubdiv2DEdge_Wrapper_ptr,0,0,0,0},
 {"ref",_wrap_CvSubdiv2DEdge_Wrapper_ref,0,0,0,0},
-{"__eq",_wrap_CvSubdiv2DEdge_Wrapper___eq,0,0,0,0},
-{"__ne",_wrap_CvSubdiv2DEdge_Wrapper___ne,0,0,0,0},
+{"__eq__",_wrap_CvSubdiv2DEdge_Wrapper___eq__,0,0,0,0},
+{"__ne__",_wrap_CvSubdiv2DEdge_Wrapper___ne__,0,0,0,0},
 {0,0,0,0}
 };
 static const char *swig_CvSubdiv2DEdge_Wrapper_base_names[] = {0};
@@ -5492,6 +5611,79 @@ fail:
 }
 
 
+static octave_value_list _wrap_cvCreateTrackbar2 (const octave_value_list& args, int nargout) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int arg4 ;
+  CvTrackbarCallback2 arg5 = (CvTrackbarCallback2) 0 ;
+  void *arg6 = (void *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int res6 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("cvCreateTrackbar2",args.length(),6,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(args(0), &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCreateTrackbar2" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = (char *)(buf1);
+  res2 = SWIG_AsCharPtrAndSize(args(1), &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCreateTrackbar2" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = (char *)(buf2);
+  {
+    arg3 = (int *)malloc (sizeof (int));
+    *arg3 = OctInt_AsLong (args(2));
+  }
+  ecode4 = SWIG_AsVal_int(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvCreateTrackbar2" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = (int)(val4);
+  {
+    int res = SWIG_ConvertFunctionPtr(args(4), (void**)(&arg5), SWIGTYPE_p_f_int_p_void__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "cvCreateTrackbar2" "', argument " "5"" of type '" "CvTrackbarCallback2""'"); 
+    }
+  }
+  if (5<args.length()) {
+    res6 = SWIG_ConvertPtr(args(5),SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvCreateTrackbar2" "', argument " "6"" of type '" "void *""'"); 
+    }
+  }
+  {
+    try {
+      result = (int)cvCreateTrackbar2((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_cvGetTrackbarPos (const octave_value_list& args, int nargout) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -5686,16 +5878,19 @@ fail:
 static octave_value_list _wrap_cvSaveImage (const octave_value_list& args, int nargout) {
   char *arg1 = (char *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
+  int *arg3 = (int *) 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   bool freearg2 = false ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("cvSaveImage",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvSaveImage",args.length(),3,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(args(0), &buf1, NULL, &alloc1);
@@ -5706,9 +5901,16 @@ static octave_value_list _wrap_cvSaveImage (const octave_value_list& args, int n
   {
     arg2 = OctObject_to_CvArr(args(1), &freearg2);
   }
+  if (2<args.length()) {
+    res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_int, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvSaveImage" "', argument " "3"" of type '" "int const *""'"); 
+    }
+    arg3 = (int *)(argp3);
+  }
   {
     try {
-      result = (int)cvSaveImage((char const *)arg1,(void const *)arg2); 
+      result = (int)cvSaveImage((char const *)arg1,(void const *)arg2,(int const *)arg3); 
     } 
     catch (...) 
     {
@@ -5729,6 +5931,151 @@ fail:
 }
 
 
+static octave_value_list _wrap_cvDecodeImage (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 = (int) 1 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  IplImage *result = 0 ;
+  
+  if (!SWIG_check_num_args("cvDecodeImage",args.length(),2,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvDecodeImage" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  if (1<args.length()) {
+    ecode2 = SWIG_AsVal_int(args(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvDecodeImage" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = (int)(val2);
+  }
+  {
+    try {
+      result = (IplImage *)cvDecodeImage((CvMat const *)arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  {
+    SWIG_exception( SWIG_TypeError, "IplImage * return type is deprecated. Please file a bug report at www.sourceforge.net/opencvlibrary if you see this error message.");
+    SWIG_fail;
+  }
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_cvDecodeImageM (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 = (int) 1 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("cvDecodeImageM",args.length(),2,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvDecodeImageM" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  if (1<args.length()) {
+    ecode2 = SWIG_AsVal_int(args(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "cvDecodeImageM" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = (int)(val2);
+  }
+  {
+    try {
+      result = (CvMat *)cvDecodeImageM((CvMat const *)arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_cvEncodeImage (const octave_value_list& args, int nargout) {
+  char *arg1 = (char *) 0 ;
+  CvArr *arg2 = (CvArr *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  bool freearg2 = false ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("cvEncodeImage",args.length(),3,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(args(0), &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvEncodeImage" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = (char *)(buf1);
+  {
+    arg2 = OctObject_to_CvArr(args(1), &freearg2);
+  }
+  if (2<args.length()) {
+    res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_int, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvEncodeImage" "', argument " "3"" of type '" "int const *""'"); 
+    }
+    arg3 = (int *)(argp3);
+  }
+  {
+    try {
+      result = (CvMat *)cvEncodeImage((char const *)arg1,(void const *)arg2,(int const *)arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_cvConvertImage (const octave_value_list& args, int nargout) {
   CvArr *arg1 = (CvArr *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
@@ -6125,6 +6472,39 @@ fail:
 }
 
 
+static octave_value_list _wrap_cvGetCaptureDomain (const octave_value_list& args, int nargout) {
+  CvCapture *arg1 = (CvCapture *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("cvGetCaptureDomain",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvGetCaptureDomain" "', argument " "1"" of type '" "CvCapture *""'"); 
+  }
+  arg1 = (CvCapture *)(argp1);
+  {
+    try {
+      result = (int)cvGetCaptureDomain(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CV_FOURCC (const octave_value_list& args, int nargout) {
   char arg1 ;
   char arg2 ;
@@ -7366,6 +7746,84 @@ static const char *swig_CvvImage_base_names[] = {0};
 static const swig_type_info *swig_CvvImage_base[] = {0};
 static swig_octave_class _wrap_class_CvvImage = {"CvvImage", &SWIGTYPE_p_CvvImage,0,_wrap_new_CvvImage,0,_wrap_delete_CvvImage,swig_CvvImage_members,swig_CvvImage_base_names,swig_CvvImage_base };
 
+static octave_value_list _wrap_delete_CvCapture (const octave_value_list& args, int nargout) {
+  CvCapture *arg1 = (CvCapture *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvCapture",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvCapture, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvCapture" "', argument " "1"" of type '" "CvCapture *""'"); 
+  }
+  arg1 = (CvCapture *)(argp1);
+  {
+    try {
+      delete_CvCapture(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static swig_octave_member swig_CvCapture_members[] = {
+{0,0,0,0}
+};
+static const char *swig_CvCapture_base_names[] = {0};
+static const swig_type_info *swig_CvCapture_base[] = {0};
+static swig_octave_class _wrap_class_CvCapture = {"CvCapture", &SWIGTYPE_p_CvCapture,0,0,0,_wrap_delete_CvCapture,swig_CvCapture_members,swig_CvCapture_base_names,swig_CvCapture_base };
+
+static octave_value_list _wrap_delete_CvVideoWriter (const octave_value_list& args, int nargout) {
+  CvVideoWriter *arg1 = (CvVideoWriter *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvVideoWriter",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvVideoWriter, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvVideoWriter" "', argument " "1"" of type '" "CvVideoWriter *""'"); 
+  }
+  arg1 = (CvVideoWriter *)(argp1);
+  {
+    try {
+      delete_CvVideoWriter(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static swig_octave_member swig_CvVideoWriter_members[] = {
+{0,0,0,0}
+};
+static const char *swig_CvVideoWriter_base_names[] = {0};
+static const swig_type_info *swig_CvVideoWriter_base[] = {0};
+static swig_octave_class _wrap_class_CvVideoWriter = {"CvVideoWriter", &SWIGTYPE_p_CvVideoWriter,0,0,0,_wrap_delete_CvVideoWriter,swig_CvVideoWriter_members,swig_CvVideoWriter_base_names,swig_CvVideoWriter_base };
+
 static octave_value_list _wrap_cv2mat (const octave_value_list& args, int nargout) {
   CvArr *arg1 = (CvArr *) 0 ;
   bool freearg1 = false ;
@@ -7517,14 +7975,14 @@ static const struct swig_octave_member swig_globals[] = {
 {"new_CvRNG_Wrapper",_wrap_new_CvRNG_Wrapper,0,0,2,0},
 {"CvRNG_Wrapper_ptr",_wrap_CvRNG_Wrapper_ptr,0,0,2,0},
 {"CvRNG_Wrapper_ref",_wrap_CvRNG_Wrapper_ref,0,0,2,0},
-{"CvRNG_Wrapper___eq",_wrap_CvRNG_Wrapper___eq,0,0,2,0},
-{"CvRNG_Wrapper___ne",_wrap_CvRNG_Wrapper___ne,0,0,2,0},
+{"CvRNG_Wrapper___eq__",_wrap_CvRNG_Wrapper___eq__,0,0,2,0},
+{"CvRNG_Wrapper___ne__",_wrap_CvRNG_Wrapper___ne__,0,0,2,0},
 {"delete_CvRNG_Wrapper",_wrap_delete_CvRNG_Wrapper,0,0,2,_wrap_delete_CvRNG_Wrapper_texinfo},
 {"new_CvSubdiv2DEdge_Wrapper",_wrap_new_CvSubdiv2DEdge_Wrapper,0,0,2,0},
 {"CvSubdiv2DEdge_Wrapper_ptr",_wrap_CvSubdiv2DEdge_Wrapper_ptr,0,0,2,0},
 {"CvSubdiv2DEdge_Wrapper_ref",_wrap_CvSubdiv2DEdge_Wrapper_ref,0,0,2,0},
-{"CvSubdiv2DEdge_Wrapper___eq",_wrap_CvSubdiv2DEdge_Wrapper___eq,0,0,2,0},
-{"CvSubdiv2DEdge_Wrapper___ne",_wrap_CvSubdiv2DEdge_Wrapper___ne,0,0,2,0},
+{"CvSubdiv2DEdge_Wrapper___eq__",_wrap_CvSubdiv2DEdge_Wrapper___eq__,0,0,2,0},
+{"CvSubdiv2DEdge_Wrapper___ne__",_wrap_CvSubdiv2DEdge_Wrapper___ne__,0,0,2,0},
 {"delete_CvSubdiv2DEdge_Wrapper",_wrap_delete_CvSubdiv2DEdge_Wrapper,0,0,2,_wrap_delete_CvSubdiv2DEdge_Wrapper_texinfo},
 {"cvSetMouseCallback",_wrap_cvSetMouseCallback,0,0,2,0},
 {"cvLoadImage",_wrap_cvLoadImage,0,0,2,_wrap_cvLoadImage_texinfo},
@@ -7541,11 +7999,15 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvGetWindowHandle",_wrap_cvGetWindowHandle,0,0,2,_wrap_cvGetWindowHandle_texinfo},
 {"cvGetWindowName",_wrap_cvGetWindowName,0,0,2,_wrap_cvGetWindowName_texinfo},
 {"cvCreateTrackbar",_wrap_cvCreateTrackbar,0,0,2,_wrap_cvCreateTrackbar_texinfo},
+{"cvCreateTrackbar2",_wrap_cvCreateTrackbar2,0,0,2,_wrap_cvCreateTrackbar2_texinfo},
 {"cvGetTrackbarPos",_wrap_cvGetTrackbarPos,0,0,2,_wrap_cvGetTrackbarPos_texinfo},
 {"cvSetTrackbarPos",_wrap_cvSetTrackbarPos,0,0,2,_wrap_cvSetTrackbarPos_texinfo},
 {"cvSetMouseCallbackOld",_wrap_cvSetMouseCallbackOld,0,0,2,_wrap_cvSetMouseCallbackOld_texinfo},
 {"cvLoadImageM",_wrap_cvLoadImageM,0,0,2,_wrap_cvLoadImageM_texinfo},
 {"cvSaveImage",_wrap_cvSaveImage,0,0,2,_wrap_cvSaveImage_texinfo},
+{"cvDecodeImage",_wrap_cvDecodeImage,0,0,2,_wrap_cvDecodeImage_texinfo},
+{"cvDecodeImageM",_wrap_cvDecodeImageM,0,0,2,_wrap_cvDecodeImageM_texinfo},
+{"cvEncodeImage",_wrap_cvEncodeImage,0,0,2,_wrap_cvEncodeImage_texinfo},
 {"cvConvertImage",_wrap_cvConvertImage,0,0,2,_wrap_cvConvertImage_texinfo},
 {"cvWaitKey",_wrap_cvWaitKey,0,0,2,_wrap_cvWaitKey_texinfo},
 {"cvCreateFileCapture",_wrap_cvCreateFileCapture,0,0,2,_wrap_cvCreateFileCapture_texinfo},
@@ -7556,6 +8018,7 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvReleaseCapture",_wrap_cvReleaseCapture,0,0,2,_wrap_cvReleaseCapture_texinfo},
 {"cvGetCaptureProperty",_wrap_cvGetCaptureProperty,0,0,2,_wrap_cvGetCaptureProperty_texinfo},
 {"cvSetCaptureProperty",_wrap_cvSetCaptureProperty,0,0,2,_wrap_cvSetCaptureProperty_texinfo},
+{"cvGetCaptureDomain",_wrap_cvGetCaptureDomain,0,0,2,_wrap_cvGetCaptureDomain_texinfo},
 {"CV_FOURCC",_wrap_CV_FOURCC,0,0,2,_wrap_CV_FOURCC_texinfo},
 {"cvCreateVideoWriter",_wrap_cvCreateVideoWriter,0,0,2,_wrap_cvCreateVideoWriter_texinfo},
 {"cvWriteFrame",_wrap_cvWriteFrame,0,0,2,_wrap_cvWriteFrame_texinfo},
@@ -7574,6 +8037,8 @@ static const struct swig_octave_member swig_globals[] = {
 {"CvvImage_Bpp",_wrap_CvvImage_Bpp,0,0,2,_wrap_CvvImage_Bpp_texinfo},
 {"CvvImage_Fill",_wrap_CvvImage_Fill,0,0,2,_wrap_CvvImage_Fill_texinfo},
 {"CvvImage_Show",_wrap_CvvImage_Show,0,0,2,_wrap_CvvImage_Show_texinfo},
+{"delete_CvCapture",_wrap_delete_CvCapture,0,0,2,_wrap_delete_CvCapture_texinfo},
+{"delete_CvVideoWriter",_wrap_delete_CvVideoWriter,0,0,2,_wrap_delete_CvVideoWriter_texinfo},
 {"cv2mat",_wrap_cv2mat,0,0,2,_wrap_cv2mat_texinfo},
 {"mat2cv",_wrap_mat2cv,0,0,2,_wrap_mat2cv_texinfo},
 {"cv2im",_wrap_cv2im,0,0,2,_wrap_cv2im_texinfo},
@@ -7615,7 +8080,7 @@ static swig_type_info _swigt__p_Cv64suf = {"_p_Cv64suf", "Cv64suf *", 0, 0, (voi
 static swig_type_info _swigt__p_CvAttrList = {"_p_CvAttrList", "CvAttrList *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvAvgComp = {"_p_CvAvgComp", "CvAvgComp *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvBox2D = {"_p_CvBox2D", "CvBox2D *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvCapture = {"_p_CvCapture", "CvCapture *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvCapture = {"_p_CvCapture", "CvCapture *", 0, 0, (void*)&_wrap_class_CvCapture, 0};
 static swig_type_info _swigt__p_CvChain = {"_p_CvChain", "CvChain *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvChainPtReader = {"_p_CvChainPtReader", "CvChainPtReader *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConDensation = {"_p_CvConDensation", "CvConDensation *", 0, 0, (void*)0, 0};
@@ -7642,6 +8107,7 @@ static swig_type_info _swigt__p_CvHistogram = {"_p_CvHistogram", "CvHistogram *"
 static swig_type_info _swigt__p_CvHuMoments = {"_p_CvHuMoments", "CvHuMoments *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvKalman = {"_p_CvKalman", "CvKalman *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvLineIterator = {"_p_CvLineIterator", "CvLineIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvMSERParams = {"_p_CvMSERParams", "CvMSERParams *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvMat = {"_p_CvMat", "CvMat *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvMatND = {"_p_CvMatND", "CvMatND *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvMatrix3 = {"_p_CvMatrix3", "CvMatrix3 *", 0, 0, (void*)0, 0};
@@ -7699,7 +8165,7 @@ static swig_type_info _swigt__p_CvSubdiv2DPointLocation = {"_p_CvSubdiv2DPointLo
 static swig_type_info _swigt__p_CvTermCriteria = {"_p_CvTermCriteria", "CvTermCriteria *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvTreeNodeIterator = {"_p_CvTreeNodeIterator", "CvTreeNodeIterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvTypeInfo = {"_p_CvTypeInfo", "CvTypeInfo *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvVideoWriter = {"_p_CvVideoWriter", "CvVideoWriter *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvVideoWriter = {"_p_CvVideoWriter", "CvVideoWriter *", 0, 0, (void*)&_wrap_class_CvVideoWriter, 0};
 static swig_type_info _swigt__p_CvvImage = {"_p_CvvImage", "CvvImage *", 0, 0, (void*)&_wrap_class_CvvImage, 0};
 static swig_type_info _swigt__p__IplConvKernel = {"_p__IplConvKernel", "_IplConvKernel *|IplConvKernel *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p__IplConvKernelFP = {"_p__IplConvKernelFP", "_IplConvKernelFP *|IplConvKernelFP *", 0, 0, (void*)0, 0};
@@ -7711,6 +8177,7 @@ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_int__void = {"_p_f_int__void", "void (*)(int)|CvTrackbarCallback", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_int_int_int_int_p_void__void = {"_p_f_int_int_int_int_p_void__void", "void (*)(int,int,int,int,void *)|CvMouseCallback", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_int_p_void__void = {"_p_f_int_p_void__void", "CvTrackbarCallback2|void (*)(int,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "CvHistType *|int *|CVStatus *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64 *|long long *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_octave_value = {"_p_octave_value", "octave_value *", 0, 0, (void*)0, 0};
@@ -7759,6 +8226,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvHuMoments,
   &_swigt__p_CvKalman,
   &_swigt__p_CvLineIterator,
+  &_swigt__p_CvMSERParams,
   &_swigt__p_CvMat,
   &_swigt__p_CvMatND,
   &_swigt__p_CvMatrix3,
@@ -7828,6 +8296,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_difference_type,
   &_swigt__p_f_int__void,
   &_swigt__p_f_int_int_int_int_p_void__void,
+  &_swigt__p_f_int_p_void__void,
   &_swigt__p_int,
   &_swigt__p_long_long,
   &_swigt__p_octave_value,
@@ -7876,6 +8345,7 @@ static swig_cast_info _swigc__p_CvHistogram[] = {  {&_swigt__p_CvHistogram, 0, 0
 static swig_cast_info _swigc__p_CvHuMoments[] = {  {&_swigt__p_CvHuMoments, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvKalman[] = {  {&_swigt__p_CvKalman, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvLineIterator[] = {  {&_swigt__p_CvLineIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvMSERParams[] = {  {&_swigt__p_CvMSERParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMat[] = {  {&_swigt__p_CvMat, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMatND[] = {  {&_swigt__p_CvMatND, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMatrix3[] = {  {&_swigt__p_CvMatrix3, 0, 0, 0},{0, 0, 0, 0}};
@@ -7945,6 +8415,7 @@ static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0,
 static swig_cast_info _swigc__p_difference_type[] = {  {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_int__void[] = {  {&_swigt__p_f_int__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_int_int_int_int_p_void__void[] = {  {&_swigt__p_f_int_int_int_int_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_int_p_void__void[] = {  {&_swigt__p_f_int_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_octave_value[] = {  {&_swigt__p_octave_value, 0, 0, 0},{0, 0, 0, 0}};
@@ -7993,6 +8464,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvHuMoments,
   _swigc__p_CvKalman,
   _swigc__p_CvLineIterator,
+  _swigc__p_CvMSERParams,
   _swigc__p_CvMat,
   _swigc__p_CvMatND,
   _swigc__p_CvMatrix3,
@@ -8062,6 +8534,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_difference_type,
   _swigc__p_f_int__void,
   _swigc__p_f_int_int_int_int_p_void__void,
+  _swigc__p_f_int_p_void__void,
   _swigc__p_int,
   _swigc__p_long_long,
   _swigc__p_octave_value,
@@ -8409,6 +8882,9 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_LOAD_IMAGE_COLOR",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CV_LOAD_IMAGE_ANYDEPTH",SWIG_From_int((int)(2)));
   SWIG_Octave_SetConstant(module_ns,"CV_LOAD_IMAGE_ANYCOLOR",SWIG_From_int((int)(4)));
+  SWIG_Octave_SetConstant(module_ns,"CV_IMWRITE_JPEG_QUALITY",SWIG_From_int((int)(1)));
+  SWIG_Octave_SetConstant(module_ns,"CV_IMWRITE_PNG_COMPRESSION",SWIG_From_int((int)(16)));
+  SWIG_Octave_SetConstant(module_ns,"CV_IMWRITE_PXM_BINARY",SWIG_From_int((int)(32)));
   SWIG_Octave_SetConstant(module_ns,"CV_CVTIMG_FLIP",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CV_CVTIMG_SWAP_RB",SWIG_From_int((int)(2)));
   SWIG_Octave_SetConstant(module_ns,"CV_CAP_ANY",SWIG_From_int((int)(0)));
@@ -8445,9 +8921,10 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_SATURATION",SWIG_From_int((int)(12)));
   SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_HUE",SWIG_From_int((int)(13)));
   SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_GAIN",SWIG_From_int((int)(14)));
-  SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_CONVERT_RGB",SWIG_From_int((int)(15)));
-  SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_WHITE_BALANCE",SWIG_From_int((int)(16)));
-  SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_RECTIFICATION",SWIG_From_int((int)(17)));
+  SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_EXPOSURE",SWIG_From_int((int)(15)));
+  SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_CONVERT_RGB",SWIG_From_int((int)(16)));
+  SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_WHITE_BALANCE",SWIG_From_int((int)(17)));
+  SWIG_Octave_SetConstant(module_ns,"CV_CAP_PROP_RECTIFICATION",SWIG_From_int((int)(18)));
   SWIG_Octave_SetConstant(module_ns,"CV_FOURCC_PROMPT",SWIG_From_int((int)(-1)));
   SWIG_Octave_SetConstant(module_ns,"HG_AUTOSIZE",SWIG_From_int((int)(1)));
 }
index ce42e91a46b32662ffa37ea881b6cf3d97d309ef..d5597209103f13c646783e3fdd43b73c9486def4 100644 (file)
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.36
+ * Version 1.3.39
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -8,22 +8,27 @@
  * interface file instead. 
  * ----------------------------------------------------------------------------- */
 
+#define SWIGOCTAVE
 #define SWIG_name_d      "ml"
 #define SWIG_name        ml
 
+
 #ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
-    T *tt;
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
-    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
 
 template <typename T> T SwigValueInit() {
@@ -145,11 +150,12 @@ template <typename T> T SwigValueInit() {
 #include <octave/parse.h>
 #include <octave/ov-fcn-handle.h>
 #include <octave/Cell.h>
+#include <octave/oct-map.h>
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
  * type checking.
  * ----------------------------------------------------------------------------- */
 
@@ -168,11 +174,11 @@ template <typename T> T SwigValueInit() {
 
 /*
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the swig runtime code.
-  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  creating a static or dynamic library from the SWIG runtime code.
+  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
   
-  But only do this if is strictly necessary, ie, if you have problems
-  with your compiler or so.
+  But only do this if strictly necessary, ie, if you have problems
+  with your compiler or suchlike.
 */
 
 #ifndef SWIGRUNTIME
@@ -199,14 +205,14 @@ template <typename T> T SwigValueInit() {
 /* 
    Flags/methods for returning states.
    
-   The swig conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
    Use the following macros/flags to set or process the returning
    states.
    
-   In old swig versions, you usually write code as:
+   In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
        // success code
@@ -214,7 +220,7 @@ template <typename T> T SwigValueInit() {
        //fail code
      }
 
-   Now you can be more explicit as:
+   Now you can be more explicit:
 
     int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
     if (SWIG_IsOK(res)) {
@@ -223,7 +229,7 @@ template <typename T> T SwigValueInit() {
       // fail code
     }
 
-   that seems to be the same, but now you can also do
+   which is the same really, but now you can also do
 
     Type *ptr;
     int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -241,7 +247,7 @@ template <typename T> T SwigValueInit() {
     
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
-   requires also to SWIG_ConvertPtr to return new result values, as
+   also requires SWIG_ConvertPtr to return new result values, such as
 
       int SWIG_ConvertPtr(obj, ptr,...) {         
         if (<obj is ok>) {                            
@@ -259,7 +265,7 @@ template <typename T> T SwigValueInit() {
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
    more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   swig errors code.
+   SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
    allows to return the 'cast rank', for example, if you have this
@@ -273,9 +279,8 @@ template <typename T> T SwigValueInit() {
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
+*/
 
-
- */
 #define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
@@ -300,7 +305,6 @@ template <typename T> T SwigValueInit() {
 #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
 #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
 
-
 /* Cast-Rank Mode */
 #if defined(SWIG_CASTRANK_MODE)
 #  ifndef SWIG_TypeRank
@@ -323,8 +327,6 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
-
-
 #include <string.h>
 
 #ifdef __cplusplus
@@ -421,40 +423,58 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
 }
 
 
-/* think of this as a c++ template<> or a scheme macro */
-#define SWIG_TypeCheck_Template(comparison, ty)         \
-  if (ty) {                                             \
-    swig_cast_info *iter = ty->cast;                    \
-    while (iter) {                                      \
-      if (comparison) {                                 \
-        if (iter == ty->cast) return iter;              \
-        /* Move iter to the top of the linked list */   \
-        iter->prev->next = iter->next;                  \
-        if (iter->next)                                 \
-          iter->next->prev = iter->prev;                \
-        iter->next = ty->cast;                          \
-        iter->prev = 0;                                 \
-        if (ty->cast) ty->cast->prev = iter;            \
-        ty->cast = iter;                                \
-        return iter;                                    \
-      }                                                 \
-      iter = iter->next;                                \
-    }                                                   \
-  }                                                     \
-  return 0
-
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (strcmp(iter->type->name, c) == 0) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
-/* Same as previous function, except strcmp is replaced with a pointer comparison */
+/* 
+  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
-  SWIG_TypeCheck_Template(iter->type == from, into);
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (iter->type == from) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
 /*
@@ -1324,7 +1344,7 @@ namespace Swig {
       // index operator
       else {
        if (ops[skip] == '(' || ops[skip] == '{') {
-         const char *op_name = ops[skip] == '(' ? "__paren" : "__brace";
+         const char *op_name = ops[skip] == '(' ? "__paren__" : "__brace__";
          octave_value_list args;
          args.append(*idx_it++);
          ++skip;
@@ -1363,7 +1383,7 @@ namespace Swig {
       }
 
       else if (ops[skip] == '(' || ops[skip] == '{') {
-       const char *op_name = ops[skip] == '(' ? "__paren_asgn" : "__brace_asgn";
+       const char *op_name = ops[skip] == '(' ? "__paren_asgn__" : "__brace_asgn__";
        member_value_pair *m = find_member(op_name, false);
        if (m) {
          octave_value_list args;
@@ -1401,40 +1421,27 @@ namespace Swig {
 
     virtual bool is_string() const {
       octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      return !!nc_this->find_member("__str", false);
+      return !!nc_this->find_member("__str__", false);
     }
 
     virtual std::string string_value(bool force = false) const {
       octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member("__str", false);
+      member_value_pair *m = nc_this->find_member("__str__", false);
       if (!m) {
-       error("__str method not defined");
+       error("__str__ method not defined");
        return std::string();
       }
       octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
       if (outarg.length() < 1 || !outarg(0).is_string()) {
-       error("__str method did not return a string");
+       error("__str__ method did not return a string");
        return std::string();
       }
       return outarg(0).string_value();
     }
 
-    /*
     virtual Octave_map map_value() const {
-      octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
-      member_value_pair *m = nc_this->find_member("__str", false);
-      if (!m) {
-       error("__map method not defined");
-       return std::string();
-      }
-      octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
-      if (outarg.length() < 1 || !outarg(0).is_map()) {
-       error("__map method did not return a string");
-       return std::string();
-      }
-      return outarg(0).map_value();
+      return Octave_map();
     }
-    */
 
     virtual string_vector map_keys() const {
       member_map tmp;
@@ -1448,6 +1455,35 @@ namespace Swig {
       return keys;
     }
 
+    virtual bool save_ascii (std::ostream& os) {
+      return true;
+    }
+
+    virtual bool load_ascii (std::istream& is) {
+      return true;
+    }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
+      return true;
+    }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt) {
+      return true;
+    }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
+      return true;
+    }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
+      return true;
+    }
+#endif
+
     virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const {
       return string_value();
     }
@@ -1472,7 +1508,7 @@ namespace Swig {
       assert(ost);
 
       octave_value ret;
-      if (ost->dispatch_unary_op(std::string("__") + op_name, ret))
+      if (ost->dispatch_unary_op(std::string("__") + op_name + std::string("__"), ret))
        return ret;
       std::string symbol = "op_" + ost->swig_type_name() + "_" + op_name;
       octave_value_list args;
@@ -1489,7 +1525,7 @@ namespace Swig {
       octave_swig_type *rhs_ost = Swig::swig_value_deref(rhs);
 
       octave_value ret;
-      if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name, rhs, ret))
+      if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name + std::string("__"), rhs, ret))
        return ret;
 
       std::string symbol;
@@ -1611,9 +1647,35 @@ namespace Swig {
     virtual std::string string_value(bool force = false) const 
       { return ptr->string_value(force); }
 
+    virtual Octave_map map_value() const
+      { return ptr->map_value(); }
+
     virtual string_vector map_keys() const
       { return ptr->map_keys(); }
 
+    virtual bool save_ascii (std::ostream& os)
+      { return ptr->save_ascii(os); }
+
+    virtual bool load_ascii (std::istream& is)
+      { return ptr->load_ascii(is); }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats)
+      { return ptr->save_binary(os, save_as_floats); }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt)
+      { return ptr->load_binary(is, swap, fmt); }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
+      { return ptr->save_hdf5(loc_id, name, save_as_floats); }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug)
+      { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); }
+#endif
+
     virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const
       { return ptr->convert_to_str(pad, force, type); }
 
@@ -1662,6 +1724,37 @@ namespace Swig {
     void print(std::ostream &os, bool pr_as_read_syntax = false) const {
       os << "swig packed type: name = " << (type ? type->name : std::string()) << ", len = " << buf.size() << std::endl;
     }
+
+
+    virtual bool save_ascii (std::ostream& os) {
+      return true;
+    }
+
+    virtual bool load_ascii (std::istream& is) {
+      return true;
+    }
+
+    virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
+      return true;
+    }
+
+    virtual bool load_binary (std::istream& is, bool swap, 
+                             oct_mach_info::float_format fmt) {
+      return true;
+    }
+
+#if defined (HAVE_HDF5)
+    virtual bool
+      save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
+      return true;
+    }
+
+    virtual bool
+      load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
+      return true;
+    }
+#endif
+
   private:
     DECLARE_OCTAVE_ALLOCATOR;
     DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
@@ -2061,122 +2154,131 @@ SWIGRUNTIME void SWIG_Octave_SetModule(void *clientdata, swig_module_info *point
 #define SWIGTYPE_p_CvDTreeTrainData swig_types[27]
 #define SWIGTYPE_p_CvEM swig_types[28]
 #define SWIGTYPE_p_CvEMParams swig_types[29]
-#define SWIGTYPE_p_CvFileNode swig_types[30]
-#define SWIGTYPE_p_CvFileStorage swig_types[31]
-#define SWIGTYPE_p_CvFilter swig_types[32]
-#define SWIGTYPE_p_CvFont swig_types[33]
-#define SWIGTYPE_p_CvForestTree swig_types[34]
-#define SWIGTYPE_p_CvGenericHash swig_types[35]
-#define SWIGTYPE_p_CvGraph swig_types[36]
-#define SWIGTYPE_p_CvGraphEdge swig_types[37]
-#define SWIGTYPE_p_CvGraphScanner swig_types[38]
-#define SWIGTYPE_p_CvGraphVtx swig_types[39]
-#define SWIGTYPE_p_CvGraphVtx2D swig_types[40]
-#define SWIGTYPE_p_CvHaarClassifier swig_types[41]
-#define SWIGTYPE_p_CvHaarClassifierCascade swig_types[42]
-#define SWIGTYPE_p_CvHaarFeature swig_types[43]
-#define SWIGTYPE_p_CvHaarStageClassifier swig_types[44]
-#define SWIGTYPE_p_CvHidHaarClassifierCascade swig_types[45]
-#define SWIGTYPE_p_CvHistogram swig_types[46]
-#define SWIGTYPE_p_CvHuMoments swig_types[47]
-#define SWIGTYPE_p_CvKNearest swig_types[48]
-#define SWIGTYPE_p_CvKalman swig_types[49]
-#define SWIGTYPE_p_CvLineIterator swig_types[50]
-#define SWIGTYPE_p_CvMat swig_types[51]
-#define SWIGTYPE_p_CvMatND swig_types[52]
-#define SWIGTYPE_p_CvMatrix3 swig_types[53]
-#define SWIGTYPE_p_CvMemBlock swig_types[54]
-#define SWIGTYPE_p_CvMemStorage swig_types[55]
-#define SWIGTYPE_p_CvMemStoragePos swig_types[56]
-#define SWIGTYPE_p_CvModuleInfo swig_types[57]
-#define SWIGTYPE_p_CvMoments swig_types[58]
-#define SWIGTYPE_p_CvNArrayIterator swig_types[59]
-#define SWIGTYPE_p_CvNextEdgeType swig_types[60]
-#define SWIGTYPE_p_CvNormalBayesClassifier swig_types[61]
-#define SWIGTYPE_p_CvPOSITObject swig_types[62]
-#define SWIGTYPE_p_CvPair32s32f swig_types[63]
-#define SWIGTYPE_p_CvParamGrid swig_types[64]
-#define SWIGTYPE_p_CvPluginFuncInfo swig_types[65]
-#define SWIGTYPE_p_CvPoint swig_types[66]
-#define SWIGTYPE_p_CvPoint2D32f swig_types[67]
-#define SWIGTYPE_p_CvPoint2D64f swig_types[68]
-#define SWIGTYPE_p_CvPoint3D32f swig_types[69]
-#define SWIGTYPE_p_CvPoint3D64f swig_types[70]
-#define SWIGTYPE_p_CvQuadEdge2D swig_types[71]
-#define SWIGTYPE_p_CvRNG_Wrapper swig_types[72]
-#define SWIGTYPE_p_CvRTParams swig_types[73]
-#define SWIGTYPE_p_CvRTrees swig_types[74]
-#define SWIGTYPE_p_CvRect swig_types[75]
-#define SWIGTYPE_p_CvSURFParams swig_types[76]
-#define SWIGTYPE_p_CvSURFPoint swig_types[77]
-#define SWIGTYPE_p_CvSVM swig_types[78]
-#define SWIGTYPE_p_CvSVMDecisionFunc swig_types[79]
-#define SWIGTYPE_p_CvSVMKernel swig_types[80]
-#define SWIGTYPE_p_CvSVMKernelRow swig_types[81]
-#define SWIGTYPE_p_CvSVMParams swig_types[82]
-#define SWIGTYPE_p_CvSVMSolutionInfo swig_types[83]
-#define SWIGTYPE_p_CvSVMSolver swig_types[84]
-#define SWIGTYPE_p_CvScalar swig_types[85]
-#define SWIGTYPE_p_CvSeq swig_types[86]
-#define SWIGTYPE_p_CvSeqBlock swig_types[87]
-#define SWIGTYPE_p_CvSeqReader swig_types[88]
-#define SWIGTYPE_p_CvSeqWriter swig_types[89]
-#define SWIGTYPE_p_CvSet swig_types[90]
-#define SWIGTYPE_p_CvSetElem swig_types[91]
-#define SWIGTYPE_p_CvSize swig_types[92]
-#define SWIGTYPE_p_CvSize2D32f swig_types[93]
-#define SWIGTYPE_p_CvSlice swig_types[94]
-#define SWIGTYPE_p_CvSparseMat swig_types[95]
-#define SWIGTYPE_p_CvSparseMatIterator swig_types[96]
-#define SWIGTYPE_p_CvSparseNode swig_types[97]
-#define SWIGTYPE_p_CvStarDetectorParams swig_types[98]
-#define SWIGTYPE_p_CvStarKeypoint swig_types[99]
-#define SWIGTYPE_p_CvStatModel swig_types[100]
-#define SWIGTYPE_p_CvStereoBMState swig_types[101]
-#define SWIGTYPE_p_CvStereoGCState swig_types[102]
-#define SWIGTYPE_p_CvString swig_types[103]
-#define SWIGTYPE_p_CvStringHashNode swig_types[104]
-#define SWIGTYPE_p_CvSubdiv2D swig_types[105]
-#define SWIGTYPE_p_CvSubdiv2DEdge_Wrapper swig_types[106]
-#define SWIGTYPE_p_CvSubdiv2DPoint swig_types[107]
-#define SWIGTYPE_p_CvSubdiv2DPointLocation swig_types[108]
-#define SWIGTYPE_p_CvTermCriteria swig_types[109]
-#define SWIGTYPE_p_CvTreeNodeIterator swig_types[110]
-#define SWIGTYPE_p_CvTypeInfo swig_types[111]
-#define SWIGTYPE_p_CvVectors swig_types[112]
-#define SWIGTYPE_p_CvVectors_data swig_types[113]
-#define SWIGTYPE_p_GetRow swig_types[114]
-#define SWIGTYPE_p_SelectWorkingSet swig_types[115]
-#define SWIGTYPE_p__IplConvKernel swig_types[116]
-#define SWIGTYPE_p__IplConvKernelFP swig_types[117]
-#define SWIGTYPE_p__IplImage swig_types[118]
-#define SWIGTYPE_p__IplROI swig_types[119]
-#define SWIGTYPE_p__IplTileInfo swig_types[120]
-#define SWIGTYPE_p_bool swig_types[121]
-#define SWIGTYPE_p_char swig_types[122]
-#define SWIGTYPE_p_double swig_types[123]
-#define SWIGTYPE_p_float swig_types[124]
-#define SWIGTYPE_p_int swig_types[125]
-#define SWIGTYPE_p_long_long swig_types[126]
-#define SWIGTYPE_p_p_CvMat swig_types[127]
-#define SWIGTYPE_p_p_double swig_types[128]
-#define SWIGTYPE_p_p_float swig_types[129]
-#define SWIGTYPE_p_p_unsigned_char swig_types[130]
-#define SWIGTYPE_p_signed_char swig_types[131]
-#define SWIGTYPE_p_size_t swig_types[132]
-#define SWIGTYPE_p_unsigned_char swig_types[133]
-#define SWIGTYPE_p_unsigned_long_long swig_types[134]
-#define SWIGTYPE_p_unsigned_short swig_types[135]
-#define SWIGTYPE_p_void swig_types[136]
-static swig_type_info *swig_types[138];
-static swig_module_info swig_module = {swig_types, 137, 0, 0, 0, 0};
+#define SWIGTYPE_p_CvERTreeTrainData swig_types[30]
+#define SWIGTYPE_p_CvERTrees swig_types[31]
+#define SWIGTYPE_p_CvFileNode swig_types[32]
+#define SWIGTYPE_p_CvFileStorage swig_types[33]
+#define SWIGTYPE_p_CvFilter swig_types[34]
+#define SWIGTYPE_p_CvFont swig_types[35]
+#define SWIGTYPE_p_CvForestERTree swig_types[36]
+#define SWIGTYPE_p_CvForestTree swig_types[37]
+#define SWIGTYPE_p_CvGenericHash swig_types[38]
+#define SWIGTYPE_p_CvGraph swig_types[39]
+#define SWIGTYPE_p_CvGraphEdge swig_types[40]
+#define SWIGTYPE_p_CvGraphScanner swig_types[41]
+#define SWIGTYPE_p_CvGraphVtx swig_types[42]
+#define SWIGTYPE_p_CvGraphVtx2D swig_types[43]
+#define SWIGTYPE_p_CvHaarClassifier swig_types[44]
+#define SWIGTYPE_p_CvHaarClassifierCascade swig_types[45]
+#define SWIGTYPE_p_CvHaarFeature swig_types[46]
+#define SWIGTYPE_p_CvHaarStageClassifier swig_types[47]
+#define SWIGTYPE_p_CvHidHaarClassifierCascade swig_types[48]
+#define SWIGTYPE_p_CvHistogram swig_types[49]
+#define SWIGTYPE_p_CvHuMoments swig_types[50]
+#define SWIGTYPE_p_CvKNearest swig_types[51]
+#define SWIGTYPE_p_CvKalman swig_types[52]
+#define SWIGTYPE_p_CvLineIterator swig_types[53]
+#define SWIGTYPE_p_CvMLData swig_types[54]
+#define SWIGTYPE_p_CvMSERParams swig_types[55]
+#define SWIGTYPE_p_CvMat swig_types[56]
+#define SWIGTYPE_p_CvMatND swig_types[57]
+#define SWIGTYPE_p_CvMatrix3 swig_types[58]
+#define SWIGTYPE_p_CvMemBlock swig_types[59]
+#define SWIGTYPE_p_CvMemStorage swig_types[60]
+#define SWIGTYPE_p_CvMemStoragePos swig_types[61]
+#define SWIGTYPE_p_CvModuleInfo swig_types[62]
+#define SWIGTYPE_p_CvMoments swig_types[63]
+#define SWIGTYPE_p_CvNArrayIterator swig_types[64]
+#define SWIGTYPE_p_CvNextEdgeType swig_types[65]
+#define SWIGTYPE_p_CvNormalBayesClassifier swig_types[66]
+#define SWIGTYPE_p_CvPOSITObject swig_types[67]
+#define SWIGTYPE_p_CvPair16u32s swig_types[68]
+#define SWIGTYPE_p_CvParamGrid swig_types[69]
+#define SWIGTYPE_p_CvPluginFuncInfo swig_types[70]
+#define SWIGTYPE_p_CvPoint swig_types[71]
+#define SWIGTYPE_p_CvPoint2D32f swig_types[72]
+#define SWIGTYPE_p_CvPoint2D64f swig_types[73]
+#define SWIGTYPE_p_CvPoint3D32f swig_types[74]
+#define SWIGTYPE_p_CvPoint3D64f swig_types[75]
+#define SWIGTYPE_p_CvQuadEdge2D swig_types[76]
+#define SWIGTYPE_p_CvRNG_Wrapper swig_types[77]
+#define SWIGTYPE_p_CvRTParams swig_types[78]
+#define SWIGTYPE_p_CvRTrees swig_types[79]
+#define SWIGTYPE_p_CvRect swig_types[80]
+#define SWIGTYPE_p_CvSURFParams swig_types[81]
+#define SWIGTYPE_p_CvSURFPoint swig_types[82]
+#define SWIGTYPE_p_CvSVM swig_types[83]
+#define SWIGTYPE_p_CvSVMDecisionFunc swig_types[84]
+#define SWIGTYPE_p_CvSVMKernel swig_types[85]
+#define SWIGTYPE_p_CvSVMKernelRow swig_types[86]
+#define SWIGTYPE_p_CvSVMParams swig_types[87]
+#define SWIGTYPE_p_CvSVMSolutionInfo swig_types[88]
+#define SWIGTYPE_p_CvSVMSolver swig_types[89]
+#define SWIGTYPE_p_CvScalar swig_types[90]
+#define SWIGTYPE_p_CvSeq swig_types[91]
+#define SWIGTYPE_p_CvSeqBlock swig_types[92]
+#define SWIGTYPE_p_CvSeqReader swig_types[93]
+#define SWIGTYPE_p_CvSeqWriter swig_types[94]
+#define SWIGTYPE_p_CvSet swig_types[95]
+#define SWIGTYPE_p_CvSetElem swig_types[96]
+#define SWIGTYPE_p_CvSize swig_types[97]
+#define SWIGTYPE_p_CvSize2D32f swig_types[98]
+#define SWIGTYPE_p_CvSlice swig_types[99]
+#define SWIGTYPE_p_CvSparseMat swig_types[100]
+#define SWIGTYPE_p_CvSparseMatIterator swig_types[101]
+#define SWIGTYPE_p_CvSparseNode swig_types[102]
+#define SWIGTYPE_p_CvStarDetectorParams swig_types[103]
+#define SWIGTYPE_p_CvStarKeypoint swig_types[104]
+#define SWIGTYPE_p_CvStatModel swig_types[105]
+#define SWIGTYPE_p_CvStereoBMState swig_types[106]
+#define SWIGTYPE_p_CvStereoGCState swig_types[107]
+#define SWIGTYPE_p_CvString swig_types[108]
+#define SWIGTYPE_p_CvStringHashNode swig_types[109]
+#define SWIGTYPE_p_CvSubdiv2D swig_types[110]
+#define SWIGTYPE_p_CvSubdiv2DEdge_Wrapper swig_types[111]
+#define SWIGTYPE_p_CvSubdiv2DPoint swig_types[112]
+#define SWIGTYPE_p_CvSubdiv2DPointLocation swig_types[113]
+#define SWIGTYPE_p_CvTermCriteria swig_types[114]
+#define SWIGTYPE_p_CvTrainTestSplit swig_types[115]
+#define SWIGTYPE_p_CvTrainTestSplit_class_part swig_types[116]
+#define SWIGTYPE_p_CvTrainTestSplit_train_sample_part swig_types[117]
+#define SWIGTYPE_p_CvTreeNodeIterator swig_types[118]
+#define SWIGTYPE_p_CvTypeInfo swig_types[119]
+#define SWIGTYPE_p_CvVectors swig_types[120]
+#define SWIGTYPE_p_CvVectors_data swig_types[121]
+#define SWIGTYPE_p_GetRow swig_types[122]
+#define SWIGTYPE_p_SelectWorkingSet swig_types[123]
+#define SWIGTYPE_p__IplConvKernel swig_types[124]
+#define SWIGTYPE_p__IplConvKernelFP swig_types[125]
+#define SWIGTYPE_p__IplImage swig_types[126]
+#define SWIGTYPE_p__IplROI swig_types[127]
+#define SWIGTYPE_p__IplTileInfo swig_types[128]
+#define SWIGTYPE_p_bool swig_types[129]
+#define SWIGTYPE_p_char swig_types[130]
+#define SWIGTYPE_p_double swig_types[131]
+#define SWIGTYPE_p_float swig_types[132]
+#define SWIGTYPE_p_int swig_types[133]
+#define SWIGTYPE_p_long_long swig_types[134]
+#define SWIGTYPE_p_p_CvMat swig_types[135]
+#define SWIGTYPE_p_p_double swig_types[136]
+#define SWIGTYPE_p_p_float swig_types[137]
+#define SWIGTYPE_p_p_int swig_types[138]
+#define SWIGTYPE_p_p_unsigned_char swig_types[139]
+#define SWIGTYPE_p_signed_char swig_types[140]
+#define SWIGTYPE_p_size_t swig_types[141]
+#define SWIGTYPE_p_unsigned_char swig_types[142]
+#define SWIGTYPE_p_unsigned_long_long swig_types[143]
+#define SWIGTYPE_p_unsigned_short swig_types[144]
+#define SWIGTYPE_p_void swig_types[145]
+static swig_type_info *swig_types[147];
+static swig_module_info swig_module = {swig_types, 146, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 /* -------- TYPES TABLE (END) -------- */
 
 
-#define SWIGVERSION 0x010336 
+#define SWIGVERSION 0x010339 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2743,6 +2845,70 @@ SWIG_AsVal_float (octave_value obj, float *val)
 }
 
 
+typedef union {
+        int *count;
+        float *portion;
+    } CvTrainTestSplit_class_part;
+
+
+
+typedef union {
+        int count;
+        float portion;
+    } CvTrainTestSplit_train_sample_part;
+
+
+
+SWIGINTERN int
+SWIG_AsCharArray(octave_value obj, char *val, size_t size)
+{ 
+  char* cptr = 0; size_t csize = 0; int alloc = SWIG_OLDOBJ;
+  int res = SWIG_AsCharPtrAndSize(obj, &cptr, &csize, &alloc);
+  if (SWIG_IsOK(res)) {
+    if ((csize == size + 1) && cptr && !(cptr[csize-1])) --csize;
+    if (csize <= size) {
+      if (val) {
+       if (csize) memcpy(val, cptr, csize*sizeof(char));
+       if (csize < size) memset(val + csize, 0, (size - csize)*sizeof(char));
+      }
+      if (alloc == SWIG_NEWOBJ) {
+       delete[] cptr;
+       res = SWIG_DelNewMask(res);
+      }      
+      return res;
+    }
+    if (alloc == SWIG_NEWOBJ) delete[] cptr;
+  }
+  return SWIG_TypeError;
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_char (octave_value obj, char *val)
+{    
+  int res = SWIG_AsCharArray(obj, val, 1);
+  if (!SWIG_IsOK(res)) {
+    long v;
+    res = SWIG_AddCast(SWIG_AsVal_long (obj, &v));
+    if (SWIG_IsOK(res)) {
+      if ((CHAR_MIN <= v) && (v <= CHAR_MAX)) {
+       if (val) *val = (char)(v);
+      } else {
+       res = SWIG_OverflowError;
+      }
+    }
+  }
+  return res;
+}
+
+
+SWIGINTERNINLINE octave_value
+SWIG_From_char  (char c) 
+{ 
+  return SWIG_FromCharPtrAndSize(&c,1);
+}
+
+
 static octave_value_list _wrap_new_CvRNG_Wrapper (const octave_value_list& args, int nargout) {
   CvRNG *arg1 = 0 ;
   CvRNG temp1 ;
@@ -2812,10 +2978,7 @@ static octave_value_list _wrap_CvRNG_Wrapper_ref (const octave_value_list& args,
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper_ref" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
-  {
-    CvRNG &_result_ref = (arg1)->ref();
-    result = (CvRNG *) &_result_ref;
-  }
+  result = (CvRNG *) &(arg1)->ref();
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_long_long, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -2823,7 +2986,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRNG_Wrapper___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRNG_Wrapper___eq__ (const octave_value_list& args, int nargout) {
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -2835,20 +2998,20 @@ static octave_value_list _wrap_CvRNG_Wrapper___eq (const octave_value_list& args
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRNG_Wrapper___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRNG_Wrapper___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___eq" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___eq__" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvRNG_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___eq" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___eq__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___eq" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___eq__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   arg2 = (CvRNG_Wrapper *)(argp2);
   result = (bool)(arg1)->operator ==((CvRNG_Wrapper const &)*arg2);
@@ -2859,7 +3022,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRNG_Wrapper___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRNG_Wrapper___ne__ (const octave_value_list& args, int nargout) {
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -2871,20 +3034,20 @@ static octave_value_list _wrap_CvRNG_Wrapper___ne (const octave_value_list& args
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRNG_Wrapper___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRNG_Wrapper___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___ne" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper___ne__" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = (CvRNG_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvRNG_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___ne" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRNG_Wrapper___ne__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___ne" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRNG_Wrapper___ne__" "', argument " "2"" of type '" "CvRNG_Wrapper const &""'"); 
   }
   arg2 = (CvRNG_Wrapper *)(argp2);
   result = (bool)(arg1)->operator !=((CvRNG_Wrapper const &)*arg2);
@@ -2930,8 +3093,8 @@ fail:
 static swig_octave_member swig_CvRNG_Wrapper_members[] = {
 {"ptr",_wrap_CvRNG_Wrapper_ptr,0,0,0,0},
 {"ref",_wrap_CvRNG_Wrapper_ref,0,0,0,0},
-{"__eq",_wrap_CvRNG_Wrapper___eq,0,0,0,0},
-{"__ne",_wrap_CvRNG_Wrapper___ne,0,0,0,0},
+{"__eq__",_wrap_CvRNG_Wrapper___eq__,0,0,0,0},
+{"__ne__",_wrap_CvRNG_Wrapper___ne__,0,0,0,0},
 {0,0,0,0}
 };
 static const char *swig_CvRNG_Wrapper_base_names[] = {0};
@@ -3007,10 +3170,7 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper_ref (const octave_value_li
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper_ref" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
-  {
-    CvSubdiv2DEdge &_result_ref = (arg1)->ref();
-    result = (CvSubdiv2DEdge *) &_result_ref;
-  }
+  result = (CvSubdiv2DEdge *) &(arg1)->ref();
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_size_t, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -3018,7 +3178,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq__ (const octave_value_list& args, int nargout) {
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -3030,20 +3190,20 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___eq (const octave_value_l
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___eq",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___eq__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSubdiv2DEdge_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___eq" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___eq__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   arg2 = (CvSubdiv2DEdge_Wrapper *)(argp2);
   result = (bool)(arg1)->operator ==((CvSubdiv2DEdge_Wrapper const &)*arg2);
@@ -3054,7 +3214,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne__ (const octave_value_list& args, int nargout) {
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
   void *argp1 = 0 ;
@@ -3066,20 +3226,20 @@ static octave_value_list _wrap_CvSubdiv2DEdge_Wrapper___ne (const octave_value_l
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___ne",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvSubdiv2DEdge_Wrapper___ne__",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = (CvSubdiv2DEdge_Wrapper *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSubdiv2DEdge_Wrapper,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___ne" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvSubdiv2DEdge_Wrapper___ne__" "', argument " "2"" of type '" "CvSubdiv2DEdge_Wrapper const &""'"); 
   }
   arg2 = (CvSubdiv2DEdge_Wrapper *)(argp2);
   result = (bool)(arg1)->operator !=((CvSubdiv2DEdge_Wrapper const &)*arg2);
@@ -3125,8 +3285,8 @@ fail:
 static swig_octave_member swig_CvSubdiv2DEdge_Wrapper_members[] = {
 {"ptr",_wrap_CvSubdiv2DEdge_Wrapper_ptr,0,0,0,0},
 {"ref",_wrap_CvSubdiv2DEdge_Wrapper_ref,0,0,0,0},
-{"__eq",_wrap_CvSubdiv2DEdge_Wrapper___eq,0,0,0,0},
-{"__ne",_wrap_CvSubdiv2DEdge_Wrapper___ne,0,0,0,0},
+{"__eq__",_wrap_CvSubdiv2DEdge_Wrapper___eq__,0,0,0,0},
+{"__ne__",_wrap_CvSubdiv2DEdge_Wrapper___ne__,0,0,0,0},
 {0,0,0,0}
 };
 static const char *swig_CvSubdiv2DEdge_Wrapper_base_names[] = {0};
@@ -17134,31 +17294,31 @@ static const char *swig_CvEM_base_names[] = {"_p_CvStatModel",0};
 static const swig_type_info *swig_CvEM_base[] = {0,0};
 static swig_octave_class _wrap_class_CvEM = {"CvEM", &SWIGTYPE_p_CvEM,0,_wrap_new_CvEM,0,_wrap_delete_CvEM,swig_CvEM_members,swig_CvEM_base_names,swig_CvEM_base };
 
-static octave_value_list _wrap_CvPair32s32f_i_set (const octave_value_list& args, int nargout) {
-  CvPair32s32f *arg1 = (CvPair32s32f *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_CvPair16u32s_u_set (const octave_value_list& args, int nargout) {
+  CvPair16u32s *arg1 = (CvPair16u32s *) 0 ;
+  unsigned short *arg2 = (unsigned short *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvPair32s32f_i_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvPair16u32s_u_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair32s32f, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair16u32s, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPair32s32f_i_set" "', argument " "1"" of type '" "CvPair32s32f *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPair16u32s_u_set" "', argument " "1"" of type '" "CvPair16u32s *""'"); 
   }
-  arg1 = (CvPair32s32f *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPair32s32f_i_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->i = arg2;
+  arg1 = (CvPair16u32s *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_unsigned_short, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPair16u32s_u_set" "', argument " "2"" of type '" "unsigned short *""'"); 
+  }
+  arg2 = (unsigned short *)(argp2);
+  if (arg1) (arg1)->u = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -17166,56 +17326,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvPair32s32f_i_get (const octave_value_list& args, int nargout) {
-  CvPair32s32f *arg1 = (CvPair32s32f *) 0 ;
+static octave_value_list _wrap_CvPair16u32s_u_get (const octave_value_list& args, int nargout) {
+  CvPair16u32s *arg1 = (CvPair16u32s *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  unsigned short *result = 0 ;
   
-  if (!SWIG_check_num_args("CvPair32s32f_i_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvPair16u32s_u_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair32s32f, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair16u32s, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPair32s32f_i_get" "', argument " "1"" of type '" "CvPair32s32f *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPair16u32s_u_get" "', argument " "1"" of type '" "CvPair16u32s *""'"); 
   }
-  arg1 = (CvPair32s32f *)(argp1);
-  result = (int) ((arg1)->i);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvPair16u32s *)(argp1);
+  result = (unsigned short *) ((arg1)->u);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_short, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvPair32s32f_val_set (const octave_value_list& args, int nargout) {
-  CvPair32s32f *arg1 = (CvPair32s32f *) 0 ;
-  float arg2 ;
+static octave_value_list _wrap_CvPair16u32s_i_set (const octave_value_list& args, int nargout) {
+  CvPair16u32s *arg1 = (CvPair16u32s *) 0 ;
+  int *arg2 = (int *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  float val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvPair32s32f_val_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvPair16u32s_i_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair32s32f, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair16u32s, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPair32s32f_val_set" "', argument " "1"" of type '" "CvPair32s32f *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPair16u32s_i_set" "', argument " "1"" of type '" "CvPair16u32s *""'"); 
   }
-  arg1 = (CvPair32s32f *)(argp1);
-  ecode2 = SWIG_AsVal_float(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPair32s32f_val_set" "', argument " "2"" of type '" "float""'");
-  } 
-  arg2 = (float)(val2);
-  if (arg1) (arg1)->val = arg2;
+  arg1 = (CvPair16u32s *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPair16u32s_i_set" "', argument " "2"" of type '" "int *""'"); 
+  }
+  arg2 = (int *)(argp2);
+  if (arg1) (arg1)->i = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -17223,72 +17383,72 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvPair32s32f_val_get (const octave_value_list& args, int nargout) {
-  CvPair32s32f *arg1 = (CvPair32s32f *) 0 ;
+static octave_value_list _wrap_CvPair16u32s_i_get (const octave_value_list& args, int nargout) {
+  CvPair16u32s *arg1 = (CvPair16u32s *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int *result = 0 ;
   
-  if (!SWIG_check_num_args("CvPair32s32f_val_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvPair16u32s_i_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair32s32f, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair16u32s, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPair32s32f_val_get" "', argument " "1"" of type '" "CvPair32s32f *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPair16u32s_i_get" "', argument " "1"" of type '" "CvPair16u32s *""'"); 
   }
-  arg1 = (CvPair32s32f *)(argp1);
-  result = (float) ((arg1)->val);
-  _outv = SWIG_From_float((float)(result));
+  arg1 = (CvPair16u32s *)(argp1);
+  result = (int *) ((arg1)->i);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvPair32s32f (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvPair16u32s (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvPair32s32f *result = 0 ;
+  CvPair16u32s *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvPair32s32f",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("new_CvPair16u32s",args.length(),0,0,0)) {
     SWIG_fail;
   }
   {
     try {
-      result = (CvPair32s32f *)new CvPair32s32f(); 
+      result = (CvPair16u32s *)new CvPair16u32s(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvPair32s32f, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvPair16u32s, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvPair32s32f (const octave_value_list& args, int nargout) {
-  CvPair32s32f *arg1 = (CvPair32s32f *) 0 ;
+static octave_value_list _wrap_delete_CvPair16u32s (const octave_value_list& args, int nargout) {
+  CvPair16u32s *arg1 = (CvPair16u32s *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("delete_CvPair32s32f",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("delete_CvPair16u32s",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair32s32f, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvPair16u32s, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvPair32s32f" "', argument " "1"" of type '" "CvPair32s32f *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvPair16u32s" "', argument " "1"" of type '" "CvPair16u32s *""'"); 
   }
-  arg1 = (CvPair32s32f *)(argp1);
+  arg1 = (CvPair16u32s *)(argp1);
   {
     try {
       delete arg1; 
@@ -17305,14 +17465,14 @@ fail:
 }
 
 
-static swig_octave_member swig_CvPair32s32f_members[] = {
-{"i",0,_wrap_CvPair32s32f_i_get,_wrap_CvPair32s32f_i_set,0,0},
-{"val",0,_wrap_CvPair32s32f_val_get,_wrap_CvPair32s32f_val_set,0,0},
+static swig_octave_member swig_CvPair16u32s_members[] = {
+{"u",0,_wrap_CvPair16u32s_u_get,_wrap_CvPair16u32s_u_set,0,0},
+{"i",0,_wrap_CvPair16u32s_i_get,_wrap_CvPair16u32s_i_set,0,0},
 {0,0,0,0}
 };
-static const char *swig_CvPair32s32f_base_names[] = {0};
-static const swig_type_info *swig_CvPair32s32f_base[] = {0};
-static swig_octave_class _wrap_class_CvPair32s32f = {"CvPair32s32f", &SWIGTYPE_p_CvPair32s32f,0,_wrap_new_CvPair32s32f,0,_wrap_delete_CvPair32s32f,swig_CvPair32s32f_members,swig_CvPair32s32f_base_names,swig_CvPair32s32f_base };
+static const char *swig_CvPair16u32s_base_names[] = {0};
+static const swig_type_info *swig_CvPair16u32s_base[] = {0};
+static swig_octave_class _wrap_class_CvPair16u32s = {"CvPair16u32s", &SWIGTYPE_p_CvPair16u32s,0,_wrap_new_CvPair16u32s,0,_wrap_delete_CvPair16u32s,swig_CvPair16u32s_members,swig_CvPair16u32s_base_names,swig_CvPair16u32s_base };
 
 static octave_value_list _wrap_CvDTreeSplit_var_idx_set (const octave_value_list& args, int nargout) {
   CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
@@ -17371,6 +17531,63 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvDTreeSplit_condensed_idx_set (const octave_value_list& args, int nargout) {
+  CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvDTreeSplit_condensed_idx_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeSplit, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeSplit_condensed_idx_set" "', argument " "1"" of type '" "CvDTreeSplit *""'"); 
+  }
+  arg1 = (CvDTreeSplit *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeSplit_condensed_idx_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->condensed_idx = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvDTreeSplit_condensed_idx_get (const octave_value_list& args, int nargout) {
+  CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvDTreeSplit_condensed_idx_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeSplit, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeSplit_condensed_idx_get" "', argument " "1"" of type '" "CvDTreeSplit *""'"); 
+  }
+  arg1 = (CvDTreeSplit *)(argp1);
+  result = (int) ((arg1)->condensed_idx);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvDTreeSplit_inversed_set (const octave_value_list& args, int nargout) {
   CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
   int arg2 ;
@@ -17601,6 +17818,7 @@ fail:
 
 static swig_octave_member swig_CvDTreeSplit_members[] = {
 {"var_idx",0,_wrap_CvDTreeSplit_var_idx_get,_wrap_CvDTreeSplit_var_idx_set,0,0},
+{"condensed_idx",0,_wrap_CvDTreeSplit_condensed_idx_get,_wrap_CvDTreeSplit_condensed_idx_set,0,0},
 {"inversed",0,_wrap_CvDTreeSplit_inversed_get,_wrap_CvDTreeSplit_inversed_set,0,0},
 {"quality",0,_wrap_CvDTreeSplit_quality_get,_wrap_CvDTreeSplit_quality_set,0,0},
 {"next",0,_wrap_CvDTreeSplit_next_get,_wrap_CvDTreeSplit_next_set,0,0},
@@ -21965,6 +22183,38 @@ static octave_value_list _wrap_CvDTreeTrainData_set_data (const octave_value_lis
 }
 
 
+static octave_value_list _wrap_CvDTreeTrainData_do_responses_copy (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvDTreeTrainData_do_responses_copy",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_do_responses_copy" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg1 = (CvDTreeTrainData *)(argp1);
+  {
+    try {
+      (arg1)->do_responses_copy(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvDTreeTrainData_get_vectors__SWIG_0 (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
@@ -22445,19 +22695,82 @@ fail:
 }
 
 
+static octave_value_list _wrap_CvDTreeTrainData_get_ord_responses (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  float *arg3 = (float *) 0 ;
+  float **arg4 = (float **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *vptr4 ;
+  float *buffer4 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvDTreeTrainData_get_ord_responses",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_get_ord_responses" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg1 = (CvDTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_get_ord_responses" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
+  }
+  arg2 = (CvDTreeNode *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTreeTrainData_get_ord_responses" "', argument " "3"" of type '" "float *""'"); 
+  }
+  arg3 = (float *)(argp3);
+  {
+    if ((SWIG_ConvertPtr(args(3), &vptr4, SWIGTYPE_p_float, 1)) == -1){
+      SWIG_fail;
+    }
+    buffer4 = (float *) vptr4;
+    arg4=&buffer4;
+  }
+  {
+    try {
+      (arg1)->get_ord_responses(arg2,arg3,(float const **)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
 static octave_value_list _wrap_CvDTreeTrainData_get_class_labels (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int **arg4 = (int **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_get_class_labels",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_get_class_labels",args.length(),4,4,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -22470,98 +22783,138 @@ static octave_value_list _wrap_CvDTreeTrainData_get_class_labels (const octave_v
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_get_class_labels" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
   }
   arg2 = (CvDTreeNode *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTreeTrainData_get_class_labels" "', argument " "3"" of type '" "int *""'"); 
+  }
+  arg3 = (int *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTreeTrainData_get_class_labels" "', argument " "4"" of type '" "int const **""'"); 
+  }
+  arg4 = (int **)(argp4);
   {
     try {
-      result = (int *)(arg1)->get_class_labels(arg2); 
+      (arg1)->get_class_labels(arg2,arg3,(int const **)arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_get_ord_responses (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_get_cv_labels (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int **arg4 = (int **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_get_ord_responses",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_get_cv_labels",args.length(),4,4,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_get_ord_responses" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_get_cv_labels" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_get_ord_responses" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_get_cv_labels" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
   }
   arg2 = (CvDTreeNode *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTreeTrainData_get_cv_labels" "', argument " "3"" of type '" "int *""'"); 
+  }
+  arg3 = (int *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTreeTrainData_get_cv_labels" "', argument " "4"" of type '" "int const **""'"); 
+  }
+  arg4 = (int **)(argp4);
   {
     try {
-      result = (float *)(arg1)->get_ord_responses(arg2); 
+      (arg1)->get_cv_labels(arg2,arg3,(int const **)arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_get_labels (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_get_sample_indices (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int **arg4 = (int **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_get_labels",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_get_sample_indices",args.length(),4,4,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_get_labels" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_get_sample_indices" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_get_labels" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_get_sample_indices" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
   }
   arg2 = (CvDTreeNode *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTreeTrainData_get_sample_indices" "', argument " "3"" of type '" "int *""'"); 
+  }
+  arg3 = (int *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTreeTrainData_get_sample_indices" "', argument " "4"" of type '" "int const **""'"); 
+  }
+  arg4 = (int **)(argp4);
   {
     try {
-      result = (int *)(arg1)->get_labels(arg2); 
+      (arg1)->get_sample_indices(arg2,arg3,(int const **)arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
@@ -22572,18 +22925,24 @@ static octave_value_list _wrap_CvDTreeTrainData_get_cat_var_data (const octave_v
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
   int arg3 ;
+  int *arg4 = (int *) 0 ;
+  int **arg5 = (int **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_get_cat_var_data",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_get_cat_var_data",args.length(),5,5,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -22601,16 +22960,26 @@ static octave_value_list _wrap_CvDTreeTrainData_get_cat_var_data (const octave_v
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTreeTrainData_get_cat_var_data" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTreeTrainData_get_cat_var_data" "', argument " "4"" of type '" "int *""'"); 
+  }
+  arg4 = (int *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTreeTrainData_get_cat_var_data" "', argument " "5"" of type '" "int const **""'"); 
+  }
+  arg5 = (int **)(argp5);
   {
     try {
-      result = (int *)(arg1)->get_cat_var_data(arg2,arg3); 
+      result = (int)(arg1)->get_cat_var_data(arg2,arg3,arg4,(int const **)arg5); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
@@ -22621,18 +22990,30 @@ static octave_value_list _wrap_CvDTreeTrainData_get_ord_var_data (const octave_v
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
   int arg3 ;
+  float *arg4 = (float *) 0 ;
+  int *arg5 = (int *) 0 ;
+  float **arg6 = (float **) 0 ;
+  int **arg7 = (int **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *vptr6 ;
+  float *buffer6 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvPair32s32f *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_get_ord_var_data",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_get_ord_var_data",args.length(),7,7,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -22650,16 +23031,38 @@ static octave_value_list _wrap_CvDTreeTrainData_get_ord_var_data (const octave_v
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTreeTrainData_get_ord_var_data" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTreeTrainData_get_ord_var_data" "', argument " "4"" of type '" "float *""'"); 
+  }
+  arg4 = (float *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTreeTrainData_get_ord_var_data" "', argument " "5"" of type '" "int *""'"); 
+  }
+  arg5 = (int *)(argp5);
+  {
+    if ((SWIG_ConvertPtr(args(5), &vptr6, SWIGTYPE_p_float, 1)) == -1){
+      SWIG_fail;
+    }
+    buffer6 = (float *) vptr6;
+    arg6=&buffer6;
+  }
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvDTreeTrainData_get_ord_var_data" "', argument " "7"" of type '" "int const **""'"); 
+  }
+  arg7 = (int **)(argp7);
   {
     try {
-      result = (CvPair32s32f *)(arg1)->get_ord_var_data(arg2,arg3); 
+      result = (int)(arg1)->get_ord_var_data(arg2,arg3,arg4,arg5,(float const **)arg6,(int const **)arg7); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvPair32s32f, 0 |  0 );
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
@@ -23050,31 +23453,31 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_sample_count_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_pred_float_buf_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int arg2 ;
+  float *arg2 = (float *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_sample_count_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_pred_float_buf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_sample_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_pred_float_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_sample_count_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->sample_count = arg2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_float, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_pred_float_buf_set" "', argument " "2"" of type '" "float *""'"); 
+  }
+  arg2 = (float *)(argp2);
+  if (arg1) (arg1)->pred_float_buf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23082,56 +23485,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_sample_count_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_pred_float_buf_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  float *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_sample_count_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_pred_float_buf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_sample_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_pred_float_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (int) ((arg1)->sample_count);
-  _outv = SWIG_From_int((int)(result));
+  result = (float *) ((arg1)->pred_float_buf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_var_all_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_pred_int_buf_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int arg2 ;
+  int *arg2 = (int *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_var_all_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_pred_int_buf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_all_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_pred_int_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_var_all_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->var_all = arg2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_pred_int_buf_set" "', argument " "2"" of type '" "int *""'"); 
+  }
+  arg2 = (int *)(argp2);
+  if (arg1) (arg1)->pred_int_buf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23139,56 +23542,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_var_all_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_pred_int_buf_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  int *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_var_all_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_pred_int_buf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_all_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_pred_int_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (int) ((arg1)->var_all);
-  _outv = SWIG_From_int((int)(result));
+  result = (int *) ((arg1)->pred_int_buf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_var_count_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_resp_float_buf_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int arg2 ;
+  float *arg2 = (float *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_var_count_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_resp_float_buf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_resp_float_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_var_count_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->var_count = arg2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_float, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_resp_float_buf_set" "', argument " "2"" of type '" "float *""'"); 
+  }
+  arg2 = (float *)(argp2);
+  if (arg1) (arg1)->resp_float_buf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23196,56 +23599,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_var_count_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_resp_float_buf_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  float *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_var_count_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_resp_float_buf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_resp_float_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (int) ((arg1)->var_count);
-  _outv = SWIG_From_int((int)(result));
+  result = (float *) ((arg1)->resp_float_buf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_max_c_count_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_resp_int_buf_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int arg2 ;
+  int *arg2 = (int *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_max_c_count_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_resp_int_buf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_max_c_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_resp_int_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_max_c_count_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->max_c_count = arg2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_resp_int_buf_set" "', argument " "2"" of type '" "int *""'"); 
+  }
+  arg2 = (int *)(argp2);
+  if (arg1) (arg1)->resp_int_buf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23253,56 +23656,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_max_c_count_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_resp_int_buf_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  int *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_max_c_count_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_resp_int_buf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_max_c_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_resp_int_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (int) ((arg1)->max_c_count);
-  _outv = SWIG_From_int((int)(result));
+  result = (int *) ((arg1)->resp_int_buf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_ord_var_count_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cv_lables_buf_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int arg2 ;
+  int *arg2 = (int *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_ord_var_count_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cv_lables_buf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_ord_var_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cv_lables_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_ord_var_count_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->ord_var_count = arg2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_cv_lables_buf_set" "', argument " "2"" of type '" "int *""'"); 
+  }
+  arg2 = (int *)(argp2);
+  if (arg1) (arg1)->cv_lables_buf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23310,56 +23713,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_ord_var_count_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cv_lables_buf_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  int *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_ord_var_count_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cv_lables_buf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_ord_var_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cv_lables_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (int) ((arg1)->ord_var_count);
-  _outv = SWIG_From_int((int)(result));
+  result = (int *) ((arg1)->cv_lables_buf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cat_var_count_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_sample_idx_buf_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int arg2 ;
+  int *arg2 = (int *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cat_var_count_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_sample_idx_buf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_var_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_sample_idx_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_cat_var_count_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->cat_var_count = arg2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_sample_idx_buf_set" "', argument " "2"" of type '" "int *""'"); 
+  }
+  arg2 = (int *)(argp2);
+  if (arg1) (arg1)->sample_idx_buf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23367,56 +23770,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cat_var_count_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_sample_idx_buf_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  int *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cat_var_count_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_sample_idx_buf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_var_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_sample_idx_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (int) ((arg1)->cat_var_count);
-  _outv = SWIG_From_int((int)(result));
+  result = (int *) ((arg1)->sample_idx_buf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_have_labels_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_sample_count_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  bool arg2 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  bool val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_have_labels_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_sample_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_have_labels_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_sample_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_have_labels_set" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_sample_count_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (bool)(val2);
-  if (arg1) (arg1)->have_labels = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->sample_count = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23424,56 +23827,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_have_labels_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_sample_count_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_have_labels_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_sample_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_have_labels_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_sample_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (bool) ((arg1)->have_labels);
-  _outv = SWIG_From_bool((bool)(result));
+  result = (int) ((arg1)->sample_count);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_have_priors_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_var_all_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  bool arg2 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  bool val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_have_priors_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_var_all_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_have_priors_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_all_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_have_priors_set" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_var_all_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (bool)(val2);
-  if (arg1) (arg1)->have_priors = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->var_all = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23481,56 +23884,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_have_priors_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_var_all_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_have_priors_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_var_all_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_have_priors_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_all_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (bool) ((arg1)->have_priors);
-  _outv = SWIG_From_bool((bool)(result));
+  result = (int) ((arg1)->var_all);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_is_classifier_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_var_count_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  bool arg2 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  bool val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_is_classifier_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_var_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_is_classifier_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_is_classifier_set" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_var_count_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (bool)(val2);
-  if (arg1) (arg1)->is_classifier = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->var_count = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23538,32 +23941,32 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_is_classifier_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_var_count_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_is_classifier_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_var_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_is_classifier_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (bool) ((arg1)->is_classifier);
-  _outv = SWIG_From_bool((bool)(result));
+  result = (int) ((arg1)->var_count);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_buf_count_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_max_c_count_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -23574,20 +23977,20 @@ static octave_value_list _wrap_CvDTreeTrainData_buf_count_set (const octave_valu
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_buf_count_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_max_c_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_max_c_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_buf_count_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_max_c_count_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->buf_count = arg2;
+  if (arg1) (arg1)->max_c_count = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23595,7 +23998,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_buf_count_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_max_c_count_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23604,15 +24007,15 @@ static octave_value_list _wrap_CvDTreeTrainData_buf_count_get (const octave_valu
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_buf_count_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_max_c_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_max_c_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (int) ((arg1)->buf_count);
+  result = (int) ((arg1)->max_c_count);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23620,7 +24023,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_buf_size_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_ord_var_count_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -23631,20 +24034,20 @@ static octave_value_list _wrap_CvDTreeTrainData_buf_size_set (const octave_value
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_buf_size_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_ord_var_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_size_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_ord_var_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_buf_size_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_ord_var_count_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  if (arg1) (arg1)->buf_size = arg2;
+  if (arg1) (arg1)->ord_var_count = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23652,7 +24055,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_buf_size_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_ord_var_count_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23661,15 +24064,15 @@ static octave_value_list _wrap_CvDTreeTrainData_buf_size_get (const octave_value
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_buf_size_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_ord_var_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_size_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_ord_var_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (int) ((arg1)->buf_size);
+  result = (int) ((arg1)->ord_var_count);
   _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23677,31 +24080,31 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_shared_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cat_var_count_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  bool arg2 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  bool val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_shared_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cat_var_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_shared_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_var_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_shared_set" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_cat_var_count_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (bool)(val2);
-  if (arg1) (arg1)->shared = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->cat_var_count = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23709,56 +24112,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_shared_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cat_var_count_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_shared_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cat_var_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_shared_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_var_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (bool) ((arg1)->shared);
-  _outv = SWIG_From_bool((bool)(result));
+  result = (int) ((arg1)->cat_var_count);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cat_count_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_work_var_count_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cat_count_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_work_var_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_work_var_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_cat_count_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->cat_count = arg2;
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_work_var_count_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->work_var_count = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23766,56 +24169,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cat_count_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_work_var_count_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cat_count_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_work_var_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_work_var_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->cat_count);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  result = (int) ((arg1)->work_var_count);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cat_ofs_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_have_labels_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  bool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cat_ofs_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_have_labels_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_ofs_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_have_labels_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_cat_ofs_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->cat_ofs = arg2;
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_have_labels_set" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = (bool)(val2);
+  if (arg1) (arg1)->have_labels = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23823,56 +24226,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cat_ofs_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_have_labels_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  bool result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cat_ofs_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_have_labels_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_ofs_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_have_labels_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->cat_ofs);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  result = (bool) ((arg1)->have_labels);
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cat_map_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_have_priors_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  bool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cat_map_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_have_priors_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_map_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_have_priors_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_cat_map_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->cat_map = arg2;
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_have_priors_set" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = (bool)(val2);
+  if (arg1) (arg1)->have_priors = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23880,56 +24283,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cat_map_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_have_priors_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  bool result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cat_map_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_have_priors_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_map_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_have_priors_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->cat_map);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  result = (bool) ((arg1)->have_priors);
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_counts_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_is_classifier_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  bool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_counts_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_is_classifier_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_counts_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_is_classifier_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_counts_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->counts = arg2;
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_is_classifier_set" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = (bool)(val2);
+  if (arg1) (arg1)->is_classifier = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23937,56 +24340,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_counts_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_is_classifier_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  bool result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_counts_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_is_classifier_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_counts_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_is_classifier_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->counts);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  result = (bool) ((arg1)->is_classifier);
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_buf_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_tflag_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_buf_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_tflag_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_tflag_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_buf_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->buf = arg2;
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_tflag_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->tflag = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -23994,32 +24397,32 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_buf_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_tflag_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_buf_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_tflag_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_tflag_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->buf);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  result = (int) ((arg1)->tflag);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_direction_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_train_data_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -24030,20 +24433,20 @@ static octave_value_list _wrap_CvDTreeTrainData_direction_set (const octave_valu
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_direction_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_train_data_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_direction_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_train_data_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_direction_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_train_data_set" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->direction = arg2;
+  if (arg1) (arg1)->train_data = (CvMat const *)arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24051,7 +24454,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_direction_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_train_data_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24060,15 +24463,15 @@ static octave_value_list _wrap_CvDTreeTrainData_direction_get (const octave_valu
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_direction_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_train_data_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_direction_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_train_data_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->direction);
+  result = (CvMat *) ((arg1)->train_data);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24076,7 +24479,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_split_buf_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_responses_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -24087,20 +24490,20 @@ static octave_value_list _wrap_CvDTreeTrainData_split_buf_set (const octave_valu
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_split_buf_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_responses_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_split_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_responses_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_split_buf_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_responses_set" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->split_buf = arg2;
+  if (arg1) (arg1)->responses = (CvMat const *)arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24108,7 +24511,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_split_buf_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_responses_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24117,15 +24520,15 @@ static octave_value_list _wrap_CvDTreeTrainData_split_buf_get (const octave_valu
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_split_buf_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_responses_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_split_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_responses_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->split_buf);
+  result = (CvMat *) ((arg1)->responses);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24133,7 +24536,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_var_idx_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_responses_copy_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -24144,20 +24547,20 @@ static octave_value_list _wrap_CvDTreeTrainData_var_idx_set (const octave_value_
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_var_idx_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_responses_copy_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_idx_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_responses_copy_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_var_idx_set" "', argument " "2"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_responses_copy_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->var_idx = arg2;
+  if (arg1) (arg1)->responses_copy = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24165,7 +24568,7 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_var_idx_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_responses_copy_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24174,15 +24577,15 @@ static octave_value_list _wrap_CvDTreeTrainData_var_idx_get (const octave_value_
   octave_value _outv;
   CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_var_idx_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_responses_copy_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_idx_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_responses_copy_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->var_idx);
+  result = (CvMat *) ((arg1)->responses_copy);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24190,31 +24593,31 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_var_type_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_buf_count_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_var_type_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_buf_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_type_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_var_type_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->var_type = arg2;
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_buf_count_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->buf_count = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24222,56 +24625,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_var_type_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_buf_count_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_var_type_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_buf_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_type_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->var_type);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  result = (int) ((arg1)->buf_count);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_priors_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_buf_size_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_priors_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_buf_size_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_priors_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_size_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_priors_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->priors = arg2;
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_buf_size_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->buf_size = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24279,56 +24682,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_priors_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_buf_size_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_priors_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_buf_size_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_priors_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_size_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->priors);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  result = (int) ((arg1)->buf_size);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_priors_mult_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_shared_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+  bool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_priors_mult_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_shared_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_priors_mult_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_shared_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_priors_mult_set" "', argument " "2"" of type '" "CvMat *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  if (arg1) (arg1)->priors_mult = arg2;
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_shared_set" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = (bool)(val2);
+  if (arg1) (arg1)->shared = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24336,56 +24739,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_priors_mult_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_shared_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  bool result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_priors_mult_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_shared_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_priors_mult_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_shared_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMat *) ((arg1)->priors_mult);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  result = (bool) ((arg1)->shared);
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_params_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_is_buf_16u_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvDTreeParams *arg2 = (CvDTreeParams *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_params_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_is_buf_16u_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_params_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_is_buf_16u_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_params_set" "', argument " "2"" of type '" "CvDTreeParams *""'"); 
-  }
-  arg2 = (CvDTreeParams *)(argp2);
-  if (arg1) (arg1)->params = *arg2;
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvDTreeTrainData_is_buf_16u_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->is_buf_16u = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24393,34 +24796,34 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_params_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_is_buf_16u_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvDTreeParams *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_params_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_is_buf_16u_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_params_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_is_buf_16u_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvDTreeParams *)& ((arg1)->params);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeParams, 0 |  0 );
+  result = (int) ((arg1)->is_buf_16u);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_tree_storage_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cat_count_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMemStorage *arg2 = (CvMemStorage *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -24429,20 +24832,20 @@ static octave_value_list _wrap_CvDTreeTrainData_tree_storage_set (const octave_v
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_tree_storage_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cat_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_tree_storage_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_count_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMemStorage, SWIG_POINTER_DISOWN |  0 );
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_tree_storage_set" "', argument " "2"" of type '" "CvMemStorage *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_cat_count_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  arg2 = (CvMemStorage *)(argp2);
-  if (arg1) (arg1)->tree_storage = arg2;
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->cat_count = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24450,34 +24853,34 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_tree_storage_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cat_count_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMemStorage *result = 0 ;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_tree_storage_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cat_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_tree_storage_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_count_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMemStorage *) ((arg1)->tree_storage);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMemStorage, 0 |  0 );
+  result = (CvMat *) ((arg1)->cat_count);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_temp_storage_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cat_ofs_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMemStorage *arg2 = (CvMemStorage *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -24486,20 +24889,20 @@ static octave_value_list _wrap_CvDTreeTrainData_temp_storage_set (const octave_v
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_temp_storage_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cat_ofs_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_temp_storage_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_ofs_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMemStorage, SWIG_POINTER_DISOWN |  0 );
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_temp_storage_set" "', argument " "2"" of type '" "CvMemStorage *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_cat_ofs_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  arg2 = (CvMemStorage *)(argp2);
-  if (arg1) (arg1)->temp_storage = arg2;
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->cat_ofs = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24507,34 +24910,34 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_temp_storage_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cat_ofs_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMemStorage *result = 0 ;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_temp_storage_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cat_ofs_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_temp_storage_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_ofs_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvMemStorage *) ((arg1)->temp_storage);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMemStorage, 0 |  0 );
+  result = (CvMat *) ((arg1)->cat_ofs);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_data_root_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cat_map_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -24543,20 +24946,20 @@ static octave_value_list _wrap_CvDTreeTrainData_data_root_set (const octave_valu
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_data_root_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cat_map_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_data_root_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_map_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, SWIG_POINTER_DISOWN |  0 );
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_data_root_set" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_cat_map_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  arg2 = (CvDTreeNode *)(argp2);
-  if (arg1) (arg1)->data_root = arg2;
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->cat_map = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24564,60 +24967,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_data_root_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_cat_map_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvDTreeNode *result = 0 ;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_data_root_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cat_map_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_data_root_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cat_map_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvDTreeNode *) ((arg1)->data_root);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  result = (CvMat *) ((arg1)->cat_map);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_node_heap_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_counts_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvSet *arg2 = (CvSet *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *ptr2 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_node_heap_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_counts_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_node_heap_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_counts_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  {
-    if( SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSet, 0) == -1 &&
-      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvGraph, 0) == -1 &&
-      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSubdiv2D, 0) == -1) 
-    {
-      SWIG_exception (SWIG_TypeError, "could not convert to CvSet");
-      SWIG_fail;
-    }
-    arg2 = (CvSet *)ptr2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_counts_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  if (arg1) (arg1)->node_heap = arg2;
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->counts = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24625,60 +25024,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_node_heap_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_counts_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvSet *result = 0 ;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_node_heap_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_counts_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_node_heap_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_counts_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvSet *) ((arg1)->node_heap);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSet, 0 |  0 );
+  result = (CvMat *) ((arg1)->counts);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_split_heap_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_buf_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvSet *arg2 = (CvSet *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *ptr2 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_split_heap_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_buf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_split_heap_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  {
-    if( SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSet, 0) == -1 &&
-      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvGraph, 0) == -1 &&
-      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSubdiv2D, 0) == -1) 
-    {
-      SWIG_exception (SWIG_TypeError, "could not convert to CvSet");
-      SWIG_fail;
-    }
-    arg2 = (CvSet *)ptr2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_buf_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  if (arg1) (arg1)->split_heap = arg2;
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->buf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24686,60 +25081,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_split_heap_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_buf_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvSet *result = 0 ;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_split_heap_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_buf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_split_heap_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvSet *) ((arg1)->split_heap);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSet, 0 |  0 );
+  result = (CvMat *) ((arg1)->buf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cv_heap_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_direction_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvSet *arg2 = (CvSet *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *ptr2 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cv_heap_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_direction_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cv_heap_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_direction_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  {
-    if( SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSet, 0) == -1 &&
-      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvGraph, 0) == -1 &&
-      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSubdiv2D, 0) == -1) 
-    {
-      SWIG_exception (SWIG_TypeError, "could not convert to CvSet");
-      SWIG_fail;
-    }
-    arg2 = (CvSet *)ptr2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_direction_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  if (arg1) (arg1)->cv_heap = arg2;
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->direction = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24747,60 +25138,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_cv_heap_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_direction_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvSet *result = 0 ;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_cv_heap_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_direction_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cv_heap_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_direction_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvSet *) ((arg1)->cv_heap);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSet, 0 |  0 );
+  result = (CvMat *) ((arg1)->direction);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_nv_heap_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_split_buf_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvSet *arg2 = (CvSet *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *ptr2 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_nv_heap_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_split_buf_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_nv_heap_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_split_buf_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  {
-    if( SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSet, 0) == -1 &&
-      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvGraph, 0) == -1 &&
-      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSubdiv2D, 0) == -1) 
-    {
-      SWIG_exception (SWIG_TypeError, "could not convert to CvSet");
-      SWIG_fail;
-    }
-    arg2 = (CvSet *)ptr2;
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_split_buf_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  if (arg1) (arg1)->nv_heap = arg2;
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->split_buf = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24808,59 +25195,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_nv_heap_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_split_buf_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvSet *result = 0 ;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_nv_heap_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_split_buf_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_nv_heap_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_split_buf_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvSet *) ((arg1)->nv_heap);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSet, 0 |  0 );
+  result = (CvMat *) ((arg1)->split_buf);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_rng_set (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_var_idx_set (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvRNG arg2 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *vptr2 ;
-  CvRNG_Wrapper *wrapper2 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_rng_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_var_idx_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_rng_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_idx_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  {
-    if(SWIG_ConvertPtr(args(1), &vptr2, SWIGTYPE_p_CvRNG_Wrapper, 0)==-1){
-      SWIG_exception( SWIG_TypeError, "could not convert Octave object to C value");
-      SWIG_fail;
-    }
-    wrapper2 = (CvRNG_Wrapper *) vptr2;
-    arg2 = wrapper2->ref();
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_var_idx_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
-  if (arg1) (arg1)->rng = arg2;
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->var_idx = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -24868,1024 +25252,423 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTreeTrainData_rng_get (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_var_idx_get (const octave_value_list& args, int nargout) {
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvRNG result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTreeTrainData_rng_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_var_idx_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_rng_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_idx_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg1 = (CvDTreeTrainData *)(argp1);
-  result = (CvRNG) ((arg1)->rng);
-  {
-    CvRNG_Wrapper * wrapper = new CvRNG_Wrapper( result );
-    _outv = SWIG_NewPointerObj( wrapper, SWIGTYPE_p_CvRNG_Wrapper, 1 );
-  }
+  result = (CvMat *) ((arg1)->var_idx);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static swig_octave_member swig_CvDTreeTrainData_members[] = {
-{"set_data",_wrap_CvDTreeTrainData_set_data,0,0,0,0},
-{"get_vectors",_wrap_CvDTreeTrainData_get_vectors,0,0,0,0},
-{"subsample_data",_wrap_CvDTreeTrainData_subsample_data,0,0,0,0},
-{"write_params",_wrap_CvDTreeTrainData_write_params,0,0,0,0},
-{"read_params",_wrap_CvDTreeTrainData_read_params,0,0,0,0},
-{"clear",_wrap_CvDTreeTrainData_clear,0,0,0,0},
-{"get_num_classes",_wrap_CvDTreeTrainData_get_num_classes,0,0,0,0},
-{"get_var_type",_wrap_CvDTreeTrainData_get_var_type,0,0,0,0},
-{"get_work_var_count",_wrap_CvDTreeTrainData_get_work_var_count,0,0,0,0},
-{"get_class_labels",_wrap_CvDTreeTrainData_get_class_labels,0,0,0,0},
-{"get_ord_responses",_wrap_CvDTreeTrainData_get_ord_responses,0,0,0,0},
-{"get_labels",_wrap_CvDTreeTrainData_get_labels,0,0,0,0},
-{"get_cat_var_data",_wrap_CvDTreeTrainData_get_cat_var_data,0,0,0,0},
-{"get_ord_var_data",_wrap_CvDTreeTrainData_get_ord_var_data,0,0,0,0},
-{"get_child_buf_idx",_wrap_CvDTreeTrainData_get_child_buf_idx,0,0,0,0},
-{"set_params",_wrap_CvDTreeTrainData_set_params,0,0,0,0},
-{"new_node",_wrap_CvDTreeTrainData_new_node,0,0,0,0},
-{"new_split_ord",_wrap_CvDTreeTrainData_new_split_ord,0,0,0,0},
-{"new_split_cat",_wrap_CvDTreeTrainData_new_split_cat,0,0,0,0},
-{"free_node_data",_wrap_CvDTreeTrainData_free_node_data,0,0,0,0},
-{"free_train_data",_wrap_CvDTreeTrainData_free_train_data,0,0,0,0},
-{"free_node",_wrap_CvDTreeTrainData_free_node,0,0,0,0},
-{"sample_count",0,_wrap_CvDTreeTrainData_sample_count_get,_wrap_CvDTreeTrainData_sample_count_set,0,0},
-{"var_all",0,_wrap_CvDTreeTrainData_var_all_get,_wrap_CvDTreeTrainData_var_all_set,0,0},
-{"var_count",0,_wrap_CvDTreeTrainData_var_count_get,_wrap_CvDTreeTrainData_var_count_set,0,0},
-{"max_c_count",0,_wrap_CvDTreeTrainData_max_c_count_get,_wrap_CvDTreeTrainData_max_c_count_set,0,0},
-{"ord_var_count",0,_wrap_CvDTreeTrainData_ord_var_count_get,_wrap_CvDTreeTrainData_ord_var_count_set,0,0},
-{"cat_var_count",0,_wrap_CvDTreeTrainData_cat_var_count_get,_wrap_CvDTreeTrainData_cat_var_count_set,0,0},
-{"have_labels",0,_wrap_CvDTreeTrainData_have_labels_get,_wrap_CvDTreeTrainData_have_labels_set,0,0},
-{"have_priors",0,_wrap_CvDTreeTrainData_have_priors_get,_wrap_CvDTreeTrainData_have_priors_set,0,0},
-{"is_classifier",0,_wrap_CvDTreeTrainData_is_classifier_get,_wrap_CvDTreeTrainData_is_classifier_set,0,0},
-{"buf_count",0,_wrap_CvDTreeTrainData_buf_count_get,_wrap_CvDTreeTrainData_buf_count_set,0,0},
-{"buf_size",0,_wrap_CvDTreeTrainData_buf_size_get,_wrap_CvDTreeTrainData_buf_size_set,0,0},
-{"shared",0,_wrap_CvDTreeTrainData_shared_get,_wrap_CvDTreeTrainData_shared_set,0,0},
-{"cat_count",0,_wrap_CvDTreeTrainData_cat_count_get,_wrap_CvDTreeTrainData_cat_count_set,0,0},
-{"cat_ofs",0,_wrap_CvDTreeTrainData_cat_ofs_get,_wrap_CvDTreeTrainData_cat_ofs_set,0,0},
-{"cat_map",0,_wrap_CvDTreeTrainData_cat_map_get,_wrap_CvDTreeTrainData_cat_map_set,0,0},
-{"counts",0,_wrap_CvDTreeTrainData_counts_get,_wrap_CvDTreeTrainData_counts_set,0,0},
-{"buf",0,_wrap_CvDTreeTrainData_buf_get,_wrap_CvDTreeTrainData_buf_set,0,0},
-{"direction",0,_wrap_CvDTreeTrainData_direction_get,_wrap_CvDTreeTrainData_direction_set,0,0},
-{"split_buf",0,_wrap_CvDTreeTrainData_split_buf_get,_wrap_CvDTreeTrainData_split_buf_set,0,0},
-{"var_idx",0,_wrap_CvDTreeTrainData_var_idx_get,_wrap_CvDTreeTrainData_var_idx_set,0,0},
-{"var_type",0,_wrap_CvDTreeTrainData_var_type_get,_wrap_CvDTreeTrainData_var_type_set,0,0},
-{"priors",0,_wrap_CvDTreeTrainData_priors_get,_wrap_CvDTreeTrainData_priors_set,0,0},
-{"priors_mult",0,_wrap_CvDTreeTrainData_priors_mult_get,_wrap_CvDTreeTrainData_priors_mult_set,0,0},
-{"params",0,_wrap_CvDTreeTrainData_params_get,_wrap_CvDTreeTrainData_params_set,0,0},
-{"tree_storage",0,_wrap_CvDTreeTrainData_tree_storage_get,_wrap_CvDTreeTrainData_tree_storage_set,0,0},
-{"temp_storage",0,_wrap_CvDTreeTrainData_temp_storage_get,_wrap_CvDTreeTrainData_temp_storage_set,0,0},
-{"data_root",0,_wrap_CvDTreeTrainData_data_root_get,_wrap_CvDTreeTrainData_data_root_set,0,0},
-{"node_heap",0,_wrap_CvDTreeTrainData_node_heap_get,_wrap_CvDTreeTrainData_node_heap_set,0,0},
-{"split_heap",0,_wrap_CvDTreeTrainData_split_heap_get,_wrap_CvDTreeTrainData_split_heap_set,0,0},
-{"cv_heap",0,_wrap_CvDTreeTrainData_cv_heap_get,_wrap_CvDTreeTrainData_cv_heap_set,0,0},
-{"nv_heap",0,_wrap_CvDTreeTrainData_nv_heap_get,_wrap_CvDTreeTrainData_nv_heap_set,0,0},
-{"rng",0,_wrap_CvDTreeTrainData_rng_get,_wrap_CvDTreeTrainData_rng_set,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvDTreeTrainData_base_names[] = {0};
-static const swig_type_info *swig_CvDTreeTrainData_base[] = {0};
-static swig_octave_class _wrap_class_CvDTreeTrainData = {"CvDTreeTrainData", &SWIGTYPE_p_CvDTreeTrainData,0,_wrap_new_CvDTreeTrainData,0,_wrap_delete_CvDTreeTrainData,swig_CvDTreeTrainData_members,swig_CvDTreeTrainData_base_names,swig_CvDTreeTrainData_base };
-
-static octave_value_list _wrap_new_CvDTree (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTreeTrainData_var_type_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvDTree *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvDTree",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_var_type_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  {
-    try {
-      result = (CvDTree *)new CvDTree(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_type_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTree, 1 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_var_type_set" "', argument " "2"" of type '" "CvMat *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->var_type = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvDTree (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_var_type_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("delete_CvDTree",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_var_type_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvDTree" "', argument " "1"" of type '" "CvDTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_var_type_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvMat *) ((arg1)->var_type);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_train__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_priors_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
-  CvDTreeParams arg9 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 ;
-  int res9 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvDTree_train",args.length(),9,9,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_priors_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_priors_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_priors_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvDTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvDTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvDTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
-  {
-    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvDTree_train" "', argument " "9"" of type '" "CvDTreeParams""'"); 
-    }  
-    if (!argp9) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvDTree_train" "', argument " "9"" of type '" "CvDTreeParams""'");
-    } else {
-      arg9 = *((CvDTreeParams *)(argp9));
-    }
-  }
-  {
-    try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_bool((bool)(result));
+  if (arg1) (arg1)->priors = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_train__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_priors_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_train",args.length(),8,8,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_priors_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvDTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvDTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvDTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
-  {
-    try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_priors_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvMat *) ((arg1)->priors);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_train__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_priors_mult_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvDTree_train",args.length(),7,7,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_priors_mult_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_priors_mult_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_priors_mult_set" "', argument " "2"" of type '" "CvMat *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvDTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvDTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  {
-    try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_bool((bool)(result));
+  if (arg1) (arg1)->priors_mult = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_train__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_priors_mult_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_train",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_priors_mult_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvDTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  {
-    try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_priors_mult_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvMat *) ((arg1)->priors_mult);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_train__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_params_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvDTreeParams *arg2 = (CvDTreeParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvDTree_train",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_params_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_params_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_params_set" "', argument " "2"" of type '" "CvDTreeParams *""'"); 
   }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  arg2 = (CvDTreeParams *)(argp2);
+  if (arg1) (arg1)->params = *arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvDTreeTrainData_params_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvDTreeParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvDTreeTrainData_params_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  arg5 = (CvMat *)(argp5);
-  {
-    try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_params_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvDTreeParams *)& ((arg1)->params);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeParams, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_train__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_tree_storage_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvMemStorage *arg2 = (CvMemStorage *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvDTree_train",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_tree_storage_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_tree_storage_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMemStorage, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_tree_storage_set" "', argument " "2"" of type '" "CvMemStorage *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  arg2 = (CvMemStorage *)(argp2);
+  if (arg1) (arg1)->tree_storage = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvDTreeTrainData_tree_storage_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMemStorage *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvDTreeTrainData_tree_storage_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  arg4 = (CvMat *)(argp4);
-  {
-    try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_tree_storage_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvMemStorage *) ((arg1)->tree_storage);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMemStorage, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_train__SWIG_6 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_temp_storage_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvMemStorage *arg2 = (CvMemStorage *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvDTree_train",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_temp_storage_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_temp_storage_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMemStorage, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
-  }
-  arg2 = (CvDTreeTrainData *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  {
-    try {
-      result = (bool)(arg1)->train(arg2,(CvMat const *)arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_temp_storage_set" "', argument " "2"" of type '" "CvMemStorage *""'"); 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  arg2 = (CvMemStorage *)(argp2);
+  if (arg1) (arg1)->temp_storage = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_train (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[9]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
-  };
+static octave_value_list _wrap_CvDTreeTrainData_temp_storage_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMemStorage *result = 0 ;
   
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvDTree_train__SWIG_6(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvDTree_train__SWIG_5(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvDTree_train__SWIG_4(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvDTree_train__SWIG_3(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvDTree_train__SWIG_2(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_CvDTree_train__SWIG_1(args, nargout);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
+  if (!SWIG_check_num_args("CvDTreeTrainData_temp_storage_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvDTree_train__SWIG_0(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_temp_storage_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvMemStorage *) ((arg1)->temp_storage);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMemStorage, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_predict__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  bool arg4 ;
+static octave_value_list _wrap_CvDTreeTrainData_data_root_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvDTreeNode *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_predict",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_data_root_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_predict" "', argument " "1"" of type '" "CvDTree const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_data_root_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvDTree_predict" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  {
-    try {
-      result = (CvDTreeNode *)((CvDTree const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTreeTrainData_data_root_set" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  arg2 = (CvDTreeNode *)(argp2);
+  if (arg1) (arg1)->data_root = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_predict__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_data_root_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   CvDTreeNode *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_predict",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_data_root_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_predict" "', argument " "1"" of type '" "CvDTree const *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  {
-    try {
-      result = (CvDTreeNode *)((CvDTree const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_data_root_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvDTreeNode *) ((arg1)->data_root);
   _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -25893,175 +25676,96 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTree_predict__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_node_heap_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvSet *arg2 = (CvSet *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  void *ptr2 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvDTreeNode *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_predict",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_node_heap_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_predict" "', argument " "1"" of type '" "CvDTree const *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_node_heap_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
+  arg1 = (CvDTreeTrainData *)(argp1);
   {
-    try {
-      result = (CvDTreeNode *)((CvDTree const *)arg1)->predict((CvMat const *)arg2); 
-    } 
-    catch (...) 
+    if( SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSet, 0) == -1 &&
+      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvGraph, 0) == -1 &&
+      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSubdiv2D, 0) == -1) 
     {
+      SWIG_exception (SWIG_TypeError, "could not convert to CvSet");
       SWIG_fail;
-    } 
+    }
+    arg2 = (CvSet *)ptr2;
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  if (arg1) (arg1)->node_heap = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_predict (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[4]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
-  };
-  
-  if (argc == 2) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        return _wrap_CvDTree_predict__SWIG_2(args, nargout);
-      }
-    }
-  }
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvDTree_predict__SWIG_1(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_CvDTree_predict__SWIG_0(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvDTree_get_var_importance (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_node_heap_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  CvSet *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_get_var_importance",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_node_heap_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_get_var_importance" "', argument " "1"" of type '" "CvDTree *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  {
-    try {
-      result = (CvMat *)(arg1)->get_var_importance(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_node_heap_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvSet *) ((arg1)->node_heap);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSet, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_clear (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_split_heap_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvSet *arg2 = (CvSet *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *ptr2 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTree_clear",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_split_heap_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_clear" "', argument " "1"" of type '" "CvDTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_split_heap_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
+  arg1 = (CvDTreeTrainData *)(argp1);
   {
-    try {
-      (arg1)->clear(); 
-    } 
-    catch (...) 
+    if( SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSet, 0) == -1 &&
+      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvGraph, 0) == -1 &&
+      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSubdiv2D, 0) == -1) 
     {
+      SWIG_exception (SWIG_TypeError, "could not convert to CvSet");
       SWIG_fail;
-    } 
+    }
+    arg2 = (CvSet *)ptr2;
   }
+  if (arg1) (arg1)->split_heap = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -26069,248 +25773,121 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTree_read__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_split_heap_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvSet *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_read",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_split_heap_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_read" "', argument " "1"" of type '" "CvDTree *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
-  }
-  arg3 = (CvFileNode *)(argp3);
-  {
-    try {
-      (arg1)->read(arg2,arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_split_heap_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvSet *) ((arg1)->split_heap);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSet, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_write__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  char *arg3 = (char *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_cv_heap_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvSet *arg2 = (CvSet *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
+  void *ptr2 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTree_write",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cv_heap_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_write" "', argument " "1"" of type '" "CvDTree *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_write" "', argument " "3"" of type '" "char const *""'");
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cv_heap_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg3 = (char *)(buf3);
+  arg1 = (CvDTreeTrainData *)(argp1);
   {
-    try {
-      (arg1)->write(arg2,(char const *)arg3); 
-    } 
-    catch (...) 
+    if( SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSet, 0) == -1 &&
+      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvGraph, 0) == -1 &&
+      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSubdiv2D, 0) == -1) 
     {
+      SWIG_exception (SWIG_TypeError, "could not convert to CvSet");
       SWIG_fail;
-    } 
+    }
+    arg2 = (CvSet *)ptr2;
   }
+  if (arg1) (arg1)->cv_heap = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_read__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
-  CvDTreeTrainData *arg4 = (CvDTreeTrainData *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_cv_heap_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvSet *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_read",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_cv_heap_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_read" "', argument " "1"" of type '" "CvDTree *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
-  }
-  arg3 = (CvFileNode *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_read" "', argument " "4"" of type '" "CvDTreeTrainData *""'"); 
-  }
-  arg4 = (CvDTreeTrainData *)(argp4);
-  {
-    try {
-      (arg1)->read(arg2,arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_cv_heap_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvSet *) ((arg1)->cv_heap);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSet, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_read (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[4]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
-  };
-  
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvDTree_read__SWIG_0(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvDTree_read__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvDTree_write__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_nv_heap_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvSet *arg2 = (CvSet *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  void *ptr2 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvDTree_write",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_nv_heap_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_write" "', argument " "1"" of type '" "CvDTree *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_nv_heap_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg2 = (CvFileStorage *)(argp2);
+  arg1 = (CvDTreeTrainData *)(argp1);
   {
-    try {
-      (arg1)->write(arg2); 
-    } 
-    catch (...) 
+    if( SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSet, 0) == -1 &&
+      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvGraph, 0) == -1 &&
+      SWIG_ConvertPtr(args(1), &ptr2, SWIGTYPE_p_CvSubdiv2D, 0) == -1) 
     {
+      SWIG_exception (SWIG_TypeError, "could not convert to CvSet");
       SWIG_fail;
-    } 
+    }
+    arg2 = (CvSet *)ptr2;
   }
+  if (arg1) (arg1)->nv_heap = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -26318,206 +25895,210 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvDTree_write (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[3]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
-  };
-  
-  if (argc == 2) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        return _wrap_CvDTree_write__SWIG_1(args, nargout);
-      }
-    }
-  }
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvDTree_write__SWIG_0(args, nargout);
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvDTree_get_root (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_nv_heap_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvDTreeNode *result = 0 ;
+  CvSet *result = 0 ;
   
-  if (!SWIG_check_num_args("CvDTree_get_root",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_nv_heap_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_get_root" "', argument " "1"" of type '" "CvDTree const *""'"); 
-  }
-  arg1 = (CvDTree *)(argp1);
-  {
-    try {
-      result = (CvDTreeNode *)((CvDTree const *)arg1)->get_root(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_nv_heap_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvSet *) ((arg1)->nv_heap);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSet, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_get_pruned_tree_idx (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_rng_set (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
+  CvRNG arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *vptr2 ;
+  CvRNG_Wrapper *wrapper2 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvDTree_get_pruned_tree_idx",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_rng_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_get_pruned_tree_idx" "', argument " "1"" of type '" "CvDTree const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_rng_set" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
+  arg1 = (CvDTreeTrainData *)(argp1);
   {
-    try {
-      result = (int)((CvDTree const *)arg1)->get_pruned_tree_idx(); 
-    } 
-    catch (...) 
-    {
+    if(SWIG_ConvertPtr(args(1), &vptr2, SWIGTYPE_p_CvRNG_Wrapper, 0)==-1){
+      SWIG_exception( SWIG_TypeError, "could not convert Octave object to C value");
       SWIG_fail;
-    } 
+    }
+    wrapper2 = (CvRNG_Wrapper *) vptr2;
+    arg2 = wrapper2->ref();
   }
-  _outv = SWIG_From_int((int)(result));
+  if (arg1) (arg1)->rng = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvDTree_get_data (const octave_value_list& args, int nargout) {
-  CvDTree *arg1 = (CvDTree *) 0 ;
+static octave_value_list _wrap_CvDTreeTrainData_rng_get (const octave_value_list& args, int nargout) {
+  CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvDTreeTrainData *result = 0 ;
+  CvRNG result;
   
-  if (!SWIG_check_num_args("CvDTree_get_data",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTreeTrainData_rng_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_get_data" "', argument " "1"" of type '" "CvDTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTreeTrainData_rng_get" "', argument " "1"" of type '" "CvDTreeTrainData *""'"); 
   }
-  arg1 = (CvDTree *)(argp1);
+  arg1 = (CvDTreeTrainData *)(argp1);
+  result = (CvRNG) ((arg1)->rng);
   {
-    try {
-      result = (CvDTreeTrainData *)(arg1)->get_data(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    CvRNG_Wrapper * wrapper = new CvRNG_Wrapper( result );
+    _outv = SWIG_NewPointerObj( wrapper, SWIGTYPE_p_CvRNG_Wrapper, 1 );
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static swig_octave_member swig_CvDTree_members[] = {
-{"train",_wrap_CvDTree_train,0,0,0,0},
-{"predict",_wrap_CvDTree_predict,0,0,0,0},
-{"get_var_importance",_wrap_CvDTree_get_var_importance,0,0,0,0},
-{"clear",_wrap_CvDTree_clear,0,0,0,0},
-{"read",_wrap_CvDTree_read,0,0,0,0},
-{"write",_wrap_CvDTree_write,0,0,0,0},
-{"get_root",_wrap_CvDTree_get_root,0,0,0,0},
-{"get_pruned_tree_idx",_wrap_CvDTree_get_pruned_tree_idx,0,0,0,0},
-{"get_data",_wrap_CvDTree_get_data,0,0,0,0},
+static swig_octave_member swig_CvDTreeTrainData_members[] = {
+{"set_data",_wrap_CvDTreeTrainData_set_data,0,0,0,0},
+{"do_responses_copy",_wrap_CvDTreeTrainData_do_responses_copy,0,0,0,0},
+{"get_vectors",_wrap_CvDTreeTrainData_get_vectors,0,0,0,0},
+{"subsample_data",_wrap_CvDTreeTrainData_subsample_data,0,0,0,0},
+{"write_params",_wrap_CvDTreeTrainData_write_params,0,0,0,0},
+{"read_params",_wrap_CvDTreeTrainData_read_params,0,0,0,0},
+{"clear",_wrap_CvDTreeTrainData_clear,0,0,0,0},
+{"get_num_classes",_wrap_CvDTreeTrainData_get_num_classes,0,0,0,0},
+{"get_var_type",_wrap_CvDTreeTrainData_get_var_type,0,0,0,0},
+{"get_work_var_count",_wrap_CvDTreeTrainData_get_work_var_count,0,0,0,0},
+{"get_ord_responses",_wrap_CvDTreeTrainData_get_ord_responses,0,0,0,0},
+{"get_class_labels",_wrap_CvDTreeTrainData_get_class_labels,0,0,0,0},
+{"get_cv_labels",_wrap_CvDTreeTrainData_get_cv_labels,0,0,0,0},
+{"get_sample_indices",_wrap_CvDTreeTrainData_get_sample_indices,0,0,0,0},
+{"get_cat_var_data",_wrap_CvDTreeTrainData_get_cat_var_data,0,0,0,0},
+{"get_ord_var_data",_wrap_CvDTreeTrainData_get_ord_var_data,0,0,0,0},
+{"get_child_buf_idx",_wrap_CvDTreeTrainData_get_child_buf_idx,0,0,0,0},
+{"set_params",_wrap_CvDTreeTrainData_set_params,0,0,0,0},
+{"new_node",_wrap_CvDTreeTrainData_new_node,0,0,0,0},
+{"new_split_ord",_wrap_CvDTreeTrainData_new_split_ord,0,0,0,0},
+{"new_split_cat",_wrap_CvDTreeTrainData_new_split_cat,0,0,0,0},
+{"free_node_data",_wrap_CvDTreeTrainData_free_node_data,0,0,0,0},
+{"free_train_data",_wrap_CvDTreeTrainData_free_train_data,0,0,0,0},
+{"free_node",_wrap_CvDTreeTrainData_free_node,0,0,0,0},
+{"pred_float_buf",0,_wrap_CvDTreeTrainData_pred_float_buf_get,_wrap_CvDTreeTrainData_pred_float_buf_set,0,0},
+{"pred_int_buf",0,_wrap_CvDTreeTrainData_pred_int_buf_get,_wrap_CvDTreeTrainData_pred_int_buf_set,0,0},
+{"resp_float_buf",0,_wrap_CvDTreeTrainData_resp_float_buf_get,_wrap_CvDTreeTrainData_resp_float_buf_set,0,0},
+{"resp_int_buf",0,_wrap_CvDTreeTrainData_resp_int_buf_get,_wrap_CvDTreeTrainData_resp_int_buf_set,0,0},
+{"cv_lables_buf",0,_wrap_CvDTreeTrainData_cv_lables_buf_get,_wrap_CvDTreeTrainData_cv_lables_buf_set,0,0},
+{"sample_idx_buf",0,_wrap_CvDTreeTrainData_sample_idx_buf_get,_wrap_CvDTreeTrainData_sample_idx_buf_set,0,0},
+{"sample_count",0,_wrap_CvDTreeTrainData_sample_count_get,_wrap_CvDTreeTrainData_sample_count_set,0,0},
+{"var_all",0,_wrap_CvDTreeTrainData_var_all_get,_wrap_CvDTreeTrainData_var_all_set,0,0},
+{"var_count",0,_wrap_CvDTreeTrainData_var_count_get,_wrap_CvDTreeTrainData_var_count_set,0,0},
+{"max_c_count",0,_wrap_CvDTreeTrainData_max_c_count_get,_wrap_CvDTreeTrainData_max_c_count_set,0,0},
+{"ord_var_count",0,_wrap_CvDTreeTrainData_ord_var_count_get,_wrap_CvDTreeTrainData_ord_var_count_set,0,0},
+{"cat_var_count",0,_wrap_CvDTreeTrainData_cat_var_count_get,_wrap_CvDTreeTrainData_cat_var_count_set,0,0},
+{"work_var_count",0,_wrap_CvDTreeTrainData_work_var_count_get,_wrap_CvDTreeTrainData_work_var_count_set,0,0},
+{"have_labels",0,_wrap_CvDTreeTrainData_have_labels_get,_wrap_CvDTreeTrainData_have_labels_set,0,0},
+{"have_priors",0,_wrap_CvDTreeTrainData_have_priors_get,_wrap_CvDTreeTrainData_have_priors_set,0,0},
+{"is_classifier",0,_wrap_CvDTreeTrainData_is_classifier_get,_wrap_CvDTreeTrainData_is_classifier_set,0,0},
+{"tflag",0,_wrap_CvDTreeTrainData_tflag_get,_wrap_CvDTreeTrainData_tflag_set,0,0},
+{"train_data",0,_wrap_CvDTreeTrainData_train_data_get,_wrap_CvDTreeTrainData_train_data_set,0,0},
+{"responses",0,_wrap_CvDTreeTrainData_responses_get,_wrap_CvDTreeTrainData_responses_set,0,0},
+{"responses_copy",0,_wrap_CvDTreeTrainData_responses_copy_get,_wrap_CvDTreeTrainData_responses_copy_set,0,0},
+{"buf_count",0,_wrap_CvDTreeTrainData_buf_count_get,_wrap_CvDTreeTrainData_buf_count_set,0,0},
+{"buf_size",0,_wrap_CvDTreeTrainData_buf_size_get,_wrap_CvDTreeTrainData_buf_size_set,0,0},
+{"shared",0,_wrap_CvDTreeTrainData_shared_get,_wrap_CvDTreeTrainData_shared_set,0,0},
+{"is_buf_16u",0,_wrap_CvDTreeTrainData_is_buf_16u_get,_wrap_CvDTreeTrainData_is_buf_16u_set,0,0},
+{"cat_count",0,_wrap_CvDTreeTrainData_cat_count_get,_wrap_CvDTreeTrainData_cat_count_set,0,0},
+{"cat_ofs",0,_wrap_CvDTreeTrainData_cat_ofs_get,_wrap_CvDTreeTrainData_cat_ofs_set,0,0},
+{"cat_map",0,_wrap_CvDTreeTrainData_cat_map_get,_wrap_CvDTreeTrainData_cat_map_set,0,0},
+{"counts",0,_wrap_CvDTreeTrainData_counts_get,_wrap_CvDTreeTrainData_counts_set,0,0},
+{"buf",0,_wrap_CvDTreeTrainData_buf_get,_wrap_CvDTreeTrainData_buf_set,0,0},
+{"direction",0,_wrap_CvDTreeTrainData_direction_get,_wrap_CvDTreeTrainData_direction_set,0,0},
+{"split_buf",0,_wrap_CvDTreeTrainData_split_buf_get,_wrap_CvDTreeTrainData_split_buf_set,0,0},
+{"var_idx",0,_wrap_CvDTreeTrainData_var_idx_get,_wrap_CvDTreeTrainData_var_idx_set,0,0},
+{"var_type",0,_wrap_CvDTreeTrainData_var_type_get,_wrap_CvDTreeTrainData_var_type_set,0,0},
+{"priors",0,_wrap_CvDTreeTrainData_priors_get,_wrap_CvDTreeTrainData_priors_set,0,0},
+{"priors_mult",0,_wrap_CvDTreeTrainData_priors_mult_get,_wrap_CvDTreeTrainData_priors_mult_set,0,0},
+{"params",0,_wrap_CvDTreeTrainData_params_get,_wrap_CvDTreeTrainData_params_set,0,0},
+{"tree_storage",0,_wrap_CvDTreeTrainData_tree_storage_get,_wrap_CvDTreeTrainData_tree_storage_set,0,0},
+{"temp_storage",0,_wrap_CvDTreeTrainData_temp_storage_get,_wrap_CvDTreeTrainData_temp_storage_set,0,0},
+{"data_root",0,_wrap_CvDTreeTrainData_data_root_get,_wrap_CvDTreeTrainData_data_root_set,0,0},
+{"node_heap",0,_wrap_CvDTreeTrainData_node_heap_get,_wrap_CvDTreeTrainData_node_heap_set,0,0},
+{"split_heap",0,_wrap_CvDTreeTrainData_split_heap_get,_wrap_CvDTreeTrainData_split_heap_set,0,0},
+{"cv_heap",0,_wrap_CvDTreeTrainData_cv_heap_get,_wrap_CvDTreeTrainData_cv_heap_set,0,0},
+{"nv_heap",0,_wrap_CvDTreeTrainData_nv_heap_get,_wrap_CvDTreeTrainData_nv_heap_set,0,0},
+{"rng",0,_wrap_CvDTreeTrainData_rng_get,_wrap_CvDTreeTrainData_rng_set,0,0},
 {0,0,0,0}
 };
-static const char *swig_CvDTree_base_names[] = {"_p_CvStatModel",0};
-static const swig_type_info *swig_CvDTree_base[] = {0,0};
-static swig_octave_class _wrap_class_CvDTree = {"CvDTree", &SWIGTYPE_p_CvDTree,0,_wrap_new_CvDTree,0,_wrap_delete_CvDTree,swig_CvDTree_members,swig_CvDTree_base_names,swig_CvDTree_base };
+static const char *swig_CvDTreeTrainData_base_names[] = {0};
+static const swig_type_info *swig_CvDTreeTrainData_base[] = {0};
+static swig_octave_class _wrap_class_CvDTreeTrainData = {"CvDTreeTrainData", &SWIGTYPE_p_CvDTreeTrainData,0,_wrap_new_CvDTreeTrainData,0,_wrap_delete_CvDTreeTrainData,swig_CvDTreeTrainData_members,swig_CvDTreeTrainData_base_names,swig_CvDTreeTrainData_base };
 
-static octave_value_list _wrap_new_CvForestTree (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvDTree (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvForestTree *result = 0 ;
+  CvDTree *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvForestTree",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("new_CvDTree",args.length(),0,0,0)) {
     SWIG_fail;
   }
   {
     try {
-      result = (CvForestTree *)new CvForestTree(); 
+      result = (CvDTree *)new CvDTree(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvForestTree, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTree, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvForestTree (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
+static octave_value_list _wrap_delete_CvDTree (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("delete_CvForestTree",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("delete_CvDTree",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvForestTree" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvDTree" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
+  arg1 = (CvDTree *)(argp1);
   {
     try {
       delete arg1; 
@@ -26534,162 +26115,111 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvForestTree_train__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
-  CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvRTrees *arg4 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_CvDTree_train__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvDTreeParams arg9 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvForestTree_train",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),9,9,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
-  }
-  arg2 = (CvDTreeTrainData *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
-  arg4 = (CvRTrees *)(argp4);
-  {
-    try {
-      result = (bool)(arg1)->train(arg2,(CvMat const *)arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
-  _outv = SWIG_From_bool((bool)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvForestTree_get_var_count (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvForestTree_get_var_count",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_get_var_count" "', argument " "1"" of type '" "CvForestTree const *""'"); 
-  }
-  arg1 = (CvForestTree *)(argp1);
-  {
-    try {
-      result = (int)((CvForestTree const *)arg1)->get_var_count(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvForestTree_read__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
-  CvRTrees *arg4 = (CvRTrees *) 0 ;
-  CvDTreeTrainData *arg5 = (CvDTreeTrainData *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvForestTree_read",args.length(),5,5,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_read" "', argument " "1"" of type '" "CvForestTree *""'"); 
-  }
-  arg1 = (CvForestTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvDTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvDTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
   }
-  arg3 = (CvFileNode *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvRTrees, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_read" "', argument " "4"" of type '" "CvRTrees *""'"); 
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvDTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
   }
-  arg4 = (CvRTrees *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_read" "', argument " "5"" of type '" "CvDTreeTrainData *""'"); 
+  arg8 = (CvMat *)(argp8);
+  {
+    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvDTree_train" "', argument " "9"" of type '" "CvDTreeParams""'"); 
+    }  
+    if (!argp9) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvDTree_train" "', argument " "9"" of type '" "CvDTreeParams""'");
+    } else {
+      arg9 = *((CvDTreeParams *)(argp9));
+    }
   }
-  arg5 = (CvDTreeTrainData *)(argp5);
   {
     try {
-      (arg1)->read(arg2,arg3,arg4,arg5); 
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvForestTree_train__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
+static octave_value_list _wrap_CvDTree_train__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
@@ -26697,7 +26227,6 @@ static octave_value_list _wrap_CvForestTree_train__SWIG_1 (const octave_value_li
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
-  CvDTreeParams arg9 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -26714,70 +26243,57 @@ static octave_value_list _wrap_CvForestTree_train__SWIG_1 (const octave_value_li
   int res7 = 0 ;
   void *argp8 = 0 ;
   int res8 = 0 ;
-  void *argp9 ;
-  int res9 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvForestTree_train",args.length(),9,9,0)) {
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),8,8,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
+  arg1 = (CvDTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
   res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvForestTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvDTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
   arg6 = (CvMat *)(argp6);
   res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvForestTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvDTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
   }
   arg7 = (CvMat *)(argp7);
   res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvForestTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvDTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
   }
   arg8 = (CvMat *)(argp8);
-  {
-    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvForestTree_train" "', argument " "9"" of type '" "CvDTreeParams""'"); 
-    }  
-    if (!argp9) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvForestTree_train" "', argument " "9"" of type '" "CvDTreeParams""'");
-    } else {
-      arg9 = *((CvDTreeParams *)(argp9));
-    }
-  }
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
     } 
     catch (...) 
     {
@@ -26791,15 +26307,14 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvForestTree_train__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
+static octave_value_list _wrap_CvDTree_train__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -26814,59 +26329,52 @@ static octave_value_list _wrap_CvForestTree_train__SWIG_2 (const octave_value_li
   int res6 = 0 ;
   void *argp7 = 0 ;
   int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvForestTree_train",args.length(),8,8,0)) {
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),7,7,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
+  arg1 = (CvDTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
   res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvForestTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvDTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
   arg6 = (CvMat *)(argp6);
   res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvForestTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvDTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
   }
   arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvForestTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
     } 
     catch (...) 
     {
@@ -26880,14 +26388,13 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvForestTree_train__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
+static octave_value_list _wrap_CvDTree_train__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -26900,54 +26407,47 @@ static octave_value_list _wrap_CvForestTree_train__SWIG_3 (const octave_value_li
   int res5 = 0 ;
   void *argp6 = 0 ;
   int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvForestTree_train",args.length(),7,7,0)) {
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),6,6,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
+  arg1 = (CvDTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
   res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvForestTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvDTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
   arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvForestTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
     } 
     catch (...) 
     {
@@ -26961,13 +26461,12 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvForestTree_train__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
+static octave_value_list _wrap_CvDTree_train__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -26978,49 +26477,42 @@ static octave_value_list _wrap_CvForestTree_train__SWIG_4 (const octave_value_li
   int res4 = 0 ;
   void *argp5 = 0 ;
   int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvForestTree_train",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),5,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
+  arg1 = (CvDTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvDTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvForestTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
     } 
     catch (...) 
     {
@@ -27034,12 +26526,11 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvForestTree_train__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
+static octave_value_list _wrap_CvDTree_train__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -27048,44 +26539,92 @@ static octave_value_list _wrap_CvForestTree_train__SWIG_5 (const octave_value_li
   int ecode3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvForestTree_train",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
+  arg1 = (CvDTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvDTree_train__SWIG_6 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  CvDTreeParams arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
+  }
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvDTreeParams,  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "CvDTreeParams""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvDTree_train" "', argument " "3"" of type '" "CvDTreeParams""'");
+    } else {
+      arg3 = *((CvDTreeParams *)(argp3));
+    }
   }
-  arg5 = (CvMat *)(argp5);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+      result = (bool)(arg1)->train(arg2,arg3); 
     } 
     catch (...) 
     {
@@ -27099,65 +26638,185 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvForestTree_train__SWIG_6 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvDTree_train__SWIG_7 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
+  }
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    try {
+      result = (bool)(arg1)->train(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvDTree_calc_error__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
   int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  float result;
   
-  if (!SWIG_check_num_args("CvForestTree_train",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvDTree_calc_error",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_calc_error" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_calc_error" "', argument " "2"" of type '" "CvMLData *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
+  arg2 = (CvMLData *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvDTree_calc_error" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  {
+    try {
+      result = (float)(arg1)->calc_error(arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg4 = (CvMat *)(argp4);
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvDTree_calc_error__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvDTree_calc_error",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_calc_error" "', argument " "1"" of type '" "CvDTree *""'"); 
+  }
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_calc_error" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+      result = (float)(arg1)->calc_error(arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvForestTree_train__SWIG_7 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
+static octave_value_list _wrap_CvDTree_calc_error (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[3]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
+  };
+  
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvDTree_calc_error__SWIG_1(args, nargout);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_CvDTree_calc_error__SWIG_0(args, nargout);
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvDTree_train__SWIG_8 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   void *argp1 = 0 ;
@@ -27171,22 +26830,22 @@ static octave_value_list _wrap_CvForestTree_train__SWIG_7 (const octave_value_li
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvForestTree_train",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvDTree_train",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_train" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
+  arg1 = (CvDTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
   }
   arg2 = (CvDTreeTrainData *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
   {
@@ -27205,60 +26864,49 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTree_train (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[9]={
     octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
   };
   
-  if (argc == 3) {
+  if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvForestTree_train__SWIG_7(args, nargout);
-        }
+        return _wrap_CvDTree_train__SWIG_7(args, nargout);
       }
     }
   }
-  if (argc == 4) {
+  if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
+        _v = SWIG_CheckState(res);
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvForestTree_train__SWIG_6(args, nargout);
-          }
+          return _wrap_CvDTree_train__SWIG_6(args, nargout);
         }
       }
     }
   }
-  if (argc == 4) {
+  if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -27269,20 +26917,15 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvRTrees, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvForestTree_train__SWIG_0(args, nargout);
-          }
+          return _wrap_CvDTree_train__SWIG_8(args, nargout);
         }
       }
     }
   }
-  if (argc == 5) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -27298,11 +26941,36 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
           int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
+            return _wrap_CvDTree_train__SWIG_5(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
             if (_v) {
-              return _wrap_CvForestTree_train__SWIG_5(args, nargout);
+              return _wrap_CvDTree_train__SWIG_4(args, nargout);
             }
           }
         }
@@ -27312,7 +26980,7 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
   if (argc == 6) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -27336,7 +27004,7 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
               int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
               _v = SWIG_CheckState(res);
               if (_v) {
-                return _wrap_CvForestTree_train__SWIG_4(args, nargout);
+                return _wrap_CvDTree_train__SWIG_3(args, nargout);
               }
             }
           }
@@ -27347,7 +27015,7 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
   if (argc == 7) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -27375,7 +27043,7 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
                 int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
                 _v = SWIG_CheckState(res);
                 if (_v) {
-                  return _wrap_CvForestTree_train__SWIG_3(args, nargout);
+                  return _wrap_CvDTree_train__SWIG_2(args, nargout);
                 }
               }
             }
@@ -27387,7 +27055,7 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
   if (argc == 8) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -27419,7 +27087,7 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
                   int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
                   _v = SWIG_CheckState(res);
                   if (_v) {
-                    return _wrap_CvForestTree_train__SWIG_2(args, nargout);
+                    return _wrap_CvDTree_train__SWIG_1(args, nargout);
                   }
                 }
               }
@@ -27432,7 +27100,7 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
   if (argc == 9) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -27468,7 +27136,7 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
                     int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
                     _v = SWIG_CheckState(res);
                     if (_v) {
-                      return _wrap_CvForestTree_train__SWIG_1(args, nargout);
+                      return _wrap_CvDTree_train__SWIG_0(args, nargout);
                     }
                   }
                 }
@@ -27485,183 +27153,212 @@ static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args
 }
 
 
-static octave_value_list _wrap_CvForestTree_read__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
+static octave_value_list _wrap_CvDTree_predict__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  bool arg4 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvDTreeNode *result = 0 ;
   
-  if (!SWIG_check_num_args("CvForestTree_read",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvDTree_predict",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_read" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_predict" "', argument " "1"" of type '" "CvDTree const *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
-  arg3 = (CvFileNode *)(argp3);
+  arg3 = (CvMat *)(argp3);
+  ecode4 = SWIG_AsVal_bool(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvDTree_predict" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = (bool)(val4);
   {
     try {
-      (arg1)->read(arg2,arg3); 
+      result = (CvDTreeNode *)((CvDTree const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvForestTree_read__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvForestTree *arg1 = (CvForestTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
-  CvDTreeTrainData *arg4 = (CvDTreeTrainData *) 0 ;
+static octave_value_list _wrap_CvDTree_predict__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvDTreeNode *result = 0 ;
   
-  if (!SWIG_check_num_args("CvForestTree_read",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvDTree_predict",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_read" "', argument " "1"" of type '" "CvForestTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_predict" "', argument " "1"" of type '" "CvDTree const *""'"); 
   }
-  arg1 = (CvForestTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
-  arg3 = (CvFileNode *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_read" "', argument " "4"" of type '" "CvDTreeTrainData *""'"); 
+  arg3 = (CvMat *)(argp3);
+  {
+    try {
+      result = (CvDTreeNode *)((CvDTree const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg4 = (CvDTreeTrainData *)(argp4);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvDTree_predict__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvDTreeNode *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvDTree_predict",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_predict" "', argument " "1"" of type '" "CvDTree const *""'"); 
+  }
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
   {
     try {
-      (arg1)->read(arg2,arg3,arg4); 
+      result = (CvDTreeNode *)((CvDTree const *)arg1)->predict((CvMat const *)arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvForestTree_read (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTree_predict (const octave_value_list& args, int nargout) {
   int argc = args.length();
-  octave_value_ref argv[5]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
+  octave_value_ref argv[4]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
   };
   
-  if (argc == 3) {
+  if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvForestTree_read__SWIG_1(args, nargout);
-        }
+        return _wrap_CvDTree_predict__SWIG_2(args, nargout);
       }
     }
   }
-  if (argc == 4) {
+  if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvForestTree_read__SWIG_2(args, nargout);
-          }
+          return _wrap_CvDTree_predict__SWIG_1(args, nargout);
         }
       }
     }
   }
-  if (argc == 5) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvRTrees, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
             _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvForestTree_read__SWIG_0(args, nargout);
-            }
+          }
+          if (_v) {
+            return _wrap_CvDTree_predict__SWIG_0(args, nargout);
           }
         }
       }
@@ -27673,98 +27370,112 @@ static octave_value_list _wrap_CvForestTree_read (const octave_value_list& args,
 }
 
 
-static swig_octave_member swig_CvForestTree_members[] = {
-{"get_var_count",_wrap_CvForestTree_get_var_count,0,0,0,0},
-{"train",_wrap_CvForestTree_train,0,0,0,0},
-{"read",_wrap_CvForestTree_read,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvForestTree_base_names[] = {"_p_CvDTree",0};
-static const swig_type_info *swig_CvForestTree_base[] = {0,0};
-static swig_octave_class _wrap_class_CvForestTree = {"CvForestTree", &SWIGTYPE_p_CvForestTree,0,_wrap_new_CvForestTree,0,_wrap_delete_CvForestTree,swig_CvForestTree_members,swig_CvForestTree_base_names,swig_CvForestTree_base };
-
-static octave_value_list _wrap_CvRTParams_calc_var_importance_set (const octave_value_list& args, int nargout) {
-  CvRTParams *arg1 = (CvRTParams *) 0 ;
-  bool arg2 ;
+static octave_value_list _wrap_CvDTree_get_var_importance (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  bool val2 ;
-  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvRTParams_calc_var_importance_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTree_get_var_importance",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_calc_var_importance_set" "', argument " "1"" of type '" "CvRTParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_get_var_importance" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvRTParams *)(argp1);
-  ecode2 = SWIG_AsVal_bool(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvRTParams_calc_var_importance_set" "', argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = (bool)(val2);
-  if (arg1) (arg1)->calc_var_importance = arg2;
-  _outv = octave_value();
+  arg1 = (CvDTree *)(argp1);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_var_importance(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTParams_calc_var_importance_get (const octave_value_list& args, int nargout) {
-  CvRTParams *arg1 = (CvRTParams *) 0 ;
+static octave_value_list _wrap_CvDTree_clear (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvRTParams_calc_var_importance_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTree_clear",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_calc_var_importance_get" "', argument " "1"" of type '" "CvRTParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_clear" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvRTParams *)(argp1);
-  result = (bool) ((arg1)->calc_var_importance);
-  _outv = SWIG_From_bool((bool)(result));
+  arg1 = (CvDTree *)(argp1);
+  {
+    try {
+      (arg1)->clear(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTParams_nactive_vars_set (const octave_value_list& args, int nargout) {
-  CvRTParams *arg1 = (CvRTParams *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_CvDTree_read__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvRTParams_nactive_vars_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTree_read",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_nactive_vars_set" "', argument " "1"" of type '" "CvRTParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_read" "', argument " "1"" of type '" "CvDTree *""'"); 
+  }
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  }
+  arg3 = (CvFileNode *)(argp3);
+  {
+    try {
+      (arg1)->read(arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvRTParams *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvRTParams_nactive_vars_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->nactive_vars = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -27772,56 +27483,105 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTParams_nactive_vars_get (const octave_value_list& args, int nargout) {
-  CvRTParams *arg1 = (CvRTParams *) 0 ;
+static octave_value_list _wrap_CvDTree_write__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvRTParams_nactive_vars_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTree_write",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_nactive_vars_get" "', argument " "1"" of type '" "CvRTParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_write" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvRTParams *)(argp1);
-  result = (int) ((arg1)->nactive_vars);
-  _outv = SWIG_From_int((int)(result));
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_write" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = (char *)(buf3);
+  {
+    try {
+      (arg1)->write(arg2,(char const *)arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTParams_term_crit_set (const octave_value_list& args, int nargout) {
-  CvRTParams *arg1 = (CvRTParams *) 0 ;
-  CvTermCriteria *arg2 = (CvTermCriteria *) 0 ;
+static octave_value_list _wrap_CvDTree_read__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
+  CvDTreeTrainData *arg4 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvRTParams_term_crit_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvDTree_read",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_term_crit_set" "', argument " "1"" of type '" "CvRTParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_read" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvRTParams *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvTermCriteria, 0 |  0 );
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTParams_term_crit_set" "', argument " "2"" of type '" "CvTermCriteria *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvDTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  }
+  arg3 = (CvFileNode *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvDTree_read" "', argument " "4"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg4 = (CvDTreeTrainData *)(argp4);
+  {
+    try {
+      (arg1)->read(arg2,arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg2 = (CvTermCriteria *)(argp2);
-  if (arg1) (arg1)->term_crit = *arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -27829,336 +27589,302 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTParams_term_crit_get (const octave_value_list& args, int nargout) {
-  CvRTParams *arg1 = (CvRTParams *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvTermCriteria *result = 0 ;
+static octave_value_list _wrap_CvDTree_read (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[4]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
+  };
   
-  if (!SWIG_check_num_args("CvRTParams_term_crit_get",args.length(),1,1,0)) {
-    SWIG_fail;
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvDTree_read__SWIG_0(args, nargout);
+        }
+      }
+    }
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_term_crit_get" "', argument " "1"" of type '" "CvRTParams *""'"); 
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvDTree_read__SWIG_1(args, nargout);
+          }
+        }
+      }
+    }
   }
-  arg1 = (CvRTParams *)(argp1);
-  result = (CvTermCriteria *)& ((arg1)->term_crit);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTermCriteria, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
+  
+  error("No matching function for overload");
+  return octave_value_list();
 }
 
 
-static octave_value_list _wrap_new_CvRTParams__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvDTree_write__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvRTParams *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvRTParams",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("CvDTree_write",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  {
-    try {
-      result = (CvRTParams *)new CvRTParams(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_write" "', argument " "1"" of type '" "CvDTree *""'"); 
+  }
+  arg1 = (CvDTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvDTree_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  {
+    try {
+      (arg1)->write(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvRTParams, 1 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvRTParams__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  float arg3 ;
-  bool arg4 ;
-  int arg5 ;
-  float *arg6 = (float *) 0 ;
-  bool arg7 ;
-  int arg8 ;
-  int arg9 ;
-  float arg10 ;
-  int arg11 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  float val3 ;
-  int ecode3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  bool val7 ;
-  int ecode7 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  int val9 ;
-  int ecode9 = 0 ;
-  float val10 ;
-  int ecode10 = 0 ;
-  int val11 ;
-  int ecode11 = 0 ;
+static octave_value_list _wrap_CvDTree_write (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[3]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
+  };
+  
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvDTree_write__SWIG_1(args, nargout);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvDTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvDTree_write__SWIG_0(args, nargout);
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvDTree_get_root (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvRTParams *result = 0 ;
+  CvDTreeNode *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvRTParams",args.length(),11,11,0)) {
+  if (!SWIG_check_num_args("CvDTree_get_root",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvRTParams" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvRTParams" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_float(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvRTParams" "', argument " "3"" of type '" "float""'");
-  } 
-  arg3 = (float)(val3);
-  ecode4 = SWIG_AsVal_bool(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvRTParams" "', argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = (bool)(val4);
-  ecode5 = SWIG_AsVal_int(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_CvRTParams" "', argument " "5"" of type '" "int""'");
-  } 
-  arg5 = (int)(val5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_float, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvRTParams" "', argument " "6"" of type '" "float const *""'"); 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_get_root" "', argument " "1"" of type '" "CvDTree const *""'"); 
   }
-  arg6 = (float *)(argp6);
-  ecode7 = SWIG_AsVal_bool(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_CvRTParams" "', argument " "7"" of type '" "bool""'");
-  } 
-  arg7 = (bool)(val7);
-  ecode8 = SWIG_AsVal_int(args(7), &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "new_CvRTParams" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  ecode9 = SWIG_AsVal_int(args(8), &val9);
-  if (!SWIG_IsOK(ecode9)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "new_CvRTParams" "', argument " "9"" of type '" "int""'");
-  } 
-  arg9 = (int)(val9);
-  ecode10 = SWIG_AsVal_float(args(9), &val10);
-  if (!SWIG_IsOK(ecode10)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "new_CvRTParams" "', argument " "10"" of type '" "float""'");
-  } 
-  arg10 = (float)(val10);
-  ecode11 = SWIG_AsVal_int(args(10), &val11);
-  if (!SWIG_IsOK(ecode11)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "new_CvRTParams" "', argument " "11"" of type '" "int""'");
-  } 
-  arg11 = (int)(val11);
+  arg1 = (CvDTree *)(argp1);
   {
     try {
-      result = (CvRTParams *)new CvRTParams(arg1,arg2,arg3,arg4,arg5,(float const *)arg6,arg7,arg8,arg9,arg10,arg11); 
+      result = (CvDTreeNode *)((CvDTree const *)arg1)->get_root(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvRTParams, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvRTParams (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[11]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8),octave_value_ref(args,9),octave_value_ref(args,10)
-  };
+static octave_value_list _wrap_CvDTree_get_pruned_tree_idx (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
   
-  if (argc == 0) {
-    return _wrap_new_CvRTParams__SWIG_0(args, nargout);
+  if (!SWIG_check_num_args("CvDTree_get_pruned_tree_idx",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (argc == 11) {
-    int _v;
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_get_pruned_tree_idx" "', argument " "1"" of type '" "CvDTree const *""'"); 
+  }
+  arg1 = (CvDTree *)(argp1);
+  {
+    try {
+      result = (int)((CvDTree const *)arg1)->get_pruned_tree_idx(); 
+    } 
+    catch (...) 
     {
-      int res = SWIG_AsVal_int(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_float(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_bool(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_int(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_float, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_bool(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
-                  if (_v) {
-                    {
-                      int res = SWIG_AsVal_int(argv[8], NULL);
-                      _v = SWIG_CheckState(res);
-                    }
-                    if (_v) {
-                      {
-                        int res = SWIG_AsVal_float(argv[9], NULL);
-                        _v = SWIG_CheckState(res);
-                      }
-                      if (_v) {
-                        {
-                          int res = SWIG_AsVal_int(argv[10], NULL);
-                          _v = SWIG_CheckState(res);
-                        }
-                        if (_v) {
-                          return _wrap_new_CvRTParams__SWIG_1(args, nargout);
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
+      SWIG_fail;
+    } 
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvRTParams (const octave_value_list& args, int nargout) {
-  CvRTParams *arg1 = (CvRTParams *) 0 ;
+static octave_value_list _wrap_CvDTree_get_data (const octave_value_list& args, int nargout) {
+  CvDTree *arg1 = (CvDTree *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvDTreeTrainData *result = 0 ;
   
-  if (!SWIG_check_num_args("delete_CvRTParams",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvDTree_get_data",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvRTParams" "', argument " "1"" of type '" "CvRTParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvDTree_get_data" "', argument " "1"" of type '" "CvDTree *""'"); 
   }
-  arg1 = (CvRTParams *)(argp1);
+  arg1 = (CvDTree *)(argp1);
   {
     try {
-      delete arg1
+      result = (CvDTreeTrainData *)(arg1)->get_data()
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static swig_octave_member swig_CvRTParams_members[] = {
-{"calc_var_importance",0,_wrap_CvRTParams_calc_var_importance_get,_wrap_CvRTParams_calc_var_importance_set,0,0},
-{"nactive_vars",0,_wrap_CvRTParams_nactive_vars_get,_wrap_CvRTParams_nactive_vars_set,0,0},
-{"term_crit",0,_wrap_CvRTParams_term_crit_get,_wrap_CvRTParams_term_crit_set,0,0},
+static swig_octave_member swig_CvDTree_members[] = {
+{"calc_error",_wrap_CvDTree_calc_error,0,0,0,0},
+{"train",_wrap_CvDTree_train,0,0,0,0},
+{"predict",_wrap_CvDTree_predict,0,0,0,0},
+{"get_var_importance",_wrap_CvDTree_get_var_importance,0,0,0,0},
+{"clear",_wrap_CvDTree_clear,0,0,0,0},
+{"read",_wrap_CvDTree_read,0,0,0,0},
+{"write",_wrap_CvDTree_write,0,0,0,0},
+{"get_root",_wrap_CvDTree_get_root,0,0,0,0},
+{"get_pruned_tree_idx",_wrap_CvDTree_get_pruned_tree_idx,0,0,0,0},
+{"get_data",_wrap_CvDTree_get_data,0,0,0,0},
 {0,0,0,0}
 };
-static const char *swig_CvRTParams_base_names[] = {"_p_CvDTreeParams",0};
-static const swig_type_info *swig_CvRTParams_base[] = {0,0};
-static swig_octave_class _wrap_class_CvRTParams = {"CvRTParams", &SWIGTYPE_p_CvRTParams,0,_wrap_new_CvRTParams,0,_wrap_delete_CvRTParams,swig_CvRTParams_members,swig_CvRTParams_base_names,swig_CvRTParams_base };
+static const char *swig_CvDTree_base_names[] = {"_p_CvStatModel",0};
+static const swig_type_info *swig_CvDTree_base[] = {0,0};
+static swig_octave_class _wrap_class_CvDTree = {"CvDTree", &SWIGTYPE_p_CvDTree,0,_wrap_new_CvDTree,0,_wrap_delete_CvDTree,swig_CvDTree_members,swig_CvDTree_base_names,swig_CvDTree_base };
 
-static octave_value_list _wrap_new_CvRTrees (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvForestTree (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvRTrees *result = 0 ;
+  CvForestTree *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvRTrees",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("new_CvForestTree",args.length(),0,0,0)) {
     SWIG_fail;
   }
   {
     try {
-      result = (CvRTrees *)new CvRTrees(); 
+      result = (CvForestTree *)new CvForestTree(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvRTrees, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvForestTree, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvRTrees (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_delete_CvForestTree (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("delete_CvRTrees",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("delete_CvForestTree",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvRTrees" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvForestTree" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
+  arg1 = (CvForestTree *)(argp1);
   {
     try {
       delete arg1; 
@@ -28175,8 +27901,162 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_train__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_CvForestTree_train__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
+  CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvRTrees *arg4 = (CvRTrees *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvForestTree_train",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+  }
+  arg1 = (CvForestTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg2 = (CvDTreeTrainData *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvRTrees *""'"); 
+  }
+  arg4 = (CvRTrees *)(argp4);
+  {
+    try {
+      result = (bool)(arg1)->train(arg2,(CvMat const *)arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvForestTree_get_var_count (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvForestTree_get_var_count",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_get_var_count" "', argument " "1"" of type '" "CvForestTree const *""'"); 
+  }
+  arg1 = (CvForestTree *)(argp1);
+  {
+    try {
+      result = (int)((CvForestTree const *)arg1)->get_var_count(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvForestTree_read__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
+  CvRTrees *arg4 = (CvRTrees *) 0 ;
+  CvDTreeTrainData *arg5 = (CvDTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvForestTree_read",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_read" "', argument " "1"" of type '" "CvForestTree *""'"); 
+  }
+  arg1 = (CvForestTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  }
+  arg3 = (CvFileNode *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_read" "', argument " "4"" of type '" "CvRTrees *""'"); 
+  }
+  arg4 = (CvRTrees *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_read" "', argument " "5"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg5 = (CvDTreeTrainData *)(argp5);
+  {
+    try {
+      (arg1)->read(arg2,arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvForestTree_train__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
@@ -28184,7 +28064,7 @@ static octave_value_list _wrap_CvRTrees_train__SWIG_0 (const octave_value_list&
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
-  CvRTParams arg9 ;
+  CvDTreeParams arg9 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -28208,58 +28088,58 @@ static octave_value_list _wrap_CvRTrees_train__SWIG_0 (const octave_value_list&
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_train",args.length(),9,9,0)) {
+  if (!SWIG_check_num_args("CvForestTree_train",args.length(),9,9,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
+  arg1 = (CvForestTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
   res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvRTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvForestTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
   arg6 = (CvMat *)(argp6);
   res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvRTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvForestTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
   }
   arg7 = (CvMat *)(argp7);
   res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvRTrees_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvForestTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
   }
   arg8 = (CvMat *)(argp8);
   {
-    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvRTParams,  0 );
+    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
     if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvRTrees_train" "', argument " "9"" of type '" "CvRTParams""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvForestTree_train" "', argument " "9"" of type '" "CvDTreeParams""'"); 
     }  
     if (!argp9) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRTrees_train" "', argument " "9"" of type '" "CvRTParams""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvForestTree_train" "', argument " "9"" of type '" "CvDTreeParams""'");
     } else {
-      arg9 = *((CvRTParams *)(argp9));
+      arg9 = *((CvDTreeParams *)(argp9));
     }
   }
   {
@@ -28278,8 +28158,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_train__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_CvForestTree_train__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
@@ -28308,47 +28188,47 @@ static octave_value_list _wrap_CvRTrees_train__SWIG_1 (const octave_value_list&
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_train",args.length(),8,8,0)) {
+  if (!SWIG_check_num_args("CvForestTree_train",args.length(),8,8,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
+  arg1 = (CvForestTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
   res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvRTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvForestTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
   arg6 = (CvMat *)(argp6);
   res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvRTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvForestTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
   }
   arg7 = (CvMat *)(argp7);
   res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvRTrees_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvForestTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
   }
   arg8 = (CvMat *)(argp8);
   {
@@ -28367,8 +28247,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_train__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_CvForestTree_train__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
@@ -28394,42 +28274,42 @@ static octave_value_list _wrap_CvRTrees_train__SWIG_2 (const octave_value_list&
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_train",args.length(),7,7,0)) {
+  if (!SWIG_check_num_args("CvForestTree_train",args.length(),7,7,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
+  arg1 = (CvForestTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
   res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvRTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvForestTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
   arg6 = (CvMat *)(argp6);
   res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvRTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvForestTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
   }
   arg7 = (CvMat *)(argp7);
   {
@@ -28448,8 +28328,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_train__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_CvForestTree_train__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
@@ -28472,37 +28352,37 @@ static octave_value_list _wrap_CvRTrees_train__SWIG_3 (const octave_value_list&
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_train",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("CvForestTree_train",args.length(),6,6,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
+  arg1 = (CvForestTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
   res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvRTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvForestTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
   arg6 = (CvMat *)(argp6);
   {
@@ -28521,8 +28401,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_train__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_CvForestTree_train__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
@@ -28542,32 +28422,32 @@ static octave_value_list _wrap_CvRTrees_train__SWIG_4 (const octave_value_list&
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_train",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvForestTree_train",args.length(),5,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
+  arg1 = (CvForestTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvForestTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
   {
@@ -28586,8 +28466,8 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_train__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_CvForestTree_train__SWIG_6 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
@@ -28604,27 +28484,27 @@ static octave_value_list _wrap_CvRTrees_train__SWIG_5 (const octave_value_list&
   octave_value _outv;
   bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_train",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvForestTree_train",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
+  arg1 = (CvForestTree *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
   {
@@ -28643,41 +28523,84 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_train (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvForestTree_train__SWIG_7 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
+  CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvForestTree_train",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_train" "', argument " "1"" of type '" "CvForestTree *""'"); 
+  }
+  arg1 = (CvForestTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg2 = (CvDTreeTrainData *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  {
+    try {
+      result = (bool)(arg1)->train(arg2,(CvMat const *)arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvForestTree_train (const octave_value_list& args, int nargout) {
   int argc = args.length();
   octave_value_ref argv[9]={
     octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
   };
   
-  if (argc == 4) {
+  if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvRTrees_train__SWIG_5(args, nargout);
-          }
+          return _wrap_CvForestTree_train__SWIG_7(args, nargout);
         }
       }
     }
   }
-  if (argc == 5) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -28693,56 +28616,40 @@ static octave_value_list _wrap_CvRTrees_train (const octave_value_list& args, in
           int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvRTrees_train__SWIG_4(args, nargout);
-            }
+            return _wrap_CvForestTree_train__SWIG_6(args, nargout);
           }
         }
       }
     }
   }
-  if (argc == 6) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvRTrees, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvRTrees_train__SWIG_3(args, nargout);
-              }
-            }
+            return _wrap_CvForestTree_train__SWIG_0(args, nargout);
           }
         }
       }
     }
   }
-  if (argc == 7) {
+  if (argc == 5) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -28762,27 +28669,17 @@ static octave_value_list _wrap_CvRTrees_train (const octave_value_list& args, in
             int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
             _v = SWIG_CheckState(res);
             if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvRTrees_train__SWIG_2(args, nargout);
-                }
-              }
+              return _wrap_CvForestTree_train__SWIG_5(args, nargout);
             }
           }
         }
       }
     }
   }
-  if (argc == 8) {
+  if (argc == 6) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -28806,17 +28703,7 @@ static octave_value_list _wrap_CvRTrees_train (const octave_value_list& args, in
               int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
               _v = SWIG_CheckState(res);
               if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_CvRTrees_train__SWIG_1(args, nargout);
-                  }
-                }
+                return _wrap_CvForestTree_train__SWIG_4(args, nargout);
               }
             }
           }
@@ -28824,10 +28711,95 @@ static octave_value_list _wrap_CvRTrees_train (const octave_value_list& args, in
       }
     }
   }
-  if (argc == 9) {
+  if (argc == 7) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  return _wrap_CvForestTree_train__SWIG_3(args, nargout);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 8) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    return _wrap_CvForestTree_train__SWIG_2(args, nargout);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 9) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -28860,10 +28832,10 @@ static octave_value_list _wrap_CvRTrees_train (const octave_value_list& args, in
                   _v = SWIG_CheckState(res);
                   if (_v) {
                     void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvRTParams, 0);
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
                     _v = SWIG_CheckState(res);
                     if (_v) {
-                      return _wrap_CvRTrees_train__SWIG_0(args, nargout);
+                      return _wrap_CvForestTree_train__SWIG_1(args, nargout);
                     }
                   }
                 }
@@ -28880,10 +28852,10 @@ static octave_value_list _wrap_CvRTrees_train (const octave_value_list& args, in
 }
 
 
-static octave_value_list _wrap_CvRTrees_predict__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvForestTree_read__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -28893,118 +28865,171 @@ static octave_value_list _wrap_CvRTrees_predict__SWIG_0 (const octave_value_list
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
   
-  if (!SWIG_check_num_args("CvRTrees_predict",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvForestTree_read",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_predict" "', argument " "1"" of type '" "CvRTrees const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_read" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvForestTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
   }
-  arg3 = (CvMat *)(argp3);
+  arg3 = (CvFileNode *)(argp3);
   {
     try {
-      result = (float)((CvRTrees const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3); 
+      (arg1)->read(arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_float((float)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_predict__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvForestTree_read__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvForestTree *arg1 = (CvForestTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
+  CvDTreeTrainData *arg4 = (CvDTreeTrainData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
   
-  if (!SWIG_check_num_args("CvRTrees_predict",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvForestTree_read",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_predict" "', argument " "1"" of type '" "CvRTrees const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvForestTree_read" "', argument " "1"" of type '" "CvForestTree *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvForestTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvForestTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvForestTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  }
+  arg3 = (CvFileNode *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvForestTree_read" "', argument " "4"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg4 = (CvDTreeTrainData *)(argp4);
   {
     try {
-      result = (float)((CvRTrees const *)arg1)->predict((CvMat const *)arg2); 
+      (arg1)->read(arg2,arg3,arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_float((float)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_predict (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvForestTree_read (const octave_value_list& args, int nargout) {
   int argc = args.length();
-  octave_value_ref argv[3]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
+  octave_value_ref argv[5]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
   };
   
-  if (argc == 2) {
+  if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_CvRTrees_predict__SWIG_1(args, nargout);
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvForestTree_read__SWIG_1(args, nargout);
+        }
       }
     }
   }
-  if (argc == 3) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_CvRTrees_predict__SWIG_0(args, nargout);
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvForestTree_read__SWIG_2(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvForestTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvRTrees, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvForestTree_read__SWIG_0(args, nargout);
+            }
+          }
         }
       }
     }
@@ -29015,31 +29040,41 @@ static octave_value_list _wrap_CvRTrees_predict (const octave_value_list& args,
 }
 
 
-static octave_value_list _wrap_CvRTrees_clear (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static swig_octave_member swig_CvForestTree_members[] = {
+{"get_var_count",_wrap_CvForestTree_get_var_count,0,0,0,0},
+{"train",_wrap_CvForestTree_train,0,0,0,0},
+{"read",_wrap_CvForestTree_read,0,0,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvForestTree_base_names[] = {"_p_CvDTree",0};
+static const swig_type_info *swig_CvForestTree_base[] = {0,0};
+static swig_octave_class _wrap_class_CvForestTree = {"CvForestTree", &SWIGTYPE_p_CvForestTree,0,_wrap_new_CvForestTree,0,_wrap_delete_CvForestTree,swig_CvForestTree_members,swig_CvForestTree_base_names,swig_CvForestTree_base };
+
+static octave_value_list _wrap_CvRTParams_calc_var_importance_set (const octave_value_list& args, int nargout) {
+  CvRTParams *arg1 = (CvRTParams *) 0 ;
+  bool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvRTrees_clear",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvRTParams_calc_var_importance_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_clear" "', argument " "1"" of type '" "CvRTrees *""'"); 
-  }
-  arg1 = (CvRTrees *)(argp1);
-  {
-    try {
-      (arg1)->clear(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_calc_var_importance_set" "', argument " "1"" of type '" "CvRTParams *""'"); 
   }
+  arg1 = (CvRTParams *)(argp1);
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvRTParams_calc_var_importance_set" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = (bool)(val2);
+  if (arg1) (arg1)->calc_var_importance = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -29047,282 +29082,355 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_var_importance (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
+static octave_value_list _wrap_CvRTParams_calc_var_importance_get (const octave_value_list& args, int nargout) {
+  CvRTParams *arg1 = (CvRTParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
+  bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_get_var_importance",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvRTParams_calc_var_importance_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_var_importance" "', argument " "1"" of type '" "CvRTrees *""'"); 
-  }
-  arg1 = (CvRTrees *)(argp1);
-  {
-    try {
-      result = (CvMat *)(arg1)->get_var_importance(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_calc_var_importance_get" "', argument " "1"" of type '" "CvRTParams *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvRTParams *)(argp1);
+  result = (bool) ((arg1)->calc_var_importance);
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_proximity__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvRTParams_nactive_vars_set (const octave_value_list& args, int nargout) {
+  CvRTParams *arg1 = (CvRTParams *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
   
-  if (!SWIG_check_num_args("CvRTrees_get_proximity",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvRTParams_nactive_vars_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_proximity" "', argument " "1"" of type '" "CvRTrees const *""'"); 
-  }
-  arg1 = (CvRTrees *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_get_proximity" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_get_proximity" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_get_proximity" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_nactive_vars_set" "', argument " "1"" of type '" "CvRTParams *""'"); 
   }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_get_proximity" "', argument " "5"" of type '" "CvMat const *""'"); 
+  arg1 = (CvRTParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvRTParams_nactive_vars_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->nactive_vars = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvRTParams_nactive_vars_get (const octave_value_list& args, int nargout) {
+  CvRTParams *arg1 = (CvRTParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvRTParams_nactive_vars_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  arg5 = (CvMat *)(argp5);
-  {
-    try {
-      result = (float)((CvRTrees const *)arg1)->get_proximity((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_nactive_vars_get" "', argument " "1"" of type '" "CvRTParams *""'"); 
   }
-  _outv = SWIG_From_float((float)(result));
+  arg1 = (CvRTParams *)(argp1);
+  result = (int) ((arg1)->nactive_vars);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_proximity__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvRTParams_term_crit_set (const octave_value_list& args, int nargout) {
+  CvRTParams *arg1 = (CvRTParams *) 0 ;
+  CvTermCriteria *arg2 = (CvTermCriteria *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
   
-  if (!SWIG_check_num_args("CvRTrees_get_proximity",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvRTParams_term_crit_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_proximity" "', argument " "1"" of type '" "CvRTrees const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_term_crit_set" "', argument " "1"" of type '" "CvRTParams *""'"); 
   }
-  arg1 = (CvRTrees *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvRTParams *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvTermCriteria, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_get_proximity" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_get_proximity" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_get_proximity" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  {
-    try {
-      result = (float)((CvRTrees const *)arg1)->get_proximity((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTParams_term_crit_set" "', argument " "2"" of type '" "CvTermCriteria *""'"); 
   }
-  _outv = SWIG_From_float((float)(result));
+  arg2 = (CvTermCriteria *)(argp2);
+  if (arg1) (arg1)->term_crit = *arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_proximity__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvRTParams_term_crit_get (const octave_value_list& args, int nargout) {
+  CvRTParams *arg1 = (CvRTParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  CvTermCriteria *result = 0 ;
   
-  if (!SWIG_check_num_args("CvRTrees_get_proximity",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvRTParams_term_crit_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_proximity" "', argument " "1"" of type '" "CvRTrees const *""'"); 
-  }
-  arg1 = (CvRTrees *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_get_proximity" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTParams_term_crit_get" "', argument " "1"" of type '" "CvRTParams *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_get_proximity" "', argument " "3"" of type '" "CvMat const *""'"); 
+  arg1 = (CvRTParams *)(argp1);
+  result = (CvTermCriteria *)& ((arg1)->term_crit);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTermCriteria, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvRTParams__SWIG_0 (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvRTParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvRTParams",args.length(),0,0,0)) {
+    SWIG_fail;
   }
-  arg3 = (CvMat *)(argp3);
   {
     try {
-      result = (float)((CvRTrees const *)arg1)->get_proximity((CvMat const *)arg2,(CvMat const *)arg3); 
+      result = (CvRTParams *)new CvRTParams(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_float((float)(result));
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvRTParams, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_proximity (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[5]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
-  };
-  
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvRTrees_get_proximity__SWIG_2(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvRTrees_get_proximity__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
+static octave_value_list _wrap_new_CvRTParams__SWIG_1 (const octave_value_list& args, int nargout) {
+  int arg1 ;
+  int arg2 ;
+  float arg3 ;
+  bool arg4 ;
+  int arg5 ;
+  float *arg6 = (float *) 0 ;
+  bool arg7 ;
+  int arg8 ;
+  int arg9 ;
+  float arg10 ;
+  int arg11 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  bool val7 ;
+  int ecode7 = 0 ;
+  int val8 ;
+  int ecode8 = 0 ;
+  int val9 ;
+  int ecode9 = 0 ;
+  float val10 ;
+  int ecode10 = 0 ;
+  int val11 ;
+  int ecode11 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvRTParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvRTParams",args.length(),11,11,0)) {
+    SWIG_fail;
   }
-  if (argc == 5) {
+  ecode1 = SWIG_AsVal_int(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvRTParams" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvRTParams" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  ecode3 = SWIG_AsVal_float(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvRTParams" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = (float)(val3);
+  ecode4 = SWIG_AsVal_bool(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvRTParams" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = (bool)(val4);
+  ecode5 = SWIG_AsVal_int(args(4), &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_CvRTParams" "', argument " "5"" of type '" "int""'");
+  } 
+  arg5 = (int)(val5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvRTParams" "', argument " "6"" of type '" "float const *""'"); 
+  }
+  arg6 = (float *)(argp6);
+  ecode7 = SWIG_AsVal_bool(args(6), &val7);
+  if (!SWIG_IsOK(ecode7)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_CvRTParams" "', argument " "7"" of type '" "bool""'");
+  } 
+  arg7 = (bool)(val7);
+  ecode8 = SWIG_AsVal_int(args(7), &val8);
+  if (!SWIG_IsOK(ecode8)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "new_CvRTParams" "', argument " "8"" of type '" "int""'");
+  } 
+  arg8 = (int)(val8);
+  ecode9 = SWIG_AsVal_int(args(8), &val9);
+  if (!SWIG_IsOK(ecode9)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "new_CvRTParams" "', argument " "9"" of type '" "int""'");
+  } 
+  arg9 = (int)(val9);
+  ecode10 = SWIG_AsVal_float(args(9), &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "new_CvRTParams" "', argument " "10"" of type '" "float""'");
+  } 
+  arg10 = (float)(val10);
+  ecode11 = SWIG_AsVal_int(args(10), &val11);
+  if (!SWIG_IsOK(ecode11)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "new_CvRTParams" "', argument " "11"" of type '" "int""'");
+  } 
+  arg11 = (int)(val11);
+  {
+    try {
+      result = (CvRTParams *)new CvRTParams(arg1,arg2,arg3,arg4,arg5,(float const *)arg6,arg7,arg8,arg9,arg10,arg11); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvRTParams, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvRTParams (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[11]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8),octave_value_ref(args,9),octave_value_ref(args,10)
+  };
+  
+  if (argc == 0) {
+    return _wrap_new_CvRTParams__SWIG_0(args, nargout);
+  }
+  if (argc == 11) {
     int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
         _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
           _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
             _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_int(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
             if (_v) {
-              return _wrap_CvRTrees_get_proximity__SWIG_0(args, nargout);
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_float, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                {
+                  int res = SWIG_AsVal_bool(argv[6], NULL);
+                  _v = SWIG_CheckState(res);
+                }
+                if (_v) {
+                  {
+                    int res = SWIG_AsVal_int(argv[7], NULL);
+                    _v = SWIG_CheckState(res);
+                  }
+                  if (_v) {
+                    {
+                      int res = SWIG_AsVal_int(argv[8], NULL);
+                      _v = SWIG_CheckState(res);
+                    }
+                    if (_v) {
+                      {
+                        int res = SWIG_AsVal_float(argv[9], NULL);
+                        _v = SWIG_CheckState(res);
+                      }
+                      if (_v) {
+                        {
+                          int res = SWIG_AsVal_int(argv[10], NULL);
+                          _v = SWIG_CheckState(res);
+                        }
+                        if (_v) {
+                          return _wrap_new_CvRTParams__SWIG_1(args, nargout);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -29335,41 +29443,25 @@ static octave_value_list _wrap_CvRTrees_get_proximity (const octave_value_list&
 }
 
 
-static octave_value_list _wrap_CvRTrees_read (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
+static octave_value_list _wrap_delete_CvRTParams (const octave_value_list& args, int nargout) {
+  CvRTParams *arg1 = (CvRTParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvRTrees_read",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("delete_CvRTParams",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTParams, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_read" "', argument " "1"" of type '" "CvRTrees *""'"); 
-  }
-  arg1 = (CvRTrees *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvRTParams" "', argument " "1"" of type '" "CvRTParams *""'"); 
   }
-  arg3 = (CvFileNode *)(argp3);
+  arg1 = (CvRTParams *)(argp1);
   {
     try {
-      (arg1)->read(arg2,arg3)
+      delete arg1
     } 
     catch (...) 
     {
@@ -29383,845 +29475,1196 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvRTrees_write (const octave_value_list& args, int nargout) {
-  CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  char *arg3 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
+static swig_octave_member swig_CvRTParams_members[] = {
+{"calc_var_importance",0,_wrap_CvRTParams_calc_var_importance_get,_wrap_CvRTParams_calc_var_importance_set,0,0},
+{"nactive_vars",0,_wrap_CvRTParams_nactive_vars_get,_wrap_CvRTParams_nactive_vars_set,0,0},
+{"term_crit",0,_wrap_CvRTParams_term_crit_get,_wrap_CvRTParams_term_crit_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvRTParams_base_names[] = {"_p_CvDTreeParams",0};
+static const swig_type_info *swig_CvRTParams_base[] = {0,0};
+static swig_octave_class _wrap_class_CvRTParams = {"CvRTParams", &SWIGTYPE_p_CvRTParams,0,_wrap_new_CvRTParams,0,_wrap_delete_CvRTParams,swig_CvRTParams_members,swig_CvRTParams_base_names,swig_CvRTParams_base };
+
+static octave_value_list _wrap_new_CvRTrees (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvRTrees *result = 0 ;
   
-  if (!SWIG_check_num_args("CvRTrees_write",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("new_CvRTrees",args.length(),0,0,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_write" "', argument " "1"" of type '" "CvRTrees *""'"); 
-  }
-  arg1 = (CvRTrees *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_write" "', argument " "3"" of type '" "char const *""'");
-  }
-  arg3 = (char *)(buf3);
   {
     try {
-      (arg1)->write(arg2,(char const *)arg3); 
+      result = (CvRTrees *)new CvRTrees(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvRTrees, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_active_var_mask (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_delete_CvRTrees (const octave_value_list& args, int nargout) {
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvRTrees_get_active_var_mask",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("delete_CvRTrees",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_active_var_mask" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvRTrees" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
   arg1 = (CvRTrees *)(argp1);
   {
     try {
-      result = (CvMat *)(arg1)->get_active_var_mask()
+      delete arg1
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_rng (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRTrees_train__SWIG_0 (const octave_value_list& args, int nargout) {
   CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvRTParams arg9 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvRNG *result = 0 ;
+  bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_get_rng",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvRTrees_train",args.length(),9,9,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_rng" "', argument " "1"" of type '" "CvRTrees *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
   arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvRTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvRTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvRTrees_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvRTParams,  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvRTrees_train" "', argument " "9"" of type '" "CvRTParams""'"); 
+    }  
+    if (!argp9) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRTrees_train" "', argument " "9"" of type '" "CvRTParams""'");
+    } else {
+      arg9 = *((CvRTParams *)(argp9));
+    }
+  }
   {
     try {
-      result = (CvRNG *)(arg1)->get_rng(); 
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  {
-    CvRNG_Wrapper * wrapper = new CvRNG_Wrapper( *(result) );
-    _outv = SWIG_NewPointerObj( wrapper, SWIGTYPE_p_CvRNG_Wrapper, 1 );
-  }
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_tree_count (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRTrees_train__SWIG_1 (const octave_value_list& args, int nargout) {
   CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_get_tree_count",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvRTrees_train",args.length(),8,8,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_tree_count" "', argument " "1"" of type '" "CvRTrees const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
   arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvRTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvRTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvRTrees_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
   {
     try {
-      result = (int)((CvRTrees const *)arg1)->get_tree_count(); 
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_int((int)(result));
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvRTrees_get_tree (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRTrees_train__SWIG_2 (const octave_value_list& args, int nargout) {
   CvRTrees *arg1 = (CvRTrees *) 0 ;
-  int arg2 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvForestTree *result = 0 ;
+  bool result;
   
-  if (!SWIG_check_num_args("CvRTrees_get_tree",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRTrees_train",args.length(),7,7,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_tree" "', argument " "1"" of type '" "CvRTrees const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
   arg1 = (CvRTrees *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvRTrees_get_tree" "', argument " "2"" of type '" "int""'");
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
   } 
-  arg2 = (int)(val2);
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvRTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvRTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
   {
     try {
-      result = (CvForestTree *)((CvRTrees const *)arg1)->get_tree(arg2); 
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvForestTree, 0 |  0 );
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static swig_octave_member swig_CvRTrees_members[] = {
-{"train",_wrap_CvRTrees_train,0,0,0,0},
-{"predict",_wrap_CvRTrees_predict,0,0,0,0},
-{"clear",_wrap_CvRTrees_clear,0,0,0,0},
-{"get_var_importance",_wrap_CvRTrees_get_var_importance,0,0,0,0},
-{"get_proximity",_wrap_CvRTrees_get_proximity,0,0,0,0},
-{"read",_wrap_CvRTrees_read,0,0,0,0},
-{"write",_wrap_CvRTrees_write,0,0,0,0},
-{"get_active_var_mask",_wrap_CvRTrees_get_active_var_mask,0,0,0,0},
-{"get_rng",_wrap_CvRTrees_get_rng,0,0,0,0},
-{"get_tree_count",_wrap_CvRTrees_get_tree_count,0,0,0,0},
-{"get_tree",_wrap_CvRTrees_get_tree,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvRTrees_base_names[] = {"_p_CvStatModel",0};
-static const swig_type_info *swig_CvRTrees_base[] = {0,0};
-static swig_octave_class _wrap_class_CvRTrees = {"CvRTrees", &SWIGTYPE_p_CvRTrees,0,_wrap_new_CvRTrees,0,_wrap_delete_CvRTrees,swig_CvRTrees_members,swig_CvRTrees_base_names,swig_CvRTrees_base };
-
-static octave_value_list _wrap_CvBoostParams_boost_type_set (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  int arg2 ;
+static octave_value_list _wrap_CvRTrees_train__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  bool result;
   
-  if (!SWIG_check_num_args("CvBoostParams_boost_type_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRTrees_train",args.length(),6,6,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_boost_type_set" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg1 = (CvBoostParams *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostParams_boost_type_set" "', argument " "2"" of type '" "int""'");
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->boost_type = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoostParams_boost_type_get (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBoostParams_boost_type_get",args.length(),1,1,0)) {
-    SWIG_fail;
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_boost_type_get" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvBoostParams *)(argp1);
-  result = (int) ((arg1)->boost_type);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoostParams_weak_count_set (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBoostParams_weak_count_set",args.length(),2,2,0)) {
-    SWIG_fail;
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvRTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_weak_count_set" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  arg6 = (CvMat *)(argp6);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvBoostParams *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostParams_weak_count_set" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->weak_count = arg2;
-  _outv = octave_value();
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostParams_weak_count_get (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+static octave_value_list _wrap_CvRTrees_train__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  bool result;
   
-  if (!SWIG_check_num_args("CvBoostParams_weak_count_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvRTrees_train",args.length(),5,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_weak_count_get" "', argument " "1"" of type '" "CvBoostParams *""'"); 
-  }
-  arg1 = (CvBoostParams *)(argp1);
-  result = (int) ((arg1)->weak_count);
-  _outv = SWIG_From_int((int)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoostParams_split_criteria_set (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBoostParams_split_criteria_set",args.length(),2,2,0)) {
-    SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_split_criteria_set" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvBoostParams *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostParams_split_criteria_set" "', argument " "2"" of type '" "int""'");
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->split_criteria = arg2;
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoostParams_split_criteria_get (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  int result;
-  
-  if (!SWIG_check_num_args("CvBoostParams_split_criteria_get",args.length(),1,1,0)) {
-    SWIG_fail;
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_split_criteria_get" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
-  arg1 = (CvBoostParams *)(argp1);
-  result = (int) ((arg1)->split_criteria);
-  _outv = SWIG_From_int((int)(result));
+  arg5 = (CvMat *)(argp5);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostParams_weight_trim_rate_set (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_CvRTrees_train__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  bool result;
   
-  if (!SWIG_check_num_args("CvBoostParams_weight_trim_rate_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRTrees_train",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_weight_trim_rate_set" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg1 = (CvBoostParams *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostParams_weight_trim_rate_set" "', argument " "2"" of type '" "double""'");
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "int""'");
   } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->weight_trim_rate = arg2;
-  _outv = octave_value();
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostParams_weight_trim_rate_get (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+static octave_value_list _wrap_CvRTrees_train__SWIG_6 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  CvRTParams arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
+  bool result;
   
-  if (!SWIG_check_num_args("CvBoostParams_weight_trim_rate_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvRTrees_train",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_weight_trim_rate_get" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg1 = (CvBoostParams *)(argp1);
-  result = (double) ((arg1)->weight_trim_rate);
-  _outv = SWIG_From_double((double)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_new_CvBoostParams__SWIG_0 (const octave_value_list& args, int nargout) {
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvBoostParams *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBoostParams",args.length(),0,0,0)) {
-    SWIG_fail;
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvRTParams,  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_train" "', argument " "3"" of type '" "CvRTParams""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvRTrees_train" "', argument " "3"" of type '" "CvRTParams""'");
+    } else {
+      arg3 = *((CvRTParams *)(argp3));
+    }
   }
   {
     try {
-      result = (CvBoostParams *)new CvBoostParams(); 
+      result = (bool)(arg1)->train(arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoostParams, 1 |  0 );
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoostParams__SWIG_1 (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  int arg2 ;
-  double arg3 ;
-  int arg4 ;
-  bool arg5 ;
-  float *arg6 = (float *) 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  bool val5 ;
-  int ecode5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
+static octave_value_list _wrap_CvRTrees_train__SWIG_7 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoostParams *result = 0 ;
+  bool result;
   
-  if (!SWIG_check_num_args("new_CvBoostParams",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("CvRTrees_train",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBoostParams" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoostParams" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_double(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBoostParams" "', argument " "3"" of type '" "double""'");
-  } 
-  arg3 = (double)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBoostParams" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  ecode5 = SWIG_AsVal_bool(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_CvBoostParams" "', argument " "5"" of type '" "bool""'");
-  } 
-  arg5 = (bool)(val5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_float, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvBoostParams" "', argument " "6"" of type '" "float const *""'"); 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_train" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg6 = (float *)(argp6);
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
   {
     try {
-      result = (CvBoostParams *)new CvBoostParams(arg1,arg2,arg3,arg4,arg5,(float const *)arg6); 
+      result = (bool)(arg1)->train(arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoostParams, 1 |  0 );
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoostParams (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRTrees_train (const octave_value_list& args, int nargout) {
   int argc = args.length();
-  octave_value_ref argv[6]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5)
+  octave_value_ref argv[9]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
   };
   
-  if (argc == 0) {
-    return _wrap_new_CvBoostParams__SWIG_0(args, nargout);
-  }
-  if (argc == 6) {
+  if (argc == 2) {
     int _v;
-    {
-      int res = SWIG_AsVal_int(argv[0], NULL);
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
       _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvRTrees_train__SWIG_7(args, nargout);
+      }
     }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
     if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvRTParams, 0);
         _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvRTrees_train__SWIG_6(args, nargout);
+        }
       }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
       if (_v) {
         {
-          int res = SWIG_AsVal_double(argv[2], NULL);
+          int res = SWIG_AsVal_int(argv[2], NULL);
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          {
-            int res = SWIG_AsVal_int(argv[3], NULL);
-            _v = SWIG_CheckState(res);
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvRTrees_train__SWIG_5(args, nargout);
           }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
           if (_v) {
-            {
-              int res = SWIG_AsVal_bool(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
             if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_float, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_new_CvBoostParams__SWIG_1(args, nargout);
-              }
+              return _wrap_CvRTrees_train__SWIG_4(args, nargout);
             }
           }
         }
       }
     }
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvBoostParams (const octave_value_list& args, int nargout) {
-  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("delete_CvBoostParams",args.length(),1,1,0)) {
-    SWIG_fail;
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_CvRTrees_train__SWIG_3(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvBoostParams" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  if (argc == 7) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  return _wrap_CvRTrees_train__SWIG_2(args, nargout);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
-  arg1 = (CvBoostParams *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  if (argc == 8) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    return _wrap_CvRTrees_train__SWIG_1(args, nargout);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
+  if (argc == 9) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvRTParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      return _wrap_CvRTrees_train__SWIG_0(args, nargout);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
 }
 
 
-static swig_octave_member swig_CvBoostParams_members[] = {
-{"boost_type",0,_wrap_CvBoostParams_boost_type_get,_wrap_CvBoostParams_boost_type_set,0,0},
-{"weak_count",0,_wrap_CvBoostParams_weak_count_get,_wrap_CvBoostParams_weak_count_set,0,0},
-{"split_criteria",0,_wrap_CvBoostParams_split_criteria_get,_wrap_CvBoostParams_split_criteria_set,0,0},
-{"weight_trim_rate",0,_wrap_CvBoostParams_weight_trim_rate_get,_wrap_CvBoostParams_weight_trim_rate_set,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvBoostParams_base_names[] = {"_p_CvDTreeParams",0};
-static const swig_type_info *swig_CvBoostParams_base[] = {0,0};
-static swig_octave_class _wrap_class_CvBoostParams = {"CvBoostParams", &SWIGTYPE_p_CvBoostParams,0,_wrap_new_CvBoostParams,0,_wrap_delete_CvBoostParams,swig_CvBoostParams_members,swig_CvBoostParams_base_names,swig_CvBoostParams_base };
-
-static octave_value_list _wrap_new_CvBoostTree (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvRTrees_predict__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoostTree *result = 0 ;
+  float result;
   
-  if (!SWIG_check_num_args("new_CvBoostTree",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("CvRTrees_predict",args.length(),3,3,0)) {
     SWIG_fail;
   }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_predict" "', argument " "1"" of type '" "CvRTrees const *""'"); 
+  }
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
   {
     try {
-      result = (CvBoostTree *)new CvBoostTree(); 
+      result = (float)((CvRTrees const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoostTree, 1 |  0 );
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvBoostTree (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+static octave_value_list _wrap_CvRTrees_predict__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  float result;
   
-  if (!SWIG_check_num_args("delete_CvBoostTree",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvRTrees_predict",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvBoostTree" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_predict" "', argument " "1"" of type '" "CvRTrees const *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
   {
     try {
-      delete arg1
+      result = (float)((CvRTrees const *)arg1)->predict((CvMat const *)arg2)
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
+static octave_value_list _wrap_CvRTrees_predict (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[3]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
+  };
+  
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvRTrees_predict__SWIG_1(args, nargout);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvRTrees_predict__SWIG_0(args, nargout);
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvRTrees_predict_prob__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvBoost *arg4 = (CvBoost *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  float result;
   
-  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvRTrees_predict_prob",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_predict_prob" "', argument " "1"" of type '" "CvRTrees const *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_predict_prob" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  arg2 = (CvDTreeTrainData *)(argp2);
+  arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_predict_prob" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvBoost *""'"); 
-  }
-  arg4 = (CvBoost *)(argp4);
   {
     try {
-      result = (bool)(arg1)->train(arg2,(CvMat const *)arg3,arg4); 
+      result = (float)((CvRTrees const *)arg1)->predict_prob((CvMat const *)arg2,(CvMat const *)arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_scale (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_CvRTrees_predict_prob__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  float result;
   
-  if (!SWIG_check_num_args("CvBoostTree_scale",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvRTrees_predict_prob",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_scale" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_predict_prob" "', argument " "1"" of type '" "CvRTrees const *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostTree_scale" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_predict_prob" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
   {
     try {
-      (arg1)->scale(arg2); 
+      result = (float)((CvRTrees const *)arg1)->predict_prob((CvMat const *)arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_read__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
-  CvBoost *arg4 = (CvBoost *) 0 ;
-  CvDTreeTrainData *arg5 = (CvDTreeTrainData *) 0 ;
+static octave_value_list _wrap_CvRTrees_predict_prob (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[3]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
+  };
+  
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvRTrees_predict_prob__SWIG_1(args, nargout);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvRTrees_predict_prob__SWIG_0(args, nargout);
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvRTrees_clear (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvBoostTree_read",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvRTrees_clear",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_read" "', argument " "1"" of type '" "CvBoostTree *""'"); 
-  }
-  arg1 = (CvBoostTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
-  }
-  arg3 = (CvFileNode *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_read" "', argument " "4"" of type '" "CvBoost *""'"); 
-  }
-  arg4 = (CvBoost *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_read" "', argument " "5"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_clear" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg5 = (CvDTreeTrainData *)(argp5);
+  arg1 = (CvRTrees *)(argp1);
   {
     try {
-      (arg1)->read(arg2,arg3,arg4,arg5); 
+      (arg1)->clear(); 
     } 
     catch (...) 
     {
@@ -30235,932 +30678,8806 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvBoostTree_clear (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+static octave_value_list _wrap_CvRTrees_get_var_importance (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvBoostTree_clear",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvRTrees_get_var_importance",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_clear" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_var_importance" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
+  arg1 = (CvRTrees *)(argp1);
   {
     try {
-      (arg1)->clear(); 
+      result = (CvMat *)(arg1)->get_var_importance(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+static octave_value_list _wrap_CvRTrees_get_proximity__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
+  CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
-  CvDTreeParams arg9 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
   void *argp5 = 0 ;
   int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 ;
-  int res9 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  float result;
   
-  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),9,9,0)) {
+  if (!SWIG_check_num_args("CvRTrees_get_proximity",args.length(),5,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_proximity" "', argument " "1"" of type '" "CvRTrees const *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
+  arg1 = (CvRTrees *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_get_proximity" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_get_proximity" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_get_proximity" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
   arg4 = (CvMat *)(argp4);
   res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvRTrees_get_proximity" "', argument " "5"" of type '" "CvMat const *""'"); 
   }
   arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoostTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoostTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoostTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
-  {
-    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvBoostTree_train" "', argument " "9"" of type '" "CvDTreeParams""'"); 
-    }  
-    if (!argp9) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoostTree_train" "', argument " "9"" of type '" "CvDTreeParams""'");
-    } else {
-      arg9 = *((CvDTreeParams *)(argp9));
-    }
-  }
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
+      result = (float)((CvRTrees const *)arg1)->get_proximity((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+static octave_value_list _wrap_CvRTrees_get_proximity__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
+  CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  float result;
   
-  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),8,8,0)) {
+  if (!SWIG_check_num_args("CvRTrees_get_proximity",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_proximity" "', argument " "1"" of type '" "CvRTrees const *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
+  arg1 = (CvRTrees *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_get_proximity" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_get_proximity" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvRTrees_get_proximity" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoostTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoostTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoostTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
+      result = (float)((CvRTrees const *)arg1)->get_proximity((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+static octave_value_list _wrap_CvRTrees_get_proximity__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  float result;
   
-  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),7,7,0)) {
+  if (!SWIG_check_num_args("CvRTrees_get_proximity",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_proximity" "', argument " "1"" of type '" "CvRTrees const *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
+  arg1 = (CvRTrees *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_get_proximity" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoostTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoostTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_get_proximity" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
-  arg7 = (CvMat *)(argp7);
+  arg3 = (CvMat *)(argp3);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+      result = (float)((CvRTrees const *)arg1)->get_proximity((CvMat const *)arg2,(CvMat const *)arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvRTrees_get_proximity (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[5]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
+  };
+  
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvRTrees_get_proximity__SWIG_2(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvRTrees_get_proximity__SWIG_1(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvRTrees_get_proximity__SWIG_0(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvRTrees_calc_error__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
   int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  float result;
   
-  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("CvRTrees_calc_error",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_calc_error" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_calc_error" "', argument " "2"" of type '" "CvMLData *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
+  arg2 = (CvMLData *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvRTrees_calc_error" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoostTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+      result = (float)(arg1)->calc_error(arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvRTrees_calc_error__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
+  float result;
   
-  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvRTrees_calc_error",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_calc_error" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_calc_error" "', argument " "2"" of type '" "CvMLData *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  arg2 = (CvMLData *)(argp2);
+  {
+    try {
+      result = (float)(arg1)->calc_error(arg2); 
+    
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvRTrees_calc_error (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[3]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
+  };
+  
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvRTrees_calc_error__SWIG_1(args, nargout);
+      }
+    }
   }
-  arg5 = (CvMat *)(argp5);
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvRTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_CvRTrees_calc_error__SWIG_0(args, nargout);
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvRTrees_get_train_error (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvRTrees_get_train_error",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_train_error" "', argument " "1"" of type '" "CvRTrees *""'"); 
+  }
+  arg1 = (CvRTrees *)(argp1);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+      result = (float)(arg1)->get_train_error(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train__SWIG_6 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvRTrees_read (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvRTrees_read",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_read" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
   }
-  arg4 = (CvMat *)(argp4);
+  arg3 = (CvFileNode *)(argp3);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+      (arg1)->read(arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train__SWIG_7 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvRTrees_write (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvRTrees_write",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_write" "', argument " "1"" of type '" "CvRTrees *""'"); 
   }
-  arg1 = (CvBoostTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  arg1 = (CvRTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvRTrees_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
   }
-  arg2 = (CvDTreeTrainData *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvRTrees_write" "', argument " "3"" of type '" "char const *""'");
   }
-  arg3 = (CvMat *)(argp3);
+  arg3 = (char *)(buf3);
   {
     try {
-      result = (bool)(arg1)->train(arg2,(CvMat const *)arg3); 
+      (arg1)->write(arg2,(char const *)arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_train (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[9]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
-  };
+static octave_value_list _wrap_CvRTrees_get_active_var_mask (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (argc == 3) {
+  if (!SWIG_check_num_args("CvRTrees_get_active_var_mask",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_active_var_mask" "', argument " "1"" of type '" "CvRTrees *""'"); 
+  }
+  arg1 = (CvRTrees *)(argp1);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_active_var_mask(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvRTrees_get_rng (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvRNG *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvRTrees_get_rng",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_rng" "', argument " "1"" of type '" "CvRTrees *""'"); 
+  }
+  arg1 = (CvRTrees *)(argp1);
+  {
+    try {
+      result = (CvRNG *)(arg1)->get_rng(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  {
+    CvRNG_Wrapper * wrapper = new CvRNG_Wrapper( *(result) );
+    _outv = SWIG_NewPointerObj( wrapper, SWIGTYPE_p_CvRNG_Wrapper, 1 );
+  }
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvRTrees_get_tree_count (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvRTrees_get_tree_count",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_tree_count" "', argument " "1"" of type '" "CvRTrees const *""'"); 
+  }
+  arg1 = (CvRTrees *)(argp1);
+  {
+    try {
+      result = (int)((CvRTrees const *)arg1)->get_tree_count(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvRTrees_get_tree (const octave_value_list& args, int nargout) {
+  CvRTrees *arg1 = (CvRTrees *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvForestTree *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvRTrees_get_tree",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRTrees_get_tree" "', argument " "1"" of type '" "CvRTrees const *""'"); 
+  }
+  arg1 = (CvRTrees *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvRTrees_get_tree" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  {
+    try {
+      result = (CvForestTree *)((CvRTrees const *)arg1)->get_tree(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvForestTree, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static swig_octave_member swig_CvRTrees_members[] = {
+{"train",_wrap_CvRTrees_train,0,0,0,0},
+{"predict",_wrap_CvRTrees_predict,0,0,0,0},
+{"predict_prob",_wrap_CvRTrees_predict_prob,0,0,0,0},
+{"clear",_wrap_CvRTrees_clear,0,0,0,0},
+{"get_var_importance",_wrap_CvRTrees_get_var_importance,0,0,0,0},
+{"get_proximity",_wrap_CvRTrees_get_proximity,0,0,0,0},
+{"calc_error",_wrap_CvRTrees_calc_error,0,0,0,0},
+{"get_train_error",_wrap_CvRTrees_get_train_error,0,0,0,0},
+{"read",_wrap_CvRTrees_read,0,0,0,0},
+{"write",_wrap_CvRTrees_write,0,0,0,0},
+{"get_active_var_mask",_wrap_CvRTrees_get_active_var_mask,0,0,0,0},
+{"get_rng",_wrap_CvRTrees_get_rng,0,0,0,0},
+{"get_tree_count",_wrap_CvRTrees_get_tree_count,0,0,0,0},
+{"get_tree",_wrap_CvRTrees_get_tree,0,0,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvRTrees_base_names[] = {"_p_CvStatModel",0};
+static const swig_type_info *swig_CvRTrees_base[] = {0,0};
+static swig_octave_class _wrap_class_CvRTrees = {"CvRTrees", &SWIGTYPE_p_CvRTrees,0,_wrap_new_CvRTrees,0,_wrap_delete_CvRTrees,swig_CvRTrees_members,swig_CvRTrees_base_names,swig_CvRTrees_base };
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvDTreeParams *arg9 = 0 ;
+  bool arg10 ;
+  bool arg11 ;
+  bool arg12 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  bool val10 ;
+  int ecode10 = 0 ;
+  bool val11 ;
+  int ecode11 = 0 ;
+  bool val12 ;
+  int ecode12 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),12,12,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_set_data" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTreeTrainData_set_data" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_set_data" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvERTreeTrainData_set_data" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
+  if (!SWIG_IsOK(res9)) {
+    SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvERTreeTrainData_set_data" "', argument " "9"" of type '" "CvDTreeParams const &""'"); 
+  }
+  if (!argp9) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvERTreeTrainData_set_data" "', argument " "9"" of type '" "CvDTreeParams const &""'"); 
+  }
+  arg9 = (CvDTreeParams *)(argp9);
+  ecode10 = SWIG_AsVal_bool(args(9), &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "CvERTreeTrainData_set_data" "', argument " "10"" of type '" "bool""'");
+  } 
+  arg10 = (bool)(val10);
+  ecode11 = SWIG_AsVal_bool(args(10), &val11);
+  if (!SWIG_IsOK(ecode11)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "CvERTreeTrainData_set_data" "', argument " "11"" of type '" "bool""'");
+  } 
+  arg11 = (bool)(val11);
+  ecode12 = SWIG_AsVal_bool(args(11), &val12);
+  if (!SWIG_IsOK(ecode12)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "CvERTreeTrainData_set_data" "', argument " "12"" of type '" "bool""'");
+  } 
+  arg12 = (bool)(val12);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,(CvDTreeParams const &)*arg9,arg10,arg11,arg12); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvDTreeParams *arg9 = 0 ;
+  bool arg10 ;
+  bool arg11 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  bool val10 ;
+  int ecode10 = 0 ;
+  bool val11 ;
+  int ecode11 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),11,11,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_set_data" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTreeTrainData_set_data" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_set_data" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvERTreeTrainData_set_data" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
+  if (!SWIG_IsOK(res9)) {
+    SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvERTreeTrainData_set_data" "', argument " "9"" of type '" "CvDTreeParams const &""'"); 
+  }
+  if (!argp9) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvERTreeTrainData_set_data" "', argument " "9"" of type '" "CvDTreeParams const &""'"); 
+  }
+  arg9 = (CvDTreeParams *)(argp9);
+  ecode10 = SWIG_AsVal_bool(args(9), &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "CvERTreeTrainData_set_data" "', argument " "10"" of type '" "bool""'");
+  } 
+  arg10 = (bool)(val10);
+  ecode11 = SWIG_AsVal_bool(args(10), &val11);
+  if (!SWIG_IsOK(ecode11)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "CvERTreeTrainData_set_data" "', argument " "11"" of type '" "bool""'");
+  } 
+  arg11 = (bool)(val11);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,(CvDTreeParams const &)*arg9,arg10,arg11); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvDTreeParams *arg9 = 0 ;
+  bool arg10 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  bool val10 ;
+  int ecode10 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),10,10,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_set_data" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTreeTrainData_set_data" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_set_data" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvERTreeTrainData_set_data" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
+  if (!SWIG_IsOK(res9)) {
+    SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvERTreeTrainData_set_data" "', argument " "9"" of type '" "CvDTreeParams const &""'"); 
+  }
+  if (!argp9) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvERTreeTrainData_set_data" "', argument " "9"" of type '" "CvDTreeParams const &""'"); 
+  }
+  arg9 = (CvDTreeParams *)(argp9);
+  ecode10 = SWIG_AsVal_bool(args(9), &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "CvERTreeTrainData_set_data" "', argument " "10"" of type '" "bool""'");
+  } 
+  arg10 = (bool)(val10);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,(CvDTreeParams const &)*arg9,arg10); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvDTreeParams *arg9 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),9,9,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_set_data" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTreeTrainData_set_data" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_set_data" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvERTreeTrainData_set_data" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
+  if (!SWIG_IsOK(res9)) {
+    SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvERTreeTrainData_set_data" "', argument " "9"" of type '" "CvDTreeParams const &""'"); 
+  }
+  if (!argp9) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvERTreeTrainData_set_data" "', argument " "9"" of type '" "CvDTreeParams const &""'"); 
+  }
+  arg9 = (CvDTreeParams *)(argp9);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,(CvDTreeParams const &)*arg9); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),8,8,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_set_data" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTreeTrainData_set_data" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_set_data" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvERTreeTrainData_set_data" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),7,7,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_set_data" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTreeTrainData_set_data" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_set_data" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_6 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_set_data" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTreeTrainData_set_data" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_7 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_set_data" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data__SWIG_8 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_set_data",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_set_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_set_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_set_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_set_data" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    try {
+      (arg1)->set_data((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_set_data (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[12]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8),octave_value_ref(args,9),octave_value_ref(args,10),octave_value_ref(args,11)
+  };
+  
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvERTreeTrainData_set_data__SWIG_8(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvERTreeTrainData_set_data__SWIG_7(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_CvERTreeTrainData_set_data__SWIG_6(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 7) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  return _wrap_CvERTreeTrainData_set_data__SWIG_5(args, nargout);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 8) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    return _wrap_CvERTreeTrainData_set_data__SWIG_4(args, nargout);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 9) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      return _wrap_CvERTreeTrainData_set_data__SWIG_3(args, nargout);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 10) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      {
+                        int res = SWIG_AsVal_bool(argv[9], NULL);
+                        _v = SWIG_CheckState(res);
+                      }
+                      if (_v) {
+                        return _wrap_CvERTreeTrainData_set_data__SWIG_2(args, nargout);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 11) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      {
+                        int res = SWIG_AsVal_bool(argv[9], NULL);
+                        _v = SWIG_CheckState(res);
+                      }
+                      if (_v) {
+                        {
+                          int res = SWIG_AsVal_bool(argv[10], NULL);
+                          _v = SWIG_CheckState(res);
+                        }
+                        if (_v) {
+                          return _wrap_CvERTreeTrainData_set_data__SWIG_1(args, nargout);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 12) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      {
+                        int res = SWIG_AsVal_bool(argv[9], NULL);
+                        _v = SWIG_CheckState(res);
+                      }
+                      if (_v) {
+                        {
+                          int res = SWIG_AsVal_bool(argv[10], NULL);
+                          _v = SWIG_CheckState(res);
+                        }
+                        if (_v) {
+                          {
+                            int res = SWIG_AsVal_bool(argv[11], NULL);
+                            _v = SWIG_CheckState(res);
+                          }
+                          if (_v) {
+                            return _wrap_CvERTreeTrainData_set_data__SWIG_0(args, nargout);
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_get_ord_var_data (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  int arg3 ;
+  float *arg4 = (float *) 0 ;
+  int *arg5 = (int *) 0 ;
+  float **arg6 = (float **) 0 ;
+  int **arg7 = (int **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *vptr6 ;
+  float *buffer6 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_get_ord_var_data",args.length(),7,7,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
+  }
+  arg2 = (CvDTreeNode *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "4"" of type '" "float *""'"); 
+  }
+  arg4 = (float *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "5"" of type '" "int *""'"); 
+  }
+  arg5 = (int *)(argp5);
+  {
+    if ((SWIG_ConvertPtr(args(5), &vptr6, SWIGTYPE_p_float, 1)) == -1){
+      SWIG_fail;
+    }
+    buffer6 = (float *) vptr6;
+    arg6=&buffer6;
+  }
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "7"" of type '" "int const **""'"); 
+  }
+  arg7 = (int **)(argp7);
+  {
+    try {
+      result = (int)(arg1)->get_ord_var_data(arg2,arg3,arg4,arg5,(float const **)arg6,(int const **)arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_get_sample_indices (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int **arg4 = (int **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_get_sample_indices",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_get_sample_indices" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_get_sample_indices" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
+  }
+  arg2 = (CvDTreeNode *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvERTreeTrainData_get_sample_indices" "', argument " "3"" of type '" "int *""'"); 
+  }
+  arg3 = (int *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_get_sample_indices" "', argument " "4"" of type '" "int const **""'"); 
+  }
+  arg4 = (int **)(argp4);
+  {
+    try {
+      (arg1)->get_sample_indices(arg2,arg3,(int const **)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_get_cv_labels (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int **arg4 = (int **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_get_cv_labels",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_get_cv_labels" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_get_cv_labels" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
+  }
+  arg2 = (CvDTreeNode *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvERTreeTrainData_get_cv_labels" "', argument " "3"" of type '" "int *""'"); 
+  }
+  arg3 = (int *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_get_cv_labels" "', argument " "4"" of type '" "int const **""'"); 
+  }
+  arg4 = (int **)(argp4);
+  {
+    try {
+      (arg1)->get_cv_labels(arg2,arg3,(int const **)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_get_cat_var_data (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
+  int arg3 ;
+  int *arg4 = (int *) 0 ;
+  int **arg5 = (int **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_get_cat_var_data",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_get_cat_var_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_get_cat_var_data" "', argument " "2"" of type '" "CvDTreeNode *""'"); 
+  }
+  arg2 = (CvDTreeNode *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTreeTrainData_get_cat_var_data" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_get_cat_var_data" "', argument " "4"" of type '" "int *""'"); 
+  }
+  arg4 = (int *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_get_cat_var_data" "', argument " "5"" of type '" "int const **""'"); 
+  }
+  arg5 = (int **)(argp5);
+  {
+    try {
+      result = (int)(arg1)->get_cat_var_data(arg2,arg3,arg4,(int const **)arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_get_vectors__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  float *arg3 = (float *) 0 ;
+  uchar *arg4 = (uchar *) 0 ;
+  float *arg5 = (float *) 0 ;
+  bool arg6 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  bool val6 ;
+  int ecode6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_get_vectors",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "3"" of type '" "float *""'"); 
+  }
+  arg3 = (float *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_unsigned_char, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "4"" of type '" "uchar *""'"); 
+  }
+  arg4 = (uchar *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "5"" of type '" "float *""'"); 
+  }
+  arg5 = (float *)(argp5);
+  ecode6 = SWIG_AsVal_bool(args(5), &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "6"" of type '" "bool""'");
+  } 
+  arg6 = (bool)(val6);
+  {
+    try {
+      (arg1)->get_vectors((CvMat const *)arg2,arg3,arg4,arg5,arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_get_vectors__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  float *arg3 = (float *) 0 ;
+  uchar *arg4 = (uchar *) 0 ;
+  float *arg5 = (float *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_get_vectors",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "3"" of type '" "float *""'"); 
+  }
+  arg3 = (float *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_unsigned_char, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "4"" of type '" "uchar *""'"); 
+  }
+  arg4 = (uchar *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_get_vectors" "', argument " "5"" of type '" "float *""'"); 
+  }
+  arg5 = (float *)(argp5);
+  {
+    try {
+      (arg1)->get_vectors((CvMat const *)arg2,arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_get_vectors (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[6]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5)
+  };
+  
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_float, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_unsigned_char, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_float, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvERTreeTrainData_get_vectors__SWIG_1(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTreeTrainData, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_float, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_unsigned_char, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_float, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              {
+                int res = SWIG_AsVal_bool(argv[5], NULL);
+                _v = SWIG_CheckState(res);
+              }
+              if (_v) {
+                return _wrap_CvERTreeTrainData_get_vectors__SWIG_0(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_subsample_data (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvDTreeNode *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_subsample_data",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_subsample_data" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_subsample_data" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  {
+    try {
+      result = (CvDTreeNode *)(arg1)->subsample_data((CvMat const *)arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeNode, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_missing_mask_set (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_missing_mask_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_missing_mask_set" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTreeTrainData_missing_mask_set" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  if (arg1) (arg1)->missing_mask = (CvMat const *)arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTreeTrainData_missing_mask_get (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvERTreeTrainData_missing_mask_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTreeTrainData_missing_mask_get" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  result = (CvMat *) ((arg1)->missing_mask);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvERTreeTrainData (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvERTreeTrainData *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvERTreeTrainData",args.length(),0,0,0)) {
+    SWIG_fail;
+  }
+  {
+    try {
+      result = (CvERTreeTrainData *)new CvERTreeTrainData(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvERTreeTrainData, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_delete_CvERTreeTrainData (const octave_value_list& args, int nargout) {
+  CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvERTreeTrainData",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTreeTrainData, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvERTreeTrainData" "', argument " "1"" of type '" "CvERTreeTrainData *""'"); 
+  }
+  arg1 = (CvERTreeTrainData *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static swig_octave_member swig_CvERTreeTrainData_members[] = {
+{"set_data",_wrap_CvERTreeTrainData_set_data,0,0,0,0},
+{"get_ord_var_data",_wrap_CvERTreeTrainData_get_ord_var_data,0,0,0,0},
+{"get_sample_indices",_wrap_CvERTreeTrainData_get_sample_indices,0,0,0,0},
+{"get_cv_labels",_wrap_CvERTreeTrainData_get_cv_labels,0,0,0,0},
+{"get_cat_var_data",_wrap_CvERTreeTrainData_get_cat_var_data,0,0,0,0},
+{"get_vectors",_wrap_CvERTreeTrainData_get_vectors,0,0,0,0},
+{"subsample_data",_wrap_CvERTreeTrainData_subsample_data,0,0,0,0},
+{"missing_mask",0,_wrap_CvERTreeTrainData_missing_mask_get,_wrap_CvERTreeTrainData_missing_mask_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvERTreeTrainData_base_names[] = {"_p_CvDTreeTrainData",0};
+static const swig_type_info *swig_CvERTreeTrainData_base[] = {0,0};
+static swig_octave_class _wrap_class_CvERTreeTrainData = {"CvERTreeTrainData", &SWIGTYPE_p_CvERTreeTrainData,0,_wrap_new_CvERTreeTrainData,0,_wrap_delete_CvERTreeTrainData,swig_CvERTreeTrainData_members,swig_CvERTreeTrainData_base_names,swig_CvERTreeTrainData_base };
+
+static octave_value_list _wrap_new_CvForestERTree (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvForestERTree *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvForestERTree",args.length(),0,0,0)) {
+    SWIG_fail;
+  }
+  {
+    try {
+      result = (CvForestERTree *)new CvForestERTree(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvForestERTree, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_delete_CvForestERTree (const octave_value_list& args, int nargout) {
+  CvForestERTree *arg1 = (CvForestERTree *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvForestERTree",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvForestERTree, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvForestERTree" "', argument " "1"" of type '" "CvForestERTree *""'"); 
+  }
+  arg1 = (CvForestERTree *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static swig_octave_member swig_CvForestERTree_members[] = {
+{0,0,0,0}
+};
+static const char *swig_CvForestERTree_base_names[] = {"_p_CvForestTree",0};
+static const swig_type_info *swig_CvForestERTree_base[] = {0,0};
+static swig_octave_class _wrap_class_CvForestERTree = {"CvForestERTree", &SWIGTYPE_p_CvForestERTree,0,_wrap_new_CvForestERTree,0,_wrap_delete_CvForestERTree,swig_CvForestERTree_members,swig_CvForestERTree_base_names,swig_CvForestERTree_base };
+
+static octave_value_list _wrap_new_CvERTrees (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvERTrees *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvERTrees",args.length(),0,0,0)) {
+    SWIG_fail;
+  }
+  {
+    try {
+      result = (CvERTrees *)new CvERTrees(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvERTrees, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_delete_CvERTrees (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvERTrees",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvERTrees" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvRTParams arg9 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvERTrees_train",args.length(),9,9,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvERTrees_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvRTParams,  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvERTrees_train" "', argument " "9"" of type '" "CvRTParams""'"); 
+    }  
+    if (!argp9) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvERTrees_train" "', argument " "9"" of type '" "CvRTParams""'");
+    } else {
+      arg9 = *((CvRTParams *)(argp9));
+    }
+  }
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvERTrees_train",args.length(),8,8,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvERTrees_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvERTrees_train",args.length(),7,7,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTrees_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvERTrees_train",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvERTrees_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvERTrees_train",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTrees_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvERTrees_train",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTrees_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTrees_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train__SWIG_6 (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  CvRTParams arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvERTrees_train",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTrees_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvRTParams,  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "CvRTParams""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvERTrees_train" "', argument " "3"" of type '" "CvRTParams""'");
+    } else {
+      arg3 = *((CvRTParams *)(argp3));
+    }
+  }
+  {
+    try {
+      result = (bool)(arg1)->train(arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train__SWIG_7 (const octave_value_list& args, int nargout) {
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvERTrees_train",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = (CvERTrees *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvERTrees_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    try {
+      result = (bool)(arg1)->train(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvERTrees_train (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[9]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
+  };
+  
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvERTrees_train__SWIG_7(args, nargout);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvRTParams, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvERTrees_train__SWIG_6(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvERTrees_train__SWIG_5(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvERTrees_train__SWIG_4(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_CvERTrees_train__SWIG_3(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 7) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  return _wrap_CvERTrees_train__SWIG_2(args, nargout);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 8) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    return _wrap_CvERTrees_train__SWIG_1(args, nargout);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 9) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvRTParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      return _wrap_CvERTrees_train__SWIG_0(args, nargout);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static swig_octave_member swig_CvERTrees_members[] = {
+{"train",_wrap_CvERTrees_train,0,0,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvERTrees_base_names[] = {"_p_CvRTrees",0};
+static const swig_type_info *swig_CvERTrees_base[] = {0,0};
+static swig_octave_class _wrap_class_CvERTrees = {"CvERTrees", &SWIGTYPE_p_CvERTrees,0,_wrap_new_CvERTrees,0,_wrap_delete_CvERTrees,swig_CvERTrees_members,swig_CvERTrees_base_names,swig_CvERTrees_base };
+
+static octave_value_list _wrap_CvBoostParams_boost_type_set (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostParams_boost_type_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_boost_type_set" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostParams_boost_type_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->boost_type = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostParams_boost_type_get (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvBoostParams_boost_type_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_boost_type_get" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  result = (int) ((arg1)->boost_type);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostParams_weak_count_set (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostParams_weak_count_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_weak_count_set" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostParams_weak_count_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->weak_count = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostParams_weak_count_get (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvBoostParams_weak_count_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_weak_count_get" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  result = (int) ((arg1)->weak_count);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostParams_split_criteria_set (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostParams_split_criteria_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_split_criteria_set" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostParams_split_criteria_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->split_criteria = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostParams_split_criteria_get (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvBoostParams_split_criteria_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_split_criteria_get" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  result = (int) ((arg1)->split_criteria);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostParams_weight_trim_rate_set (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  double arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostParams_weight_trim_rate_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_weight_trim_rate_set" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostParams_weight_trim_rate_set" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->weight_trim_rate = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostParams_weight_trim_rate_get (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  double result;
+  
+  if (!SWIG_check_num_args("CvBoostParams_weight_trim_rate_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostParams_weight_trim_rate_get" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  result = (double) ((arg1)->weight_trim_rate);
+  _outv = SWIG_From_double((double)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoostParams__SWIG_0 (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoostParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoostParams",args.length(),0,0,0)) {
+    SWIG_fail;
+  }
+  {
+    try {
+      result = (CvBoostParams *)new CvBoostParams(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoostParams, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoostParams__SWIG_1 (const octave_value_list& args, int nargout) {
+  int arg1 ;
+  int arg2 ;
+  double arg3 ;
+  int arg4 ;
+  bool arg5 ;
+  float *arg6 = (float *) 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoostParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoostParams",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_int(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvBoostParams" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoostParams" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  ecode3 = SWIG_AsVal_double(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvBoostParams" "', argument " "3"" of type '" "double""'");
+  } 
+  arg3 = (double)(val3);
+  ecode4 = SWIG_AsVal_int(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvBoostParams" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = (int)(val4);
+  ecode5 = SWIG_AsVal_bool(args(4), &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_CvBoostParams" "', argument " "5"" of type '" "bool""'");
+  } 
+  arg5 = (bool)(val5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvBoostParams" "', argument " "6"" of type '" "float const *""'"); 
+  }
+  arg6 = (float *)(argp6);
+  {
+    try {
+      result = (CvBoostParams *)new CvBoostParams(arg1,arg2,arg3,arg4,arg5,(float const *)arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoostParams, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoostParams (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[6]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5)
+  };
+  
+  if (argc == 0) {
+    return _wrap_new_CvBoostParams__SWIG_0(args, nargout);
+  }
+  if (argc == 6) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_bool(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_float, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_new_CvBoostParams__SWIG_1(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_delete_CvBoostParams (const octave_value_list& args, int nargout) {
+  CvBoostParams *arg1 = (CvBoostParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvBoostParams",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostParams, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvBoostParams" "', argument " "1"" of type '" "CvBoostParams *""'"); 
+  }
+  arg1 = (CvBoostParams *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static swig_octave_member swig_CvBoostParams_members[] = {
+{"boost_type",0,_wrap_CvBoostParams_boost_type_get,_wrap_CvBoostParams_boost_type_set,0,0},
+{"weak_count",0,_wrap_CvBoostParams_weak_count_get,_wrap_CvBoostParams_weak_count_set,0,0},
+{"split_criteria",0,_wrap_CvBoostParams_split_criteria_get,_wrap_CvBoostParams_split_criteria_set,0,0},
+{"weight_trim_rate",0,_wrap_CvBoostParams_weight_trim_rate_get,_wrap_CvBoostParams_weight_trim_rate_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvBoostParams_base_names[] = {"_p_CvDTreeParams",0};
+static const swig_type_info *swig_CvBoostParams_base[] = {0,0};
+static swig_octave_class _wrap_class_CvBoostParams = {"CvBoostParams", &SWIGTYPE_p_CvBoostParams,0,_wrap_new_CvBoostParams,0,_wrap_delete_CvBoostParams,swig_CvBoostParams_members,swig_CvBoostParams_base_names,swig_CvBoostParams_base };
+
+static octave_value_list _wrap_new_CvBoostTree (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoostTree *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoostTree",args.length(),0,0,0)) {
+    SWIG_fail;
+  }
+  {
+    try {
+      result = (CvBoostTree *)new CvBoostTree(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoostTree, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_delete_CvBoostTree (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvBoostTree",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvBoostTree" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvBoost *arg4 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg2 = (CvDTreeTrainData *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvBoost *""'"); 
+  }
+  arg4 = (CvBoost *)(argp4);
+  {
+    try {
+      result = (bool)(arg1)->train(arg2,(CvMat const *)arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_scale (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  double arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostTree_scale",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_scale" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoostTree_scale" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = (double)(val2);
+  {
+    try {
+      (arg1)->scale(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_read__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
+  CvBoost *arg4 = (CvBoost *) 0 ;
+  CvDTreeTrainData *arg5 = (CvDTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostTree_read",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_read" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  }
+  arg3 = (CvFileNode *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_read" "', argument " "4"" of type '" "CvBoost *""'"); 
+  }
+  arg4 = (CvBoost *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_read" "', argument " "5"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg5 = (CvDTreeTrainData *)(argp5);
+  {
+    try {
+      (arg1)->read(arg2,arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_clear (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostTree_clear",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_clear" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  {
+    try {
+      (arg1)->clear(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvDTreeParams arg9 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),9,9,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoostTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoostTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoostTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvDTreeParams,  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvBoostTree_train" "', argument " "9"" of type '" "CvDTreeParams""'"); 
+    }  
+    if (!argp9) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoostTree_train" "', argument " "9"" of type '" "CvDTreeParams""'");
+    } else {
+      arg9 = *((CvDTreeParams *)(argp9));
+    }
+  }
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),8,8,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoostTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoostTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoostTree_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),7,7,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoostTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoostTree_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoostTree_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoostTree_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train__SWIG_6 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train__SWIG_7 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoostTree_train",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_train" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_train" "', argument " "2"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg2 = (CvDTreeTrainData *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  {
+    try {
+      result = (bool)(arg1)->train(arg2,(CvMat const *)arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_train (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[9]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8)
+  };
+  
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvBoostTree_train__SWIG_7(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvBoostTree_train__SWIG_6(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvBoost, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvBoostTree_train__SWIG_0(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvBoostTree_train__SWIG_5(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_CvBoostTree_train__SWIG_4(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 7) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  return _wrap_CvBoostTree_train__SWIG_3(args, nargout);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 8) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    return _wrap_CvBoostTree_train__SWIG_2(args, nargout);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 9) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      return _wrap_CvBoostTree_train__SWIG_1(args, nargout);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvBoostTree_read__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostTree_read",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_read" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  }
+  arg3 = (CvFileNode *)(argp3);
+  {
+    try {
+      (arg1)->read(arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_read__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
+  CvDTreeTrainData *arg4 = (CvDTreeTrainData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoostTree_read",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_read" "', argument " "1"" of type '" "CvBoostTree *""'"); 
+  }
+  arg1 = (CvBoostTree *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  }
+  arg3 = (CvFileNode *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_read" "', argument " "4"" of type '" "CvDTreeTrainData *""'"); 
+  }
+  arg4 = (CvDTreeTrainData *)(argp4);
+  {
+    try {
+      (arg1)->read(arg2,arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoostTree_read (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[5]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
+  };
+  
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvBoostTree_read__SWIG_1(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvBoostTree_read__SWIG_2(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvBoost, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvBoostTree_read__SWIG_0(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static swig_octave_member swig_CvBoostTree_members[] = {
+{"scale",_wrap_CvBoostTree_scale,0,0,0,0},
+{"clear",_wrap_CvBoostTree_clear,0,0,0,0},
+{"train",_wrap_CvBoostTree_train,0,0,0,0},
+{"read",_wrap_CvBoostTree_read,0,0,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvBoostTree_base_names[] = {"_p_CvDTree",0};
+static const swig_type_info *swig_CvBoostTree_base[] = {0,0};
+static swig_octave_class _wrap_class_CvBoostTree = {"CvBoostTree", &SWIGTYPE_p_CvBoostTree,0,_wrap_new_CvBoostTree,0,_wrap_delete_CvBoostTree,swig_CvBoostTree_members,swig_CvBoostTree_base_names,swig_CvBoostTree_base };
+
+static octave_value_list _wrap_new_CvBoost__SWIG_0 (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoost *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoost",args.length(),0,0,0)) {
+    SWIG_fail;
+  }
+  {
+    try {
+      result = (CvBoost *)new CvBoost(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_delete_CvBoost (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvBoost",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvBoost" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoost__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvBoostParams arg8 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 ;
+  int res8 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoost *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoost",args.length(),8,8,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoost" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvBoost" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "new_CvBoost" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  {
+    res8 = SWIG_ConvertPtr(args(7), &argp8, SWIGTYPE_p_CvBoostParams,  0 );
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "new_CvBoost" "', argument " "8"" of type '" "CvBoostParams""'"); 
+    }  
+    if (!argp8) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBoost" "', argument " "8"" of type '" "CvBoostParams""'");
+    } else {
+      arg8 = *((CvBoostParams *)(argp8));
+    }
+  }
+  {
+    try {
+      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,arg8); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoost__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoost *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoost",args.length(),7,7,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoost" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvBoost" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "new_CvBoost" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  {
+    try {
+      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoost__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoost *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoost",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoost" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvBoost" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  {
+    try {
+      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoost__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoost *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoost",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoost" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  {
+    try {
+      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoost__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoost *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoost",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    try {
+      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoost__SWIG_6 (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  int arg2 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoost *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvBoost",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  {
+    try {
+      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvBoost (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[8]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7)
+  };
+  
+  if (argc == 0) {
+    return _wrap_new_CvBoost__SWIG_0(args, nargout);
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_new_CvBoost__SWIG_6(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_new_CvBoost__SWIG_5(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_new_CvBoost__SWIG_4(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_new_CvBoost__SWIG_3(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 7) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  return _wrap_new_CvBoost__SWIG_2(args, nargout);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 8) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvBoostParams, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    return _wrap_new_CvBoost__SWIG_1(args, nargout);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvBoostParams arg9 ;
+  bool arg10 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  bool val10 ;
+  int ecode10 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),10,10,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoost_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoost_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvBoostParams,  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvBoost_train" "', argument " "9"" of type '" "CvBoostParams""'"); 
+    }  
+    if (!argp9) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_train" "', argument " "9"" of type '" "CvBoostParams""'");
+    } else {
+      arg9 = *((CvBoostParams *)(argp9));
+    }
+  }
+  ecode10 = SWIG_AsVal_bool(args(9), &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "CvBoost_train" "', argument " "10"" of type '" "bool""'");
+  } 
+  arg10 = (bool)(val10);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9,arg10); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  CvBoostParams arg9 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp9 ;
+  int res9 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),9,9,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoost_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoost_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvBoostParams,  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvBoost_train" "', argument " "9"" of type '" "CvBoostParams""'"); 
+    }  
+    if (!argp9) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_train" "', argument " "9"" of type '" "CvBoostParams""'");
+    } else {
+      arg9 = *((CvBoostParams *)(argp9));
+    }
+  }
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),8,8,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoost_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoost_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+  }
+  arg8 = (CvMat *)(argp8);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),7,7,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoost_train" "', argument " "7"" of type '" "CvMat const *""'"); 
+  }
+  arg7 = (CvMat *)(argp7);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
+  }
+  arg6 = (CvMat *)(argp6);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_6 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_7 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  CvBoostParams arg3 ;
+  bool arg4 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvBoostParams,  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "CvBoostParams""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_train" "', argument " "3"" of type '" "CvBoostParams""'");
+    } else {
+      arg3 = *((CvBoostParams *)(argp3));
+    }
+  }
+  ecode4 = SWIG_AsVal_bool(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = (bool)(val4);
+  {
+    try {
+      result = (bool)(arg1)->train(arg2,arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_8 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  CvBoostParams arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    res3 = SWIG_ConvertPtr(args(2), &argp3, SWIGTYPE_p_CvBoostParams,  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "CvBoostParams""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_train" "', argument " "3"" of type '" "CvBoostParams""'");
+    } else {
+      arg3 = *((CvBoostParams *)(argp3));
+    }
+  }
+  {
+    try {
+      result = (bool)(arg1)->train(arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train__SWIG_9 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  bool result;
+  
+  if (!SWIG_check_num_args("CvBoost_train",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    try {
+      result = (bool)(arg1)->train(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_bool((bool)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_train (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[10]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8),octave_value_ref(args,9)
+  };
+  
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvBoost_train__SWIG_9(args, nargout);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvBoostParams, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvBoost_train__SWIG_8(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvBoost_train__SWIG_6(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvBoostParams, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_CvBoost_train__SWIG_7(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvBoost_train__SWIG_5(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_CvBoost_train__SWIG_4(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 7) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  return _wrap_CvBoost_train__SWIG_3(args, nargout);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 8) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    return _wrap_CvBoost_train__SWIG_2(args, nargout);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 9) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvBoostParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      return _wrap_CvBoost_train__SWIG_1(args, nargout);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 10) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    void *vptr = 0;
+                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvBoostParams, 0);
+                    _v = SWIG_CheckState(res);
+                    if (_v) {
+                      {
+                        int res = SWIG_AsVal_bool(argv[9], NULL);
+                        _v = SWIG_CheckState(res);
+                      }
+                      if (_v) {
+                        return _wrap_CvBoost_train__SWIG_0(args, nargout);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvBoost_predict__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvSlice arg5 ;
+  bool arg6 ;
+  bool arg7 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  bool val6 ;
+  int ecode6 = 0 ;
+  bool val7 ;
+  int ecode7 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvBoost_predict",args.length(),7,7,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_predict" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSlice,  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'"); 
+    }  
+    if (!argp5) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'");
+    } else {
+      arg5 = *((CvSlice *)(argp5));
+    }
+  }
+  ecode6 = SWIG_AsVal_bool(args(5), &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvBoost_predict" "', argument " "6"" of type '" "bool""'");
+  } 
+  arg6 = (bool)(val6);
+  ecode7 = SWIG_AsVal_bool(args(6), &val7);
+  if (!SWIG_IsOK(ecode7)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvBoost_predict" "', argument " "7"" of type '" "bool""'");
+  } 
+  arg7 = (bool)(val7);
+  {
+    try {
+      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6,arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_predict__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvSlice arg5 ;
+  bool arg6 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  bool val6 ;
+  int ecode6 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvBoost_predict",args.length(),6,6,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_predict" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSlice,  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'"); 
+    }  
+    if (!argp5) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'");
+    } else {
+      arg5 = *((CvSlice *)(argp5));
+    }
+  }
+  ecode6 = SWIG_AsVal_bool(args(5), &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvBoost_predict" "', argument " "6"" of type '" "bool""'");
+  } 
+  arg6 = (bool)(val6);
+  {
+    try {
+      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_predict__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvSlice arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvBoost_predict",args.length(),5,5,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_predict" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSlice,  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'"); 
+    }  
+    if (!argp5) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'");
+    } else {
+      arg5 = *((CvSlice *)(argp5));
+    }
+  }
+  {
+    try {
+      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_predict__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvBoost_predict",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_predict" "', argument " "4"" of type '" "CvMat *""'"); 
+  }
+  arg4 = (CvMat *)(argp4);
+  {
+    try {
+      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_predict__SWIG_4 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvBoost_predict",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  {
+    try {
+      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_predict__SWIG_5 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvBoost_predict",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  {
+    try {
+      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_predict (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[7]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6)
+  };
+  
+  if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvBoost_predict__SWIG_5(args, nargout);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         void *vptr = 0;
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_CvBoostTree_train__SWIG_7(args, nargout);
+          return _wrap_CvBoost_predict__SWIG_4(args, nargout);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvBoost_predict__SWIG_3(args, nargout);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSlice, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvBoost_predict__SWIG_2(args, nargout);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSlice, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              {
+                int res = SWIG_AsVal_bool(argv[5], NULL);
+                _v = SWIG_CheckState(res);
+              }
+              if (_v) {
+                return _wrap_CvBoost_predict__SWIG_1(args, nargout);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 7) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSlice, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              {
+                int res = SWIG_AsVal_bool(argv[5], NULL);
+                _v = SWIG_CheckState(res);
+              }
+              if (_v) {
+                {
+                  int res = SWIG_AsVal_bool(argv[6], NULL);
+                  _v = SWIG_CheckState(res);
+                }
+                if (_v) {
+                  return _wrap_CvBoost_predict__SWIG_0(args, nargout);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvBoost_calc_error__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvBoost_calc_error",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_calc_error" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_calc_error" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_calc_error" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  {
+    try {
+      result = (float)(arg1)->calc_error(arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_calc_error__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvMLData *arg2 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  float result;
+  
+  if (!SWIG_check_num_args("CvBoost_calc_error",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_calc_error" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_calc_error" "', argument " "2"" of type '" "CvMLData *""'"); 
+  }
+  arg2 = (CvMLData *)(argp2);
+  {
+    try {
+      result = (float)(arg1)->calc_error(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_calc_error (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[3]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2)
+  };
+  
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_CvBoost_calc_error__SWIG_1(args, nargout);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_CvBoost_calc_error__SWIG_0(args, nargout);
         }
       }
     }
   }
-  if (argc == 4) {
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvBoost_prune (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvSlice arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoost_prune",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_prune" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSlice,  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_prune" "', argument " "2"" of type '" "CvSlice""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_prune" "', argument " "2"" of type '" "CvSlice""'");
+    } else {
+      arg2 = *((CvSlice *)(argp2));
+    }
+  }
+  {
+    try {
+      (arg1)->prune(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_clear (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoost_clear",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_clear" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      (arg1)->clear(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_write (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  char *arg3 = (char *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoost_write",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_write" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_write" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = (char *)(buf3);
+  {
+    try {
+      (arg1)->write(arg2,(char const *)arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_read (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  CvFileNode *arg3 = (CvFileNode *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvBoost_read",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_read" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+  }
+  arg3 = (CvFileNode *)(argp3);
+  {
+    try {
+      (arg1)->read(arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_get_active_vars__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvBoost_get_active_vars",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_active_vars" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvBoost_get_active_vars" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = (bool)(val2);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_active_vars(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_get_active_vars__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvBoost_get_active_vars",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_active_vars" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_active_vars(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_get_active_vars (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[2]={
+    octave_value_ref(args,0),octave_value_ref(args,1)
+  };
+  
+  if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvBoostTree_train__SWIG_6(args, nargout);
-          }
-        }
-      }
+      return _wrap_CvBoost_get_active_vars__SWIG_1(args, nargout);
     }
   }
-  if (argc == 4) {
+  if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
         _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvBoost, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvBoostTree_train__SWIG_0(args, nargout);
-          }
-        }
       }
-    }
-  }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
       if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvBoostTree_train__SWIG_5(args, nargout);
-            }
-          }
-        }
+        return _wrap_CvBoost_get_active_vars__SWIG_0(args, nargout);
       }
     }
   }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvBoostTree_train__SWIG_4(args, nargout);
-              }
-            }
-          }
-        }
-      }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvBoost_get_weak_predictors (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvSeq *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvBoost_get_weak_predictors",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_weak_predictors" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      result = (CvSeq *)(arg1)->get_weak_predictors(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSeq, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_get_weights (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvBoost_get_weights",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_weights" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_weights(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_get_subtree_weights (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvBoost_get_subtree_weights",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_subtree_weights" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_subtree_weights(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_get_weak_response (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvBoost_get_weak_response",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_weak_response" "', argument " "1"" of type '" "CvBoost *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_weak_response(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_get_params (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvBoostParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvBoost_get_params",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_params" "', argument " "1"" of type '" "CvBoost const *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      result = (CvBoostParams *) &((CvBoost const *)arg1)->get_params(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvBoost_get_data (const octave_value_list& args, int nargout) {
+  CvBoost *arg1 = (CvBoost *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvDTreeTrainData *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvBoost_get_data",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_data" "', argument " "1"" of type '" "CvBoost const *""'"); 
+  }
+  arg1 = (CvBoost *)(argp1);
+  {
+    try {
+      result = (CvDTreeTrainData *)((CvBoost const *)arg1)->get_data(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static swig_octave_member swig_CvBoost_members[] = {
+{"train",_wrap_CvBoost_train,0,0,0,0},
+{"predict",_wrap_CvBoost_predict,0,0,0,0},
+{"calc_error",_wrap_CvBoost_calc_error,0,0,0,0},
+{"prune",_wrap_CvBoost_prune,0,0,0,0},
+{"clear",_wrap_CvBoost_clear,0,0,0,0},
+{"write",_wrap_CvBoost_write,0,0,0,0},
+{"read",_wrap_CvBoost_read,0,0,0,0},
+{"get_active_vars",_wrap_CvBoost_get_active_vars,0,0,0,0},
+{"get_weak_predictors",_wrap_CvBoost_get_weak_predictors,0,0,0,0},
+{"get_weights",_wrap_CvBoost_get_weights,0,0,0,0},
+{"get_subtree_weights",_wrap_CvBoost_get_subtree_weights,0,0,0,0},
+{"get_weak_response",_wrap_CvBoost_get_weak_response,0,0,0,0},
+{"get_params",_wrap_CvBoost_get_params,0,0,0,0},
+{"get_data",_wrap_CvBoost_get_data,0,0,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvBoost_base_names[] = {"_p_CvStatModel",0};
+static const swig_type_info *swig_CvBoost_base[] = {0,0};
+static swig_octave_class _wrap_class_CvBoost = {"CvBoost", &SWIGTYPE_p_CvBoost,0,_wrap_new_CvBoost,0,_wrap_delete_CvBoost,swig_CvBoost_members,swig_CvBoost_base_names,swig_CvBoost_base };
+
+static octave_value_list _wrap_new_CvANN_MLP_TrainParams__SWIG_0 (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvANN_MLP_TrainParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvANN_MLP_TrainParams",args.length(),0,0,0)) {
+    SWIG_fail;
+  }
+  {
+    try {
+      result = (CvANN_MLP_TrainParams *)new CvANN_MLP_TrainParams(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP_TrainParams, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvANN_MLP_TrainParams__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvTermCriteria arg1 ;
+  int arg2 ;
+  double arg3 ;
+  double arg4 ;
+  void *argp1 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvANN_MLP_TrainParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvANN_MLP_TrainParams",args.length(),4,4,0)) {
+    SWIG_fail;
+  }
+  {
+    res1 = SWIG_ConvertPtr(args(0), &argp1, SWIGTYPE_p_CvTermCriteria,  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvTermCriteria""'"); 
+    }  
+    if (!argp1) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvTermCriteria""'");
+    } else {
+      arg1 = *((CvTermCriteria *)(argp1));
+    }
+  }
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  ecode3 = SWIG_AsVal_double(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "3"" of type '" "double""'");
+  } 
+  arg3 = (double)(val3);
+  ecode4 = SWIG_AsVal_double(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "4"" of type '" "double""'");
+  } 
+  arg4 = (double)(val4);
+  {
+    try {
+      result = (CvANN_MLP_TrainParams *)new CvANN_MLP_TrainParams(arg1,arg2,arg3,arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP_TrainParams, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvANN_MLP_TrainParams__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvTermCriteria arg1 ;
+  int arg2 ;
+  double arg3 ;
+  void *argp1 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvANN_MLP_TrainParams *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvANN_MLP_TrainParams",args.length(),3,3,0)) {
+    SWIG_fail;
+  }
+  {
+    res1 = SWIG_ConvertPtr(args(0), &argp1, SWIGTYPE_p_CvTermCriteria,  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvTermCriteria""'"); 
+    }  
+    if (!argp1) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvTermCriteria""'");
+    } else {
+      arg1 = *((CvTermCriteria *)(argp1));
     }
   }
-  if (argc == 7) {
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  ecode3 = SWIG_AsVal_double(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "3"" of type '" "double""'");
+  } 
+  arg3 = (double)(val3);
+  {
+    try {
+      result = (CvANN_MLP_TrainParams *)new CvANN_MLP_TrainParams(arg1,arg2,arg3); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP_TrainParams, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvANN_MLP_TrainParams (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[4]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
+  };
+  
+  if (argc == 0) {
+    return _wrap_new_CvANN_MLP_TrainParams__SWIG_0(args, nargout);
+  }
+  if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvTermCriteria, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
       if (_v) {
         {
-          int res = SWIG_AsVal_int(argv[2], NULL);
+          int res = SWIG_AsVal_double(argv[2], NULL);
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvBoostTree_train__SWIG_3(args, nargout);
-                }
-              }
-            }
-          }
+          return _wrap_new_CvANN_MLP_TrainParams__SWIG_2(args, nargout);
         }
       }
     }
   }
-  if (argc == 8) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvTermCriteria, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
       if (_v) {
         {
-          int res = SWIG_AsVal_int(argv[2], NULL);
+          int res = SWIG_AsVal_double(argv[2], NULL);
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+          {
+            int res = SWIG_AsVal_double(argv[3], NULL);
             _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_CvBoostTree_train__SWIG_2(args, nargout);
-                  }
-                }
-              }
-            }
           }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
           if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvDTreeParams, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvBoostTree_train__SWIG_1(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
+            return _wrap_new_CvANN_MLP_TrainParams__SWIG_1(args, nargout);
           }
         }
       }
     }
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_delete_CvANN_MLP_TrainParams (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("delete_CvANN_MLP_TrainParams",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_term_crit_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  CvTermCriteria *arg2 = (CvTermCriteria *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_term_crit_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_term_crit_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvTermCriteria, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_TrainParams_term_crit_set" "', argument " "2"" of type '" "CvTermCriteria *""'"); 
+  }
+  arg2 = (CvTermCriteria *)(argp2);
+  if (arg1) (arg1)->term_crit = *arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_term_crit_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvTermCriteria *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_term_crit_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_term_crit_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (CvTermCriteria *)& ((arg1)->term_crit);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTermCriteria, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_train_method_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_train_method_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_train_method_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_train_method_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->train_method = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_train_method_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  int result;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_train_method_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_train_method_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (int) ((arg1)->train_method);
+  _outv = SWIG_From_int((int)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_bp_dw_scale_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  double arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_bp_dw_scale_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_bp_dw_scale_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_bp_dw_scale_set" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->bp_dw_scale = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_bp_dw_scale_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  double result;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_bp_dw_scale_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_bp_dw_scale_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (double) ((arg1)->bp_dw_scale);
+  _outv = SWIG_From_double((double)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_bp_moment_scale_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  double arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_bp_moment_scale_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_bp_moment_scale_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_bp_moment_scale_set" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->bp_moment_scale = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_bp_moment_scale_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  double result;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_bp_moment_scale_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_bp_moment_scale_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (double) ((arg1)->bp_moment_scale);
+  _outv = SWIG_From_double((double)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw0_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  double arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw0_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw0_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw0_set" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->rp_dw0 = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw0_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  double result;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw0_get",args.length(),1,1,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw0_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (double) ((arg1)->rp_dw0);
+  _outv = SWIG_From_double((double)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_plus_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  double arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_plus_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_plus_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw_plus_set" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->rp_dw_plus = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_read__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_plus_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  double result;
   
-  if (!SWIG_check_num_args("CvBoostTree_read",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_plus_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_read" "', argument " "1"" of type '" "CvBoostTree *""'"); 
-  }
-  arg1 = (CvBoostTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
-  }
-  arg3 = (CvFileNode *)(argp3);
-  {
-    try {
-      (arg1)->read(arg2,arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_plus_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (double) ((arg1)->rp_dw_plus);
+  _outv = SWIG_From_double((double)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoostTree_read__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvBoostTree *arg1 = (CvBoostTree *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
-  CvDTreeTrainData *arg4 = (CvDTreeTrainData *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_minus_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvBoostTree_read",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_minus_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoostTree_read" "', argument " "1"" of type '" "CvBoostTree *""'"); 
-  }
-  arg1 = (CvBoostTree *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoostTree_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoostTree_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
-  }
-  arg3 = (CvFileNode *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoostTree_read" "', argument " "4"" of type '" "CvDTreeTrainData *""'"); 
-  }
-  arg4 = (CvDTreeTrainData *)(argp4);
-  {
-    try {
-      (arg1)->read(arg2,arg3,arg4); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_minus_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
   }
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw_minus_set" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->rp_dw_minus = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -31168,608 +39485,385 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvBoostTree_read (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[5]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
-  };
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_minus_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  double result;
   
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_CvBoostTree_read__SWIG_1(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvBoostTree_read__SWIG_2(args, nargout);
-          }
-        }
-      }
-    }
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_minus_get",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoostTree, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvFileStorage, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvFileNode, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvBoost, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvDTreeTrainData, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvBoostTree_read__SWIG_0(args, nargout);
-            }
-          }
-        }
-      }
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_minus_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (double) ((arg1)->rp_dw_minus);
+  _outv = SWIG_From_double((double)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static swig_octave_member swig_CvBoostTree_members[] = {
-{"scale",_wrap_CvBoostTree_scale,0,0,0,0},
-{"clear",_wrap_CvBoostTree_clear,0,0,0,0},
-{"train",_wrap_CvBoostTree_train,0,0,0,0},
-{"read",_wrap_CvBoostTree_read,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvBoostTree_base_names[] = {"_p_CvDTree",0};
-static const swig_type_info *swig_CvBoostTree_base[] = {0,0};
-static swig_octave_class _wrap_class_CvBoostTree = {"CvBoostTree", &SWIGTYPE_p_CvBoostTree,0,_wrap_new_CvBoostTree,0,_wrap_delete_CvBoostTree,swig_CvBoostTree_members,swig_CvBoostTree_base_names,swig_CvBoostTree_base };
-
-static octave_value_list _wrap_new_CvBoost__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_min_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  double arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoost *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvBoost",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_min_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  {
-    try {
-      result = (CvBoost *)new CvBoost(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_min_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw_min_set" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->rp_dw_min = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvBoost (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_min_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  double result;
   
-  if (!SWIG_check_num_args("delete_CvBoost",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_min_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvBoost" "', argument " "1"" of type '" "CvBoost *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  {
-    try {
-      delete arg1; 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_min_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
   }
-  _outv = octave_value();
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (double) ((arg1)->rp_dw_min);
+  _outv = SWIG_From_double((double)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoost__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  int arg2 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvBoostParams arg8 ;
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_max_set (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+  double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
+  double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 ;
-  int res8 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoost *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvBoost",args.length(),8,8,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_max_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_max_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
   }
-  arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  ecode2 = SWIG_AsVal_double(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw_max_set" "', argument " "2"" of type '" "double""'");
   } 
-  arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoost" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvBoost" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "new_CvBoost" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  {
-    res8 = SWIG_ConvertPtr(args(7), &argp8, SWIGTYPE_p_CvBoostParams,  0 );
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "new_CvBoost" "', argument " "8"" of type '" "CvBoostParams""'"); 
-    }  
-    if (!argp8) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvBoost" "', argument " "8"" of type '" "CvBoostParams""'");
-    } else {
-      arg8 = *((CvBoostParams *)(argp8));
-    }
-  }
-  {
-    try {
-      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,arg8); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  arg2 = (double)(val2);
+  if (arg1) (arg1)->rp_dw_max = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoost__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  int arg2 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_max_get (const octave_value_list& args, int nargout) {
+  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoost *result = 0 ;
+  double result;
   
-  if (!SWIG_check_num_args("new_CvBoost",args.length(),7,7,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_max_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoost" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvBoost" "', argument " "6"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_max_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
   }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "new_CvBoost" "', argument " "7"" of type '" "CvMat const *""'"); 
+  arg1 = (CvANN_MLP_TrainParams *)(argp1);
+  result = (double) ((arg1)->rp_dw_max);
+  _outv = SWIG_From_double((double)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static swig_octave_member swig_CvANN_MLP_TrainParams_members[] = {
+{"term_crit",0,_wrap_CvANN_MLP_TrainParams_term_crit_get,_wrap_CvANN_MLP_TrainParams_term_crit_set,0,0},
+{"train_method",0,_wrap_CvANN_MLP_TrainParams_train_method_get,_wrap_CvANN_MLP_TrainParams_train_method_set,0,0},
+{"bp_dw_scale",0,_wrap_CvANN_MLP_TrainParams_bp_dw_scale_get,_wrap_CvANN_MLP_TrainParams_bp_dw_scale_set,0,0},
+{"bp_moment_scale",0,_wrap_CvANN_MLP_TrainParams_bp_moment_scale_get,_wrap_CvANN_MLP_TrainParams_bp_moment_scale_set,0,0},
+{"rp_dw0",0,_wrap_CvANN_MLP_TrainParams_rp_dw0_get,_wrap_CvANN_MLP_TrainParams_rp_dw0_set,0,0},
+{"rp_dw_plus",0,_wrap_CvANN_MLP_TrainParams_rp_dw_plus_get,_wrap_CvANN_MLP_TrainParams_rp_dw_plus_set,0,0},
+{"rp_dw_minus",0,_wrap_CvANN_MLP_TrainParams_rp_dw_minus_get,_wrap_CvANN_MLP_TrainParams_rp_dw_minus_set,0,0},
+{"rp_dw_min",0,_wrap_CvANN_MLP_TrainParams_rp_dw_min_get,_wrap_CvANN_MLP_TrainParams_rp_dw_min_set,0,0},
+{"rp_dw_max",0,_wrap_CvANN_MLP_TrainParams_rp_dw_max_get,_wrap_CvANN_MLP_TrainParams_rp_dw_max_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvANN_MLP_TrainParams_base_names[] = {0};
+static const swig_type_info *swig_CvANN_MLP_TrainParams_base[] = {0};
+static swig_octave_class _wrap_class_CvANN_MLP_TrainParams = {"CvANN_MLP_TrainParams", &SWIGTYPE_p_CvANN_MLP_TrainParams,0,_wrap_new_CvANN_MLP_TrainParams,0,_wrap_delete_CvANN_MLP_TrainParams,swig_CvANN_MLP_TrainParams_members,swig_CvANN_MLP_TrainParams_base_names,swig_CvANN_MLP_TrainParams_base };
+
+static octave_value_list _wrap_new_CvANN_MLP__SWIG_0 (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvANN_MLP *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),0,0,0)) {
+    SWIG_fail;
   }
-  arg7 = (CvMat *)(argp7);
   {
     try {
-      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+      result = (CvANN_MLP *)new CvANN_MLP(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoost__SWIG_3 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvANN_MLP__SWIG_1 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
+  double arg3 ;
+  double arg4 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoost *result = 0 ;
-  
-  if (!SWIG_check_num_args("new_CvBoost",args.length(),6,6,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoost" "', argument " "5"" of type '" "CvMat const *""'"); 
+  CvANN_MLP *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),4,4,0)) {
+    SWIG_fail;
   }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_CvBoost" "', argument " "6"" of type '" "CvMat const *""'"); 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
-  arg6 = (CvMat *)(argp6);
+  arg1 = (CvMat *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  ecode3 = SWIG_AsVal_double(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvANN_MLP" "', argument " "3"" of type '" "double""'");
+  } 
+  arg3 = (double)(val3);
+  ecode4 = SWIG_AsVal_double(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvANN_MLP" "', argument " "4"" of type '" "double""'");
+  } 
+  arg4 = (double)(val4);
   {
     try {
-      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+      result = (CvANN_MLP *)new CvANN_MLP((CvMat const *)arg1,arg2,arg3,arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoost__SWIG_4 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvANN_MLP__SWIG_2 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
+  double arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoost *result = 0 ;
+  CvANN_MLP *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvBoost",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),3,3,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_CvBoost" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
+  ecode3 = SWIG_AsVal_double(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvANN_MLP" "', argument " "3"" of type '" "double""'");
+  } 
+  arg3 = (double)(val3);
   {
     try {
-      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+      result = (CvANN_MLP *)new CvANN_MLP((CvMat const *)arg1,arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoost__SWIG_5 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvANN_MLP__SWIG_3 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoost *result = 0 ;
+  CvANN_MLP *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvBoost",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),2,2,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_CvBoost" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
   {
     try {
-      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3,(CvMat const *)arg4); 
+      result = (CvANN_MLP *)new CvANN_MLP((CvMat const *)arg1,arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoost__SWIG_6 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvANN_MLP__SWIG_4 (const octave_value_list& args, int nargout) {
   CvMat *arg1 = (CvMat *) 0 ;
-  int arg2 ;
-  CvMat *arg3 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoost *result = 0 ;
+  CvANN_MLP *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvBoost",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),1,1,0)) {
     SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvBoost" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP" "', argument " "1"" of type '" "CvMat const *""'"); 
   }
   arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvBoost" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CvBoost" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
   {
     try {
-      result = (CvBoost *)new CvBoost((CvMat const *)arg1,arg2,(CvMat const *)arg3); 
+      result = (CvANN_MLP *)new CvANN_MLP((CvMat const *)arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoost, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvBoost (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_new_CvANN_MLP (const octave_value_list& args, int nargout) {
   int argc = args.length();
-  octave_value_ref argv[8]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7)
+  octave_value_ref argv[4]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
   };
   
   if (argc == 0) {
-    return _wrap_new_CvBoost__SWIG_0(args, nargout);
+    return _wrap_new_CvANN_MLP__SWIG_0(args, nargout);
   }
-  if (argc == 3) {
+  if (argc == 1) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          return _wrap_new_CvBoost__SWIG_6(args, nargout);
-        }
-      }
+      return _wrap_new_CvANN_MLP__SWIG_4(args, nargout);
     }
   }
-  if (argc == 4) {
+  if (argc == 2) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
@@ -31780,21 +39874,11 @@ static octave_value_list _wrap_new_CvBoost (const octave_value_list& args, int n
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_new_CvBoost__SWIG_5(args, nargout);
-          }
-        }
+        return _wrap_new_CvANN_MLP__SWIG_3(args, nargout);
       }
     }
   }
-  if (argc == 5) {
+  if (argc == 3) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
@@ -31805,61 +39889,17 @@ static octave_value_list _wrap_new_CvBoost (const octave_value_list& args, int n
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
           _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_new_CvBoost__SWIG_4(args, nargout);
-            }
-          }
         }
-      }
-    }
-  }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_new_CvBoost__SWIG_3(args, nargout);
-              }
-            }
-          }
+          return _wrap_new_CvANN_MLP__SWIG_2(args, nargout);
         }
       }
     }
   }
-  if (argc == 7) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
@@ -31870,765 +39910,292 @@ static octave_value_list _wrap_new_CvBoost (const octave_value_list& args, int n
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
           _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_new_CvBoost__SWIG_2(args, nargout);
-                }
-              }
-            }
-          }
         }
-      }
-    }
-  }
-  if (argc == 8) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+          {
+            int res = SWIG_AsVal_double(argv[3], NULL);
             _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvBoostParams, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_new_CvBoost__SWIG_1(args, nargout);
-                  }
-                }
-              }
-            }
           }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_CvBoost_train__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
-  CvBoostParams arg9 ;
-  bool arg10 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 ;
-  int res9 = 0 ;
-  bool val10 ;
-  int ecode10 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  bool result;
-  
-  if (!SWIG_check_num_args("CvBoost_train",args.length(),10,10,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoost_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoost_train" "', argument " "8"" of type '" "CvMat const *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
-  {
-    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvBoostParams,  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvBoost_train" "', argument " "9"" of type '" "CvBoostParams""'"); 
-    }  
-    if (!argp9) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_train" "', argument " "9"" of type '" "CvBoostParams""'");
-    } else {
-      arg9 = *((CvBoostParams *)(argp9));
-    }
-  }
-  ecode10 = SWIG_AsVal_bool(args(9), &val10);
-  if (!SWIG_IsOK(ecode10)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "CvBoost_train" "', argument " "10"" of type '" "bool""'");
-  } 
-  arg10 = (bool)(val10);
-  {
-    try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9,arg10); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_bool((bool)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoost_train__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
-  CvBoostParams arg9 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  void *argp9 ;
-  int res9 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  bool result;
-  
-  if (!SWIG_check_num_args("CvBoost_train",args.length(),9,9,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoost_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoost_train" "', argument " "8"" of type '" "CvMat const *""'"); 
-  }
-  arg8 = (CvMat *)(argp8);
-  {
-    res9 = SWIG_ConvertPtr(args(8), &argp9, SWIGTYPE_p_CvBoostParams,  0 );
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CvBoost_train" "', argument " "9"" of type '" "CvBoostParams""'"); 
-    }  
-    if (!argp9) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_train" "', argument " "9"" of type '" "CvBoostParams""'");
-    } else {
-      arg9 = *((CvBoostParams *)(argp9));
-    }
-  }
-  {
-    try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8,arg9); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+          if (_v) {
+            return _wrap_new_CvANN_MLP__SWIG_1(args, nargout);
+          }
+        }
+      }
+    }
   }
-  _outv = SWIG_From_bool((bool)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
+  
+  error("No matching function for overload");
+  return octave_value_list();
 }
 
 
-static octave_value_list _wrap_CvBoost_train__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
-  CvMat *arg8 = (CvMat *) 0 ;
+static octave_value_list _wrap_delete_CvANN_MLP (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvBoost_train",args.length(),8,8,0)) {
+  if (!SWIG_check_num_args("delete_CvANN_MLP",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoost_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
-  res8 = SWIG_ConvertPtr(args(7), &argp8,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CvBoost_train" "', argument " "8"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvANN_MLP" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg8 = (CvMat *)(argp8);
+  arg1 = (CvANN_MLP *)(argp1);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8)
+      delete arg1
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_train__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_create__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
-  CvMat *arg7 = (CvMat *) 0 ;
+  double arg4 ;
+  double arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  double val5 ;
+  int ecode5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvBoost_train",args.length(),7,7,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_create",args.length(),5,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_create" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_create" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvANN_MLP_create" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
-  res7 = SWIG_ConvertPtr(args(6), &argp7,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvBoost_train" "', argument " "7"" of type '" "CvMat const *""'"); 
-  }
-  arg7 = (CvMat *)(argp7);
+  ecode4 = SWIG_AsVal_double(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvANN_MLP_create" "', argument " "4"" of type '" "double""'");
+  } 
+  arg4 = (double)(val4);
+  ecode5 = SWIG_AsVal_double(args(4), &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvANN_MLP_create" "', argument " "5"" of type '" "double""'");
+  } 
+  arg5 = (double)(val5);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+      (arg1)->create((CvMat const *)arg2,arg3,arg4,arg5); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_train__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_create__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
+  double arg4 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvBoost_train",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_create",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_create" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_create" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvANN_MLP_create" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvBoost_train" "', argument " "6"" of type '" "CvMat const *""'"); 
-  }
-  arg6 = (CvMat *)(argp6);
+  ecode4 = SWIG_AsVal_double(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvANN_MLP_create" "', argument " "4"" of type '" "double""'");
+  } 
+  arg4 = (double)(val4);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+      (arg1)->create((CvMat const *)arg2,arg3,arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_train__SWIG_5 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_create__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvBoost_train",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_create",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_create" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_create" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   ecode3 = SWIG_AsVal_int(args(2), &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvANN_MLP_create" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+      (arg1)->create((CvMat const *)arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_train__SWIG_6 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_create__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  CvMat *arg4 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  bool result;
   
-  if (!SWIG_check_num_args("CvBoost_train",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_create",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_train" "', argument " "1"" of type '" "CvBoost *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_create" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_create" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvBoost_train" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
   {
     try {
-      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+      (arg1)->create((CvMat const *)arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_bool((bool)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_train (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvANN_MLP_create (const octave_value_list& args, int nargout) {
   int argc = args.length();
-  octave_value_ref argv[10]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6),octave_value_ref(args,7),octave_value_ref(args,8),octave_value_ref(args,9)
+  octave_value_ref argv[5]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
   };
   
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvBoost_train__SWIG_6(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvBoost_train__SWIG_5(args, nargout);
-            }
-          }
-        }
-      }
-    }
-  }
-  if (argc == 6) {
+  if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvBoost_train__SWIG_4(args, nargout);
-              }
-            }
-          }
-        }
+        return _wrap_CvANN_MLP_create__SWIG_3(args, nargout);
       }
     }
   }
-  if (argc == 7) {
+  if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -32640,35 +40207,15 @@ static octave_value_list _wrap_CvBoost_train (const octave_value_list& args, int
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  return _wrap_CvBoost_train__SWIG_3(args, nargout);
-                }
-              }
-            }
-          }
+          return _wrap_CvANN_MLP_create__SWIG_2(args, nargout);
         }
       }
     }
   }
-  if (argc == 8) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -32680,90 +40227,21 @@ static octave_value_list _wrap_CvBoost_train (const octave_value_list& args, int
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+          {
+            int res = SWIG_AsVal_double(argv[3], NULL);
             _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    return _wrap_CvBoost_train__SWIG_2(args, nargout);
-                  }
-                }
-              }
-            }
           }
-        }
-      }
-    }
-  }
-  if (argc == 9) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
           if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvBoostParams, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      return _wrap_CvBoost_train__SWIG_1(args, nargout);
-                    }
-                  }
-                }
-              }
-            }
+            return _wrap_CvANN_MLP_create__SWIG_1(args, nargout);
           }
         }
       }
     }
   }
-  if (argc == 10) {
+  if (argc == 5) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -32775,41 +40253,17 @@ static octave_value_list _wrap_CvBoost_train (const octave_value_list& args, int
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                void *vptr = 0;
-                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
-                _v = SWIG_CheckState(res);
-                if (_v) {
-                  void *vptr = 0;
-                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
-                  _v = SWIG_CheckState(res);
-                  if (_v) {
-                    void *vptr = 0;
-                    int res = SWIG_ConvertPtr(argv[8], &vptr, SWIGTYPE_p_CvBoostParams, 0);
-                    _v = SWIG_CheckState(res);
-                    if (_v) {
-                      {
-                        int res = SWIG_AsVal_bool(argv[9], NULL);
-                        _v = SWIG_CheckState(res);
-                      }
-                      if (_v) {
-                        return _wrap_CvBoost_train__SWIG_0(args, nargout);
-                      }
-                    }
-                  }
-                }
-              }
+          {
+            int res = SWIG_AsVal_double(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_double(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_CvANN_MLP_create__SWIG_0(args, nargout);
             }
           }
         }
@@ -32822,13 +40276,14 @@ static octave_value_list _wrap_CvBoost_train (const octave_value_list& args, int
 }
 
 
-static octave_value_list _wrap_CvBoost_predict__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_train__SWIG_0 (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvSlice arg5 ;
-  bool arg6 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvANN_MLP_TrainParams arg6 ;
+  int arg7 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -32837,76 +40292,84 @@ static octave_value_list _wrap_CvBoost_predict__SWIG_0 (const octave_value_list&
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  void *argp5 ;
+  void *argp5 = 0 ;
   int res5 = 0 ;
-  bool val6 ;
-  int ecode6 = 0 ;
+  void *argp6 ;
+  int res6 = 0 ;
+  int val7 ;
+  int ecode7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvBoost_predict",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_train",args.length(),7,7,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_train" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_train" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_predict" "', argument " "4"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvANN_MLP_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvANN_MLP_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
   {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSlice,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'"); 
+    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvANN_MLP_TrainParams,  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvANN_MLP_train" "', argument " "6"" of type '" "CvANN_MLP_TrainParams""'"); 
     }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'");
+    if (!argp6) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvANN_MLP_train" "', argument " "6"" of type '" "CvANN_MLP_TrainParams""'");
     } else {
-      arg5 = *((CvSlice *)(argp5));
+      arg6 = *((CvANN_MLP_TrainParams *)(argp6));
     }
   }
-  ecode6 = SWIG_AsVal_bool(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CvBoost_predict" "', argument " "6"" of type '" "bool""'");
+  ecode7 = SWIG_AsVal_int(args(6), &val7);
+  if (!SWIG_IsOK(ecode7)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvANN_MLP_train" "', argument " "7"" of type '" "int""'");
   } 
-  arg6 = (bool)(val6);
+  arg7 = (int)(val7);
   {
     try {
-      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5,arg6); 
+      result = (int)(arg1)->train((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6,arg7); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_float((float)(result));
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_predict__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_train__SWIG_1 (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvSlice arg5 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvANN_MLP_TrainParams arg6 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -32915,68 +40378,76 @@ static octave_value_list _wrap_CvBoost_predict__SWIG_1 (const octave_value_list&
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  void *argp5 ;
+  void *argp5 = 0 ;
   int res5 = 0 ;
+  void *argp6 ;
+  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvBoost_predict",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_train",args.length(),6,6,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_train" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_train" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_predict" "', argument " "4"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvANN_MLP_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvANN_MLP_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
   {
-    res5 = SWIG_ConvertPtr(args(4), &argp5, SWIGTYPE_p_CvSlice,  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'"); 
+    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvANN_MLP_TrainParams,  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvANN_MLP_train" "', argument " "6"" of type '" "CvANN_MLP_TrainParams""'"); 
     }  
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_predict" "', argument " "5"" of type '" "CvSlice""'");
+    if (!argp6) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvANN_MLP_train" "', argument " "6"" of type '" "CvANN_MLP_TrainParams""'");
     } else {
-      arg5 = *((CvSlice *)(argp5));
+      arg6 = *((CvANN_MLP_TrainParams *)(argp6));
     }
   }
   {
     try {
-      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4,arg5); 
+      result = (int)(arg1)->train((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_float((float)(result));
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_predict__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_train__SWIG_2 (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -32985,164 +40456,124 @@ static octave_value_list _wrap_CvBoost_predict__SWIG_2 (const octave_value_list&
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvBoost_predict",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_train",args.length(),5,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_train" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_train" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
   res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvBoost_predict" "', argument " "4"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvANN_MLP_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
   arg4 = (CvMat *)(argp4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvANN_MLP_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
   {
     try {
-      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3,arg4); 
+      result = (int)(arg1)->train((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_float((float)(result));
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_predict__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_train__SWIG_3 (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
+  CvMat *arg4 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
+  int result;
   
-  if (!SWIG_check_num_args("CvBoost_predict",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_train",args.length(),4,4,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_train" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_train" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
   arg2 = (CvMat *)(argp2);
   res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_predict" "', argument " "3"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_train" "', argument " "3"" of type '" "CvMat const *""'"); 
   }
   arg3 = (CvMat *)(argp3);
-  {
-    try {
-      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2,(CvMat const *)arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_From_float((float)(result));
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoost_predict__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  float result;
-  
-  if (!SWIG_check_num_args("CvBoost_predict",args.length(),2,2,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_predict" "', argument " "1"" of type '" "CvBoost const *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
+  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvANN_MLP_train" "', argument " "4"" of type '" "CvMat const *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
+  arg4 = (CvMat *)(argp4);
   {
     try {
-      result = (float)((CvBoost const *)arg1)->predict((CvMat const *)arg2); 
+      result = (int)(arg1)->train((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_float((float)(result));
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_predict (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvANN_MLP_train (const octave_value_list& args, int nargout) {
   int argc = args.length();
-  octave_value_ref argv[6]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5)
+  octave_value_ref argv[7]={
+    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6)
   };
   
-  if (argc == 2) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        return _wrap_CvBoost_predict__SWIG_4(args, nargout);
-      }
-    }
-  }
-  if (argc == 3) {
+  if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -33153,15 +40584,20 @@ static octave_value_list _wrap_CvBoost_predict (const octave_value_list& args, i
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_CvBoost_predict__SWIG_3(args, nargout);
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvANN_MLP_train__SWIG_3(args, nargout);
+          }
         }
       }
     }
   }
-  if (argc == 4) {
+  if (argc == 5) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -33176,16 +40612,21 @@ static octave_value_list _wrap_CvBoost_predict (const octave_value_list& args, i
           int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
-            return _wrap_CvBoost_predict__SWIG_2(args, nargout);
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvANN_MLP_train__SWIG_2(args, nargout);
+            }
           }
         }
       }
     }
   }
-  if (argc == 5) {
+  if (argc == 6) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -33201,20 +40642,25 @@ static octave_value_list _wrap_CvBoost_predict (const octave_value_list& args, i
           _v = SWIG_CheckState(res);
           if (_v) {
             void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSlice, 0);
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
             _v = SWIG_CheckState(res);
             if (_v) {
-              return _wrap_CvBoost_predict__SWIG_1(args, nargout);
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvANN_MLP_TrainParams, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_CvANN_MLP_train__SWIG_1(args, nargout);
+              }
             }
           }
         }
       }
     }
   }
-  if (argc == 6) {
+  if (argc == 7) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvBoost, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -33230,15 +40676,20 @@ static octave_value_list _wrap_CvBoost_predict (const octave_value_list& args, i
           _v = SWIG_CheckState(res);
           if (_v) {
             void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvSlice, 0);
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
             _v = SWIG_CheckState(res);
             if (_v) {
-              {
-                int res = SWIG_AsVal_bool(argv[5], NULL);
-                _v = SWIG_CheckState(res);
-              }
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvANN_MLP_TrainParams, 0);
+              _v = SWIG_CheckState(res);
               if (_v) {
-                return _wrap_CvBoost_predict__SWIG_0(args, nargout);
+                {
+                  int res = SWIG_AsVal_int(argv[6], NULL);
+                  _v = SWIG_CheckState(res);
+                }
+                if (_v) {
+                  return _wrap_CvANN_MLP_train__SWIG_0(args, nargout);
+                }
               }
             }
           }
@@ -33252,120 +40703,74 @@ static octave_value_list _wrap_CvBoost_predict (const octave_value_list& args, i
 }
 
 
-static octave_value_list _wrap_CvBoost_prune (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  CvSlice arg2 ;
+static octave_value_list _wrap_CvANN_MLP_predict (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 ;
+  void *argp2 = 0 ;
   int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  float result;
   
-  if (!SWIG_check_num_args("CvBoost_prune",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_predict",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_prune" "', argument " "1"" of type '" "CvBoost *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  {
-    res2 = SWIG_ConvertPtr(args(1), &argp2, SWIGTYPE_p_CvSlice,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_prune" "', argument " "2"" of type '" "CvSlice""'"); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvBoost_prune" "', argument " "2"" of type '" "CvSlice""'");
-    } else {
-      arg2 = *((CvSlice *)(argp2));
-    }
-  }
-  {
-    try {
-      (arg1)->prune(arg2); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_predict" "', argument " "1"" of type '" "CvANN_MLP const *""'"); 
   }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoost_clear (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  
-  if (!SWIG_check_num_args("CvBoost_clear",args.length(),1,1,0)) {
-    SWIG_fail;
+  arg1 = (CvANN_MLP *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_clear" "', argument " "1"" of type '" "CvBoost *""'"); 
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_predict" "', argument " "3"" of type '" "CvMat *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg3 = (CvMat *)(argp3);
   {
     try {
-      (arg1)->clear(); 
+      result = (float)((CvANN_MLP const *)arg1)->predict((CvMat const *)arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_From_float((float)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_write (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  char *arg3 = (char *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_clear (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvBoost_write",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_clear",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_write" "', argument " "1"" of type '" "CvBoost *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_write" "', argument " "3"" of type '" "char const *""'");
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_clear" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg3 = (char *)(buf3);
+  arg1 = (CvANN_MLP *)(argp1);
   {
     try {
-      (arg1)->write(arg2,(char const *)arg3); 
+      (arg1)->clear(); 
     } 
     catch (...) 
     {
@@ -33374,14 +40779,13 @@ static octave_value_list _wrap_CvBoost_write (const octave_value_list& args, int
   }
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_read (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_read (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvFileStorage *arg2 = (CvFileStorage *) 0 ;
   CvFileNode *arg3 = (CvFileNode *) 0 ;
   void *argp1 = 0 ;
@@ -33394,451 +40798,335 @@ static octave_value_list _wrap_CvBoost_read (const octave_value_list& args, int
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvBoost_read",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_read",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_read" "', argument " "1"" of type '" "CvBoost *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_read" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvBoost_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvBoost_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
-  }
-  arg3 = (CvFileNode *)(argp3);
-  {
-    try {
-      (arg1)->read(arg2,arg3); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = octave_value();
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoost_get_weak_predictors (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvSeq *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvBoost_get_weak_predictors",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_weak_predictors" "', argument " "1"" of type '" "CvBoost *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  {
-    try {
-      result = (CvSeq *)(arg1)->get_weak_predictors(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvSeq, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoost_get_weights (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvBoost_get_weights",args.length(),1,1,0)) {
-    SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_weights" "', argument " "1"" of type '" "CvBoost *""'"); 
-  }
-  arg1 = (CvBoost *)(argp1);
-  {
-    try {
-      result = (CvMat *)(arg1)->get_weights(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
-  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-fail:
-  return _out;
-}
-
-
-static octave_value_list _wrap_CvBoost_get_subtree_weights (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  octave_value_list _out;
-  octave_value_list *_outp=&_out;
-  octave_value _outv;
-  CvMat *result = 0 ;
-  
-  if (!SWIG_check_num_args("CvBoost_get_subtree_weights",args.length(),1,1,0)) {
-    SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_subtree_weights" "', argument " "1"" of type '" "CvBoost *""'"); 
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg3 = (CvFileNode *)(argp3);
   {
     try {
-      result = (CvMat *)(arg1)->get_subtree_weights(); 
+      (arg1)->read(arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_get_weak_response (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_write (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
+  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
+  char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvBoost_get_weak_response",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_write",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_weak_response" "', argument " "1"" of type '" "CvBoost *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_write" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+  }
+  arg2 = (CvFileStorage *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_write" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = (char *)(buf3);
   {
     try {
-      result = (CvMat *)(arg1)->get_weak_response(); 
+      (arg1)->write(arg2,(char const *)arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvBoost_get_params (const octave_value_list& args, int nargout) {
-  CvBoost *arg1 = (CvBoost *) 0 ;
+static octave_value_list _wrap_CvANN_MLP_get_layer_count (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvBoostParams *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("CvBoost_get_params",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_get_layer_count",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvBoost_get_params" "', argument " "1"" of type '" "CvBoost const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_get_layer_count" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
-  arg1 = (CvBoost *)(argp1);
+  arg1 = (CvANN_MLP *)(argp1);
   {
     try {
-      {
-        CvBoostParams const &_result_ref = ((CvBoost const *)arg1)->get_params();
-        result = (CvBoostParams *) &_result_ref;
-      } 
+      result = (int)(arg1)->get_layer_count(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvBoostParams, 0 |  0 );
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static swig_octave_member swig_CvBoost_members[] = {
-{"train",_wrap_CvBoost_train,0,0,0,0},
-{"predict",_wrap_CvBoost_predict,0,0,0,0},
-{"prune",_wrap_CvBoost_prune,0,0,0,0},
-{"clear",_wrap_CvBoost_clear,0,0,0,0},
-{"write",_wrap_CvBoost_write,0,0,0,0},
-{"read",_wrap_CvBoost_read,0,0,0,0},
-{"get_weak_predictors",_wrap_CvBoost_get_weak_predictors,0,0,0,0},
-{"get_weights",_wrap_CvBoost_get_weights,0,0,0,0},
-{"get_subtree_weights",_wrap_CvBoost_get_subtree_weights,0,0,0,0},
-{"get_weak_response",_wrap_CvBoost_get_weak_response,0,0,0,0},
-{"get_params",_wrap_CvBoost_get_params,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvBoost_base_names[] = {"_p_CvStatModel",0};
-static const swig_type_info *swig_CvBoost_base[] = {0,0};
-static swig_octave_class _wrap_class_CvBoost = {"CvBoost", &SWIGTYPE_p_CvBoost,0,_wrap_new_CvBoost,0,_wrap_delete_CvBoost,swig_CvBoost_members,swig_CvBoost_base_names,swig_CvBoost_base };
-
-static octave_value_list _wrap_new_CvANN_MLP_TrainParams__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvANN_MLP_get_layer_sizes (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvANN_MLP_TrainParams *result = 0 ;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvANN_MLP_TrainParams",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_get_layer_sizes",args.length(),1,1,0)) {
     SWIG_fail;
   }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_get_layer_sizes" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
+  }
+  arg1 = (CvANN_MLP *)(argp1);
   {
     try {
-      result = (CvANN_MLP_TrainParams *)new CvANN_MLP_TrainParams(); 
+      result = (CvMat *)(arg1)->get_layer_sizes(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP_TrainParams, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvANN_MLP_TrainParams__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvTermCriteria arg1 ;
+static octave_value_list _wrap_CvANN_MLP_get_weights (const octave_value_list& args, int nargout) {
+  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   int arg2 ;
-  double arg3 ;
-  double arg4 ;
-  void *argp1 ;
+  void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  double val4 ;
-  int ecode4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvANN_MLP_TrainParams *result = 0 ;
+  double *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvANN_MLP_TrainParams",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvANN_MLP_get_weights",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  {
-    res1 = SWIG_ConvertPtr(args(0), &argp1, SWIGTYPE_p_CvTermCriteria,  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvTermCriteria""'"); 
-    }  
-    if (!argp1) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvTermCriteria""'");
-    } else {
-      arg1 = *((CvTermCriteria *)(argp1));
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_get_weights" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
   }
+  arg1 = (CvANN_MLP *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_get_weights" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_double(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "3"" of type '" "double""'");
-  } 
-  arg3 = (double)(val3);
-  ecode4 = SWIG_AsVal_double(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "4"" of type '" "double""'");
-  } 
-  arg4 = (double)(val4);
   {
     try {
-      result = (CvANN_MLP_TrainParams *)new CvANN_MLP_TrainParams(arg1,arg2,arg3,arg4); 
+      result = (double *)(arg1)->get_weights(arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP_TrainParams, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_double, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvANN_MLP_TrainParams__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvTermCriteria arg1 ;
-  int arg2 ;
-  double arg3 ;
-  void *argp1 ;
+static swig_octave_member swig_CvANN_MLP_members[] = {
+{"create",_wrap_CvANN_MLP_create,0,0,0,0},
+{"train",_wrap_CvANN_MLP_train,0,0,0,0},
+{"predict",_wrap_CvANN_MLP_predict,0,0,0,0},
+{"clear",_wrap_CvANN_MLP_clear,0,0,0,0},
+{"read",_wrap_CvANN_MLP_read,0,0,0,0},
+{"write",_wrap_CvANN_MLP_write,0,0,0,0},
+{"get_layer_count",_wrap_CvANN_MLP_get_layer_count,0,0,0,0},
+{"get_layer_sizes",_wrap_CvANN_MLP_get_layer_sizes,0,0,0,0},
+{"get_weights",_wrap_CvANN_MLP_get_weights,0,0,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvANN_MLP_base_names[] = {"_p_CvStatModel",0};
+static const swig_type_info *swig_CvANN_MLP_base[] = {0,0};
+static swig_octave_class _wrap_class_CvANN_MLP = {"CvANN_MLP", &SWIGTYPE_p_CvANN_MLP,0,_wrap_new_CvANN_MLP,0,_wrap_delete_CvANN_MLP,swig_CvANN_MLP_members,swig_CvANN_MLP_base_names,swig_CvANN_MLP_base };
+
+static octave_value_list _wrap_cvRandMVNormal (const octave_value_list& args, int nargout) {
+  CvMat *arg1 = (CvMat *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  CvMat *arg3 = (CvMat *) 0 ;
+  CvRNG *arg4 = (CvRNG *) 0 ;
+  void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *vptr4 ;
+  CvRNG_Wrapper *wrapper4 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvANN_MLP_TrainParams *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvANN_MLP_TrainParams",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("cvRandMVNormal",args.length(),4,3,0)) {
     SWIG_fail;
   }
-  {
-    res1 = SWIG_ConvertPtr(args(0), &argp1, SWIGTYPE_p_CvTermCriteria,  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvTermCriteria""'"); 
-    }  
-    if (!argp1) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvTermCriteria""'");
-    } else {
-      arg1 = *((CvTermCriteria *)(argp1));
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRandMVNormal" "', argument " "1"" of type '" "CvMat *""'"); 
+  }
+  arg1 = (CvMat *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvRandMVNormal" "', argument " "2"" of type '" "CvMat *""'"); 
+  }
+  arg2 = (CvMat *)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvRandMVNormal" "', argument " "3"" of type '" "CvMat *""'"); 
+  }
+  arg3 = (CvMat *)(argp3);
+  if (3<args.length()) {
+    {
+      if(SWIG_ConvertPtr(args(3), &vptr4, SWIGTYPE_p_CvRNG_Wrapper, 0)==-1){
+        SWIG_exception( SWIG_TypeError, "could not convert Octave object to C value");
+        SWIG_fail;
+      }
+      wrapper4 = (CvRNG_Wrapper *) vptr4;
+      arg4 = wrapper4->ptr();
     }
   }
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_double(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvANN_MLP_TrainParams" "', argument " "3"" of type '" "double""'");
-  } 
-  arg3 = (double)(val3);
   {
     try {
-      result = (CvANN_MLP_TrainParams *)new CvANN_MLP_TrainParams(arg1,arg2,arg3); 
+      cvRandMVNormal(arg1,arg2,arg3,arg4); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP_TrainParams, 1 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvANN_MLP_TrainParams (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[4]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvANN_MLP_TrainParams__SWIG_0(args, nargout);
-  }
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvTermCriteria, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_double(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          return _wrap_new_CvANN_MLP_TrainParams__SWIG_2(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvTermCriteria, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_double(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_double(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_new_CvANN_MLP_TrainParams__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  
-  error("No matching function for overload");
-  return octave_value_list();
-}
-
-
-static octave_value_list _wrap_delete_CvANN_MLP_TrainParams (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+static octave_value_list _wrap_cvRandGaussMixture (const octave_value_list& args, int nargout) {
+  CvMat **arg1 ;
+  CvMat **arg2 ;
+  float *arg3 ;
+  int arg4 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("delete_CvANN_MLP_TrainParams",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("cvRandGaussMixture",args.length(),6,5,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvANN_MLP_TrainParams" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRandGaussMixture" "', argument " "1"" of type '" "CvMat *[]""'"); 
+  } 
+  arg1 = (CvMat **)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvRandGaussMixture" "', argument " "2"" of type '" "CvMat *[]""'"); 
+  } 
+  arg2 = (CvMat **)(argp2);
+  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvRandGaussMixture" "', argument " "3"" of type '" "float []""'"); 
+  } 
+  arg3 = (float *)(argp3);
+  ecode4 = SWIG_AsVal_int(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvRandGaussMixture" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = (int)(val4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvRandGaussMixture" "', argument " "5"" of type '" "CvMat *""'"); 
+  }
+  arg5 = (CvMat *)(argp5);
+  if (5<args.length()) {
+    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvRandGaussMixture" "', argument " "6"" of type '" "CvMat *""'"); 
+    }
+    arg6 = (CvMat *)(argp6);
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
   {
     try {
-      delete arg1
+      cvRandGaussMixture(arg1,arg2,arg3,arg4,arg5,arg6)
     } 
     catch (...) 
     {
@@ -33852,31 +41140,72 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_term_crit_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  CvTermCriteria *arg2 = (CvTermCriteria *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+static octave_value_list _wrap_cvCreateTestSet (const octave_value_list& args, int nargout) {
+  int arg1 ;
+  CvMat **arg2 = (CvMat **) 0 ;
+  int arg3 ;
+  int arg4 ;
+  CvMat **arg5 = (CvMat **) 0 ;
+  int arg6 ;
+  void *arg7 = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_term_crit_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("cvCreateTestSet",args.length(),6,6,1)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_term_crit_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
-  }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvTermCriteria, 0 |  0 );
+  ecode1 = SWIG_AsVal_int(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCreateTestSet" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_p_CvMat, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_TrainParams_term_crit_set" "', argument " "2"" of type '" "CvTermCriteria *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCreateTestSet" "', argument " "2"" of type '" "CvMat **""'"); 
+  }
+  arg2 = (CvMat **)(argp2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvCreateTestSet" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
+  ecode4 = SWIG_AsVal_int(args(3), &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvCreateTestSet" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = (int)(val4);
+  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_p_CvMat, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvCreateTestSet" "', argument " "5"" of type '" "CvMat **""'"); 
+  }
+  arg5 = (CvMat **)(argp5);
+  ecode6 = SWIG_AsVal_int(args(5), &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvCreateTestSet" "', argument " "6"" of type '" "int""'");
+  } 
+  arg6 = (int)(val6);
+  {
+    try {
+      cvCreateTestSet(arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg2 = (CvTermCriteria *)(argp2);
-  if (arg1) (arg1)->term_crit = *arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -33884,170 +41213,271 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_term_crit_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+static octave_value_list _wrap_new_CvTrainTestSplit__SWIG_0 (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvTermCriteria *result = 0 ;
+  CvTrainTestSplit *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_term_crit_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("new_CvTrainTestSplit",args.length(),0,0,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_term_crit_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  {
+    try {
+      result = (CvTrainTestSplit *)new CvTrainTestSplit(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (CvTermCriteria *)& ((arg1)->term_crit);
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTermCriteria, 0 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_train_method_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
+static octave_value_list _wrap_new_CvTrainTestSplit__SWIG_1 (const octave_value_list& args, int nargout) {
+  int arg1 ;
+  bool arg2 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  bool val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvTrainTestSplit *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_train_method_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("new_CvTrainTestSplit",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_train_method_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
-  }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  ecode1 = SWIG_AsVal_int(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvTrainTestSplit" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_train_method_set" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvTrainTestSplit" "', argument " "2"" of type '" "bool""'");
   } 
-  arg2 = (int)(val2);
-  if (arg1) (arg1)->train_method = arg2;
-  _outv = octave_value();
+  arg2 = (bool)(val2);
+  {
+    try {
+      result = (CvTrainTestSplit *)new CvTrainTestSplit(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_train_method_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+static octave_value_list _wrap_new_CvTrainTestSplit__SWIG_2 (const octave_value_list& args, int nargout) {
+  int arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  CvTrainTestSplit *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_train_method_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("new_CvTrainTestSplit",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_train_method_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  ecode1 = SWIG_AsVal_int(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvTrainTestSplit" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  {
+    try {
+      result = (CvTrainTestSplit *)new CvTrainTestSplit(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (int) ((arg1)->train_method);
-  _outv = SWIG_From_int((int)(result));
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_bp_dw_scale_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  double val2 ;
+static octave_value_list _wrap_new_CvTrainTestSplit__SWIG_3 (const octave_value_list& args, int nargout) {
+  float arg1 ;
+  bool arg2 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  bool val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvTrainTestSplit *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_bp_dw_scale_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("new_CvTrainTestSplit",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_bp_dw_scale_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
-  }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  ecode1 = SWIG_AsVal_float(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvTrainTestSplit" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = (float)(val1);
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_bp_dw_scale_set" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvTrainTestSplit" "', argument " "2"" of type '" "bool""'");
   } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->bp_dw_scale = arg2;
-  _outv = octave_value();
+  arg2 = (bool)(val2);
+  {
+    try {
+      result = (CvTrainTestSplit *)new CvTrainTestSplit(arg1,arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_bp_dw_scale_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+static octave_value_list _wrap_new_CvTrainTestSplit__SWIG_4 (const octave_value_list& args, int nargout) {
+  float arg1 ;
+  float val1 ;
+  int ecode1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
+  CvTrainTestSplit *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_bp_dw_scale_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("new_CvTrainTestSplit",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_bp_dw_scale_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+  ecode1 = SWIG_AsVal_float(args(0), &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvTrainTestSplit" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = (float)(val1);
+  {
+    try {
+      result = (CvTrainTestSplit *)new CvTrainTestSplit(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (double) ((arg1)->bp_dw_scale);
-  _outv = SWIG_From_double((double)(result));
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_bp_moment_scale_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_new_CvTrainTestSplit (const octave_value_list& args, int nargout) {
+  int argc = args.length();
+  octave_value_ref argv[2]={
+    octave_value_ref(args,0),octave_value_ref(args,1)
+  };
+  
+  if (argc == 0) {
+    return _wrap_new_CvTrainTestSplit__SWIG_0(args, nargout);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_CvTrainTestSplit__SWIG_2(args, nargout);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_CvTrainTestSplit__SWIG_4(args, nargout);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_CvTrainTestSplit__SWIG_1(args, nargout);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_CvTrainTestSplit__SWIG_3(args, nargout);
+      }
+    }
+  }
+  
+  error("No matching function for overload");
+  return octave_value_list();
+}
+
+
+static octave_value_list _wrap_CvTrainTestSplit_train_sample_part_mode_set (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_bp_moment_scale_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_train_sample_part_mode_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_bp_moment_scale_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_train_sample_part_mode_set" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  arg1 = (CvTrainTestSplit *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_bp_moment_scale_set" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTrainTestSplit_train_sample_part_mode_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->bp_moment_scale = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->train_sample_part_mode = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -34055,56 +41485,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_bp_moment_scale_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+static octave_value_list _wrap_CvTrainTestSplit_train_sample_part_mode_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
+  int result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_bp_moment_scale_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_train_sample_part_mode_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_bp_moment_scale_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_train_sample_part_mode_get" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (double) ((arg1)->bp_moment_scale);
-  _outv = SWIG_From_double((double)(result));
+  arg1 = (CvTrainTestSplit *)(argp1);
+  result = (int) ((arg1)->train_sample_part_mode);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw0_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_CvTrainTestSplit_class_part_mode_set (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
+  int val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw0_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_class_part_mode_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw0_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_class_part_mode_set" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  arg1 = (CvTrainTestSplit *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw0_set" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTrainTestSplit_class_part_mode_set" "', argument " "2"" of type '" "int""'");
   } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->rp_dw0 = arg2;
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->class_part_mode = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -34112,56 +41542,56 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw0_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+static octave_value_list _wrap_CvTrainTestSplit_class_part_mode_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
+  int result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw0_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_class_part_mode_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw0_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_class_part_mode_get" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (double) ((arg1)->rp_dw0);
-  _outv = SWIG_From_double((double)(result));
+  arg1 = (CvTrainTestSplit *)(argp1);
+  result = (int) ((arg1)->class_part_mode);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_plus_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_CvTrainTestSplit_mix_set (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
+  bool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
+  bool val2 ;
   int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_plus_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_mix_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_plus_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_mix_set" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
+  arg1 = (CvTrainTestSplit *)(argp1);
+  ecode2 = SWIG_AsVal_bool(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw_plus_set" "', argument " "2"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTrainTestSplit_mix_set" "', argument " "2"" of type '" "bool""'");
   } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->rp_dw_plus = arg2;
+  arg2 = (bool)(val2);
+  if (arg1) (arg1)->mix = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -34169,113 +41599,106 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_plus_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+static octave_value_list _wrap_CvTrainTestSplit_mix_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
+  bool result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_plus_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_mix_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_plus_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_mix_get" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (double) ((arg1)->rp_dw_plus);
-  _outv = SWIG_From_double((double)(result));
+  arg1 = (CvTrainTestSplit *)(argp1);
+  result = (bool) ((arg1)->mix);
+  _outv = SWIG_From_bool((bool)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_minus_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_CvTrainTestSplit_class_part_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvTrainTestSplit_class_part *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_minus_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_class_part_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_minus_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_class_part_get" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw_minus_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->rp_dw_minus = arg2;
-  _outv = octave_value();
+  arg1 = (CvTrainTestSplit *)(argp1);
+  result = (CvTrainTestSplit_class_part *) ((arg1)->class_part);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit_class_part, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_minus_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+static octave_value_list _wrap_CvTrainTestSplit_train_sample_part_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
+  CvTrainTestSplit_train_sample_part *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_minus_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_train_sample_part_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_minus_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_train_sample_part_get" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (double) ((arg1)->rp_dw_minus);
-  _outv = SWIG_From_double((double)(result));
+  arg1 = (CvTrainTestSplit *)(argp1);
+  result = (CvTrainTestSplit_train_sample_part *)& ((arg1)->train_sample_part);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit_train_sample_part, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_min_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_delete_CvTrainTestSplit (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_min_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("delete_CvTrainTestSplit",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_min_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTrainTestSplit" "', argument " "1"" of type '" "CvTrainTestSplit *""'"); 
+  }
+  arg1 = (CvTrainTestSplit *)(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw_min_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->rp_dw_min = arg2;
   _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
@@ -34283,237 +41706,200 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_min_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+static swig_octave_member swig_CvTrainTestSplit_members[] = {
+{"train_sample_part_mode",0,_wrap_CvTrainTestSplit_train_sample_part_mode_get,_wrap_CvTrainTestSplit_train_sample_part_mode_set,0,0},
+{"class_part_mode",0,_wrap_CvTrainTestSplit_class_part_mode_get,_wrap_CvTrainTestSplit_class_part_mode_set,0,0},
+{"mix",0,_wrap_CvTrainTestSplit_mix_get,_wrap_CvTrainTestSplit_mix_set,0,0},
+{"class_part",0,_wrap_CvTrainTestSplit_class_part_get,octave_set_immutable,0,0},
+{"train_sample_part",0,_wrap_CvTrainTestSplit_train_sample_part_get,octave_set_immutable,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvTrainTestSplit_base_names[] = {0};
+static const swig_type_info *swig_CvTrainTestSplit_base[] = {0};
+static swig_octave_class _wrap_class_CvTrainTestSplit = {"CvTrainTestSplit", &SWIGTYPE_p_CvTrainTestSplit,0,_wrap_new_CvTrainTestSplit,0,_wrap_delete_CvTrainTestSplit,swig_CvTrainTestSplit_members,swig_CvTrainTestSplit_base_names,swig_CvTrainTestSplit_base };
+
+static octave_value_list _wrap_CvTrainTestSplit_class_part_count_set (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_class_part *arg1 = (CvTrainTestSplit_class_part *) 0 ;
+  int *arg2 = (int *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_min_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_class_part_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_class_part, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_min_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_class_part_count_set" "', argument " "1"" of type '" "CvTrainTestSplit_class_part *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (double) ((arg1)->rp_dw_min);
-  _outv = SWIG_From_double((double)(result));
+  arg1 = (CvTrainTestSplit_class_part *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvTrainTestSplit_class_part_count_set" "', argument " "2"" of type '" "int *""'"); 
+  }
+  arg2 = (int *)(argp2);
+  if (arg1) (arg1)->count = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_max_set (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double arg2 ;
+static octave_value_list _wrap_CvTrainTestSplit_class_part_count_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_class_part *arg1 = (CvTrainTestSplit_class_part *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_max_set",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_class_part_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_class_part, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_max_set" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_class_part_count_get" "', argument " "1"" of type '" "CvTrainTestSplit_class_part *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  ecode2 = SWIG_AsVal_double(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_TrainParams_rp_dw_max_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = (double)(val2);
-  if (arg1) (arg1)->rp_dw_max = arg2;
-  _outv = octave_value();
+  arg1 = (CvTrainTestSplit_class_part *)(argp1);
+  result = (int *) ((arg1)->count);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_TrainParams_rp_dw_max_get (const octave_value_list& args, int nargout) {
-  CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
+static octave_value_list _wrap_CvTrainTestSplit_class_part_portion_set (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_class_part *arg1 = (CvTrainTestSplit_class_part *) 0 ;
+  float *arg2 = (float *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_TrainParams_rp_dw_max_get",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_class_part_portion_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_class_part, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_TrainParams_rp_dw_max_get" "', argument " "1"" of type '" "CvANN_MLP_TrainParams *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_class_part_portion_set" "', argument " "1"" of type '" "CvTrainTestSplit_class_part *""'"); 
   }
-  arg1 = (CvANN_MLP_TrainParams *)(argp1);
-  result = (double) ((arg1)->rp_dw_max);
-  _outv = SWIG_From_double((double)(result));
+  arg1 = (CvTrainTestSplit_class_part *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_float, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvTrainTestSplit_class_part_portion_set" "', argument " "2"" of type '" "float *""'"); 
+  }
+  arg2 = (float *)(argp2);
+  if (arg1) (arg1)->portion = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static swig_octave_member swig_CvANN_MLP_TrainParams_members[] = {
-{"term_crit",0,_wrap_CvANN_MLP_TrainParams_term_crit_get,_wrap_CvANN_MLP_TrainParams_term_crit_set,0,0},
-{"train_method",0,_wrap_CvANN_MLP_TrainParams_train_method_get,_wrap_CvANN_MLP_TrainParams_train_method_set,0,0},
-{"bp_dw_scale",0,_wrap_CvANN_MLP_TrainParams_bp_dw_scale_get,_wrap_CvANN_MLP_TrainParams_bp_dw_scale_set,0,0},
-{"bp_moment_scale",0,_wrap_CvANN_MLP_TrainParams_bp_moment_scale_get,_wrap_CvANN_MLP_TrainParams_bp_moment_scale_set,0,0},
-{"rp_dw0",0,_wrap_CvANN_MLP_TrainParams_rp_dw0_get,_wrap_CvANN_MLP_TrainParams_rp_dw0_set,0,0},
-{"rp_dw_plus",0,_wrap_CvANN_MLP_TrainParams_rp_dw_plus_get,_wrap_CvANN_MLP_TrainParams_rp_dw_plus_set,0,0},
-{"rp_dw_minus",0,_wrap_CvANN_MLP_TrainParams_rp_dw_minus_get,_wrap_CvANN_MLP_TrainParams_rp_dw_minus_set,0,0},
-{"rp_dw_min",0,_wrap_CvANN_MLP_TrainParams_rp_dw_min_get,_wrap_CvANN_MLP_TrainParams_rp_dw_min_set,0,0},
-{"rp_dw_max",0,_wrap_CvANN_MLP_TrainParams_rp_dw_max_get,_wrap_CvANN_MLP_TrainParams_rp_dw_max_set,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvANN_MLP_TrainParams_base_names[] = {0};
-static const swig_type_info *swig_CvANN_MLP_TrainParams_base[] = {0};
-static swig_octave_class _wrap_class_CvANN_MLP_TrainParams = {"CvANN_MLP_TrainParams", &SWIGTYPE_p_CvANN_MLP_TrainParams,0,_wrap_new_CvANN_MLP_TrainParams,0,_wrap_delete_CvANN_MLP_TrainParams,swig_CvANN_MLP_TrainParams_members,swig_CvANN_MLP_TrainParams_base_names,swig_CvANN_MLP_TrainParams_base };
-
-static octave_value_list _wrap_new_CvANN_MLP__SWIG_0 (const octave_value_list& args, int nargout) {
+static octave_value_list _wrap_CvTrainTestSplit_class_part_portion_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_class_part *arg1 = (CvTrainTestSplit_class_part *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvANN_MLP *result = 0 ;
+  float *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),0,0,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_class_part_portion_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  {
-    try {
-      result = (CvANN_MLP *)new CvANN_MLP(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_class_part, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_class_part_portion_get" "', argument " "1"" of type '" "CvTrainTestSplit_class_part *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
+  arg1 = (CvTrainTestSplit_class_part *)(argp1);
+  result = (float *) ((arg1)->portion);
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvANN_MLP__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  int arg2 ;
-  double arg3 ;
-  double arg4 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  double val4 ;
-  int ecode4 = 0 ;
+static octave_value_list _wrap_new_CvTrainTestSplit_class_part (const octave_value_list& args, int nargout) {
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvANN_MLP *result = 0 ;
+  CvTrainTestSplit_class_part *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("new_CvTrainTestSplit_class_part",args.length(),0,0,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_double(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvANN_MLP" "', argument " "3"" of type '" "double""'");
-  } 
-  arg3 = (double)(val3);
-  ecode4 = SWIG_AsVal_double(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CvANN_MLP" "', argument " "4"" of type '" "double""'");
-  } 
-  arg4 = (double)(val4);
   {
     try {
-      result = (CvANN_MLP *)new CvANN_MLP((CvMat const *)arg1,arg2,arg3,arg4); 
+      result = (CvTrainTestSplit_class_part *)new CvTrainTestSplit_class_part(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit_class_part, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvANN_MLP__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  int arg2 ;
-  double arg3 ;
+static octave_value_list _wrap_delete_CvTrainTestSplit_class_part (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_class_part *arg1 = (CvTrainTestSplit_class_part *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvANN_MLP *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("delete_CvTrainTestSplit_class_part",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_class_part, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTrainTestSplit_class_part" "', argument " "1"" of type '" "CvTrainTestSplit_class_part *""'"); 
   }
-  arg1 = (CvMat *)(argp1);
-  ecode2 = SWIG_AsVal_int(args(1), &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_double(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CvANN_MLP" "', argument " "3"" of type '" "double""'");
-  } 
-  arg3 = (double)(val3);
+  arg1 = (CvTrainTestSplit_class_part *)(argp1);
   {
     try {
-      result = (CvANN_MLP *)new CvANN_MLP((CvMat const *)arg1,arg2,arg3)
+      delete arg1
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvANN_MLP__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
+static swig_octave_member swig_CvTrainTestSplit_class_part_members[] = {
+{"count",0,_wrap_CvTrainTestSplit_class_part_count_get,_wrap_CvTrainTestSplit_class_part_count_set,0,0},
+{"portion",0,_wrap_CvTrainTestSplit_class_part_portion_get,_wrap_CvTrainTestSplit_class_part_portion_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvTrainTestSplit_class_part_base_names[] = {0};
+static const swig_type_info *swig_CvTrainTestSplit_class_part_base[] = {0};
+static swig_octave_class _wrap_class_CvTrainTestSplit_class_part = {"CvTrainTestSplit_class_part", &SWIGTYPE_p_CvTrainTestSplit_class_part,0,_wrap_new_CvTrainTestSplit_class_part,0,_wrap_delete_CvTrainTestSplit_class_part,swig_CvTrainTestSplit_class_part_members,swig_CvTrainTestSplit_class_part_base_names,swig_CvTrainTestSplit_class_part_base };
+
+static octave_value_list _wrap_CvTrainTestSplit_train_sample_part_count_set (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_train_sample_part *arg1 = (CvTrainTestSplit_train_sample_part *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -34522,240 +41908,154 @@ static octave_value_list _wrap_new_CvANN_MLP__SWIG_3 (const octave_value_list& a
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvANN_MLP *result = 0 ;
   
-  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_train_sample_part_count_set",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_train_sample_part, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP" "', argument " "1"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_train_sample_part_count_set" "', argument " "1"" of type '" "CvTrainTestSplit_train_sample_part *""'"); 
   }
-  arg1 = (CvMat *)(argp1);
+  arg1 = (CvTrainTestSplit_train_sample_part *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CvANN_MLP" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTrainTestSplit_train_sample_part_count_set" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
-  {
-    try {
-      result = (CvANN_MLP *)new CvANN_MLP((CvMat const *)arg1,arg2); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
+  if (arg1) (arg1)->count = arg2;
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_new_CvANN_MLP__SWIG_4 (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvTrainTestSplit_train_sample_part_count_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_train_sample_part *arg1 = (CvTrainTestSplit_train_sample_part *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvANN_MLP *result = 0 ;
+  int result;
   
-  if (!SWIG_check_num_args("new_CvANN_MLP",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_train_sample_part_count_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_train_sample_part, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvANN_MLP" "', argument " "1"" of type '" "CvMat const *""'"); 
-  }
-  arg1 = (CvMat *)(argp1);
-  {
-    try {
-      result = (CvANN_MLP *)new CvANN_MLP((CvMat const *)arg1); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_train_sample_part_count_get" "', argument " "1"" of type '" "CvTrainTestSplit_train_sample_part *""'"); 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvANN_MLP, 1 |  0 );
+  arg1 = (CvTrainTestSplit_train_sample_part *)(argp1);
+  result = (int) ((arg1)->count);
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
-
-static octave_value_list _wrap_new_CvANN_MLP (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[4]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3)
-  };
-  
-  if (argc == 0) {
-    return _wrap_new_CvANN_MLP__SWIG_0(args, nargout);
-  }
-  if (argc == 1) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_new_CvANN_MLP__SWIG_4(args, nargout);
-    }
-  }
-  if (argc == 2) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        return _wrap_new_CvANN_MLP__SWIG_3(args, nargout);
-      }
-    }
-  }
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_double(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          return _wrap_new_CvANN_MLP__SWIG_2(args, nargout);
-        }
-      }
-    }
-  }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      {
-        int res = SWIG_AsVal_int(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        {
-          int res = SWIG_AsVal_double(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_double(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_new_CvANN_MLP__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
-  }
+
+static octave_value_list _wrap_CvTrainTestSplit_train_sample_part_portion_set (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_train_sample_part *arg1 = (CvTrainTestSplit_train_sample_part *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
   
-  error("No matching function for overload");
-  return octave_value_list();
+  if (!SWIG_check_num_args("CvTrainTestSplit_train_sample_part_portion_set",args.length(),2,2,0)) {
+    SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_train_sample_part, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_train_sample_part_portion_set" "', argument " "1"" of type '" "CvTrainTestSplit_train_sample_part *""'"); 
+  }
+  arg1 = (CvTrainTestSplit_train_sample_part *)(argp1);
+  ecode2 = SWIG_AsVal_float(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTrainTestSplit_train_sample_part_portion_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = (float)(val2);
+  if (arg1) (arg1)->portion = arg2;
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static octave_value_list _wrap_delete_CvANN_MLP (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
+static octave_value_list _wrap_CvTrainTestSplit_train_sample_part_portion_get (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_train_sample_part *arg1 = (CvTrainTestSplit_train_sample_part *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  float result;
   
-  if (!SWIG_check_num_args("delete_CvANN_MLP",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvTrainTestSplit_train_sample_part_portion_get",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_train_sample_part, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvANN_MLP" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTrainTestSplit_train_sample_part_portion_get" "', argument " "1"" of type '" "CvTrainTestSplit_train_sample_part *""'"); 
+  }
+  arg1 = (CvTrainTestSplit_train_sample_part *)(argp1);
+  result = (float) ((arg1)->portion);
+  _outv = SWIG_From_float((float)(result));
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_new_CvTrainTestSplit_train_sample_part (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvTrainTestSplit_train_sample_part *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvTrainTestSplit_train_sample_part",args.length(),0,0,0)) {
+    SWIG_fail;
   }
-  arg1 = (CvANN_MLP *)(argp1);
   {
     try {
-      delete arg1
+      result = (CvTrainTestSplit_train_sample_part *)new CvTrainTestSplit_train_sample_part()
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTrainTestSplit_train_sample_part, 1 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_create__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  double arg4 ;
-  double arg5 ;
+static octave_value_list _wrap_delete_CvTrainTestSplit_train_sample_part (const octave_value_list& args, int nargout) {
+  CvTrainTestSplit_train_sample_part *arg1 = (CvTrainTestSplit_train_sample_part *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  double val4 ;
-  int ecode4 = 0 ;
-  double val5 ;
-  int ecode5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvANN_MLP_create",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("delete_CvTrainTestSplit_train_sample_part",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvTrainTestSplit_train_sample_part, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_create" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
-  }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_create" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTrainTestSplit_train_sample_part" "', argument " "1"" of type '" "CvTrainTestSplit_train_sample_part *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvANN_MLP_create" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_double(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvANN_MLP_create" "', argument " "4"" of type '" "double""'");
-  } 
-  arg4 = (double)(val4);
-  ecode5 = SWIG_AsVal_double(args(4), &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CvANN_MLP_create" "', argument " "5"" of type '" "double""'");
-  } 
-  arg5 = (double)(val5);
+  arg1 = (CvTrainTestSplit_train_sample_part *)(argp1);
   {
     try {
-      (arg1)->create((CvMat const *)arg2,arg3,arg4,arg5)
+      delete arg1
     } 
     catch (...) 
     {
@@ -34769,49 +42069,59 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_create__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
-  double arg4 ;
+static swig_octave_member swig_CvTrainTestSplit_train_sample_part_members[] = {
+{"count",0,_wrap_CvTrainTestSplit_train_sample_part_count_get,_wrap_CvTrainTestSplit_train_sample_part_count_set,0,0},
+{"portion",0,_wrap_CvTrainTestSplit_train_sample_part_portion_get,_wrap_CvTrainTestSplit_train_sample_part_portion_set,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvTrainTestSplit_train_sample_part_base_names[] = {0};
+static const swig_type_info *swig_CvTrainTestSplit_train_sample_part_base[] = {0};
+static swig_octave_class _wrap_class_CvTrainTestSplit_train_sample_part = {"CvTrainTestSplit_train_sample_part", &SWIGTYPE_p_CvTrainTestSplit_train_sample_part,0,_wrap_new_CvTrainTestSplit_train_sample_part,0,_wrap_delete_CvTrainTestSplit_train_sample_part,swig_CvTrainTestSplit_train_sample_part_members,swig_CvTrainTestSplit_train_sample_part_base_names,swig_CvTrainTestSplit_train_sample_part_base };
+
+static octave_value_list _wrap_new_CvMLData (const octave_value_list& args, int nargout) {
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMLData *result = 0 ;
+  
+  if (!SWIG_check_num_args("new_CvMLData",args.length(),0,0,0)) {
+    SWIG_fail;
+  }
+  {
+    try {
+      result = (CvMLData *)new CvMLData(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMLData, 1 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_delete_CvMLData (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  double val4 ;
-  int ecode4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvANN_MLP_create",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("delete_CvMLData",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_create" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
-  }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_create" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvMLData" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvANN_MLP_create" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_double(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CvANN_MLP_create" "', argument " "4"" of type '" "double""'");
-  } 
-  arg4 = (double)(val4);
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      (arg1)->create((CvMat const *)arg2,arg3,arg4)
+      delete arg1
     } 
     catch (...) 
     {
@@ -34825,416 +42135,208 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_create__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  int arg3 ;
+static octave_value_list _wrap_CvMLData_read_csv (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  int result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_create",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvMLData_read_csv",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_create" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_read_csv" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvMLData *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(args(1), &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_create" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvMLData_read_csv" "', argument " "2"" of type '" "char const *""'");
   }
-  arg2 = (CvMat *)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvANN_MLP_create" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
+  arg2 = (char *)(buf2);
   {
     try {
-      (arg1)->create((CvMat const *)arg2,arg3); 
+      result = (int)(arg1)->read_csv((char const *)arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_From_int((int)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_create__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvMLData_get_values (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_create",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMLData_get_values",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_create" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
-  }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_create" "', argument " "2"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_values" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg2 = (CvMat *)(argp2);
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      (arg1)->create((CvMat const *)arg2); 
+      result = (CvMat *)(arg1)->get_values(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_create (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[5]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4)
-  };
+static octave_value_list _wrap_CvMLData_get_response (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (argc == 2) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        return _wrap_CvANN_MLP_create__SWIG_3(args, nargout);
-      }
-    }
-  }
-  if (argc == 3) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          return _wrap_CvANN_MLP_create__SWIG_2(args, nargout);
-        }
-      }
-    }
+  if (!SWIG_check_num_args("CvMLData_get_response",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_double(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_CvANN_MLP_create__SWIG_1(args, nargout);
-          }
-        }
-      }
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_response" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        {
-          int res = SWIG_AsVal_int(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          {
-            int res = SWIG_AsVal_double(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            {
-              int res = SWIG_AsVal_double(argv[4], NULL);
-              _v = SWIG_CheckState(res);
-            }
-            if (_v) {
-              return _wrap_CvANN_MLP_create__SWIG_0(args, nargout);
-            }
-          }
-        }
-      }
-    }
+  arg1 = (CvMLData *)(argp1);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_response(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_train__SWIG_0 (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvANN_MLP_TrainParams arg6 ;
-  int arg7 ;
+static octave_value_list _wrap_CvMLData_get_missing (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_train",args.length(),7,7,0)) {
+  if (!SWIG_check_num_args("CvMLData_get_missing",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_train" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
-  }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_train" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvANN_MLP_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvANN_MLP_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvANN_MLP_TrainParams,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvANN_MLP_train" "', argument " "6"" of type '" "CvANN_MLP_TrainParams""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvANN_MLP_train" "', argument " "6"" of type '" "CvANN_MLP_TrainParams""'");
-    } else {
-      arg6 = *((CvANN_MLP_TrainParams *)(argp6));
-    }
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_missing" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  ecode7 = SWIG_AsVal_int(args(6), &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CvANN_MLP_train" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      result = (int)(arg1)->train((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6,arg7); 
+      result = (CvMat *)(arg1)->get_missing(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_int((int)(result));
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_train__SWIG_1 (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvANN_MLP_TrainParams arg6 ;
+static octave_value_list _wrap_CvMLData_set_response_idx (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 ;
-  int res6 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_train",args.length(),6,6,0)) {
+  if (!SWIG_check_num_args("CvMLData_set_response_idx",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_train" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
-  }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_train" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvANN_MLP_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvANN_MLP_train" "', argument " "5"" of type '" "CvMat const *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  {
-    res6 = SWIG_ConvertPtr(args(5), &argp6, SWIGTYPE_p_CvANN_MLP_TrainParams,  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CvANN_MLP_train" "', argument " "6"" of type '" "CvANN_MLP_TrainParams""'"); 
-    }  
-    if (!argp6) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvANN_MLP_train" "', argument " "6"" of type '" "CvANN_MLP_TrainParams""'");
-    } else {
-      arg6 = *((CvANN_MLP_TrainParams *)(argp6));
-    }
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_set_response_idx" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
+  arg1 = (CvMLData *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMLData_set_response_idx" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
   {
     try {
-      result = (int)(arg1)->train((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5,arg6); 
+      (arg1)->set_response_idx(arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_int((int)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_train__SWIG_2 (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *arg5 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvMLData_get_response_idx (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_train",args.length(),5,5,0)) {
+  if (!SWIG_check_num_args("CvMLData_get_response_idx",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_train" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
-  }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_train" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_train" "', argument " "3"" of type '" "CvMat const *""'"); 
-  }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvANN_MLP_train" "', argument " "4"" of type '" "CvMat const *""'"); 
-  }
-  arg4 = (CvMat *)(argp4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvANN_MLP_train" "', argument " "5"" of type '" "CvMat const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_response_idx" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg5 = (CvMat *)(argp5);
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      result = (int)(arg1)->train((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+      result = (int)(arg1)->get_response_idx(); 
     } 
     catch (...) 
     {
@@ -35248,318 +42350,212 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_train__SWIG_3 (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *arg4 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvMLData_get_train_sample_idx (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  int result;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_train",args.length(),4,4,0)) {
+  if (!SWIG_check_num_args("CvMLData_get_train_sample_idx",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_train" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_train_sample_idx" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_train" "', argument " "2"" of type '" "CvMat const *""'"); 
+  arg1 = (CvMLData *)(argp1);
+  {
+    try {
+      result = (CvMat *)(arg1)->get_train_sample_idx(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_train" "', argument " "3"" of type '" "CvMat const *""'"); 
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvMLData_get_test_sample_idx (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  CvMat *result = 0 ;
+  
+  if (!SWIG_check_num_args("CvMLData_get_test_sample_idx",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  arg3 = (CvMat *)(argp3);
-  res4 = SWIG_ConvertPtr(args(3), &argp4,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvANN_MLP_train" "', argument " "4"" of type '" "CvMat const *""'"); 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_test_sample_idx" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg4 = (CvMat *)(argp4);
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      result = (int)(arg1)->train((CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4); 
+      result = (CvMat *)(arg1)->get_test_sample_idx(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_int((int)(result));
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_train (const octave_value_list& args, int nargout) {
-  int argc = args.length();
-  octave_value_ref argv[7]={
-    octave_value_ref(args,0),octave_value_ref(args,1),octave_value_ref(args,2),octave_value_ref(args,3),octave_value_ref(args,4),octave_value_ref(args,5),octave_value_ref(args,6)
-  };
+static octave_value_list _wrap_CvMLData_mix_train_and_test_idx (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
   
-  if (argc == 4) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            return _wrap_CvANN_MLP_train__SWIG_3(args, nargout);
-          }
-        }
-      }
-    }
-  }
-  if (argc == 5) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              return _wrap_CvANN_MLP_train__SWIG_2(args, nargout);
-            }
-          }
-        }
-      }
-    }
+  if (!SWIG_check_num_args("CvMLData_mix_train_and_test_idx",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  if (argc == 6) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvANN_MLP_TrainParams, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                return _wrap_CvANN_MLP_train__SWIG_1(args, nargout);
-              }
-            }
-          }
-        }
-      }
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_mix_train_and_test_idx" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  if (argc == 7) {
-    int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvANN_MLP, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
-      _v = SWIG_CheckState(res);
-      if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_CvMat, 0);
-        _v = SWIG_CheckState(res);
-        if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
-          _v = SWIG_CheckState(res);
-          if (_v) {
-            void *vptr = 0;
-            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
-            _v = SWIG_CheckState(res);
-            if (_v) {
-              void *vptr = 0;
-              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvANN_MLP_TrainParams, 0);
-              _v = SWIG_CheckState(res);
-              if (_v) {
-                {
-                  int res = SWIG_AsVal_int(argv[6], NULL);
-                  _v = SWIG_CheckState(res);
-                }
-                if (_v) {
-                  return _wrap_CvANN_MLP_train__SWIG_0(args, nargout);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
+  arg1 = (CvMLData *)(argp1);
+  {
+    try {
+      (arg1)->mix_train_and_test_idx(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  
-  error("No matching function for overload");
-  return octave_value_list();
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_predict (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvMLData_set_train_test_split (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  CvTrainTestSplit *arg2 = (CvTrainTestSplit *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  float result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_predict",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvMLData_set_train_test_split",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_predict" "', argument " "1"" of type '" "CvANN_MLP const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_set_train_test_split" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
+  arg1 = (CvMLData *)(argp1);
+  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_predict" "', argument " "2"" of type '" "CvMat const *""'"); 
-  }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_predict" "', argument " "3"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvMLData_set_train_test_split" "', argument " "2"" of type '" "CvTrainTestSplit const *""'"); 
   }
-  arg3 = (CvMat *)(argp3);
+  arg2 = (CvTrainTestSplit *)(argp2);
   {
     try {
-      result = (float)((CvANN_MLP const *)arg1)->predict((CvMat const *)arg2,arg3); 
+      (arg1)->set_train_test_split((CvTrainTestSplit const *)arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_From_float((float)(result));
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_clear (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
+static octave_value_list _wrap_CvMLData_get_var_idx (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_clear",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMLData_get_var_idx",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_clear" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_var_idx" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg1 = (CvANN_MLP *)(argp1);
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      (arg1)->clear(); 
+      result = (CvMat *)(arg1)->get_var_idx(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_read (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  CvFileNode *arg3 = (CvFileNode *) 0 ;
+static octave_value_list _wrap_CvMLData_chahge_var_idx (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  int arg2 ;
+  bool arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("CvANN_MLP_read",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvMLData_chahge_var_idx",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_read" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
-  }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_read" "', argument " "2"" of type '" "CvFileStorage *""'"); 
-  }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvFileNode, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_read" "', argument " "3"" of type '" "CvFileNode *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_chahge_var_idx" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg3 = (CvFileNode *)(argp3);
+  arg1 = (CvMLData *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMLData_chahge_var_idx" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  ecode3 = SWIG_AsVal_bool(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMLData_chahge_var_idx" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = (bool)(val3);
   {
     try {
-      (arg1)->read(arg2,arg3); 
+      (arg1)->chahge_var_idx(arg2,arg3); 
     } 
     catch (...) 
     {
@@ -35573,76 +42569,67 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_write (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvFileStorage *arg2 = (CvFileStorage *) 0 ;
-  char *arg3 = (char *) 0 ;
+static octave_value_list _wrap_CvMLData_get_var_types (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int res3 ;
-  char *buf3 = 0 ;
-  int alloc3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_write",args.length(),3,3,0)) {
+  if (!SWIG_check_num_args("CvMLData_get_var_types",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_write" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
-  }
-  arg1 = (CvANN_MLP *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvFileStorage, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvANN_MLP_write" "', argument " "2"" of type '" "CvFileStorage *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_var_types" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg2 = (CvFileStorage *)(argp2);
-  res3 = SWIG_AsCharPtrAndSize(args(2), &buf3, NULL, &alloc3);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvANN_MLP_write" "', argument " "3"" of type '" "char const *""'");
-  }
-  arg3 = (char *)(buf3);
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      (arg1)->write(arg2,(char const *)arg3); 
+      result = (CvMat *)(arg1)->get_var_types(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
-  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_get_layer_count (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
+static octave_value_list _wrap_CvMLData_get_var_type (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   int result;
   
-  if (!SWIG_check_num_args("CvANN_MLP_get_layer_count",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMLData_get_var_type",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_get_layer_count" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_var_type" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg1 = (CvANN_MLP *)(argp1);
+  arg1 = (CvMLData *)(argp1);
+  ecode2 = SWIG_AsVal_int(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMLData_get_var_type" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
   {
     try {
-      result = (int)(arg1)->get_layer_count(); 
+      result = (int)(arg1)->get_var_type(arg2); 
     } 
     catch (...) 
     {
@@ -35656,218 +42643,196 @@ fail:
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_get_layer_sizes (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
+static octave_value_list _wrap_CvMLData_set_var_types (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  CvMat *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_get_layer_sizes",args.length(),1,1,0)) {
+  if (!SWIG_check_num_args("CvMLData_set_var_types",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_get_layer_sizes" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_set_var_types" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg1 = (CvANN_MLP *)(argp1);
+  arg1 = (CvMLData *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(args(1), &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvMLData_set_var_types" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = (char *)(buf2);
   {
     try {
-      result = (CvMat *)(arg1)->get_layer_sizes(); 
+      (arg1)->set_var_types((char const *)arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvMat, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_CvANN_MLP_get_weights (const octave_value_list& args, int nargout) {
-  CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
+static octave_value_list _wrap_CvMLData_change_var_type (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
   int arg2 ;
+  int arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
-  double *result = 0 ;
   
-  if (!SWIG_check_num_args("CvANN_MLP_get_weights",args.length(),2,2,0)) {
+  if (!SWIG_check_num_args("CvMLData_change_var_type",args.length(),3,3,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvANN_MLP_get_weights" "', argument " "1"" of type '" "CvANN_MLP *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_change_var_type" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg1 = (CvANN_MLP *)(argp1);
+  arg1 = (CvMLData *)(argp1);
   ecode2 = SWIG_AsVal_int(args(1), &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvANN_MLP_get_weights" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMLData_change_var_type" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
+  ecode3 = SWIG_AsVal_int(args(2), &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvMLData_change_var_type" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = (int)(val3);
   {
     try {
-      result = (double *)(arg1)->get_weights(arg2); 
+      (arg1)->change_var_type(arg2,arg3); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_double, 0 |  0 );
+  _outv = octave_value();
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static swig_octave_member swig_CvANN_MLP_members[] = {
-{"create",_wrap_CvANN_MLP_create,0,0,0,0},
-{"train",_wrap_CvANN_MLP_train,0,0,0,0},
-{"predict",_wrap_CvANN_MLP_predict,0,0,0,0},
-{"clear",_wrap_CvANN_MLP_clear,0,0,0,0},
-{"read",_wrap_CvANN_MLP_read,0,0,0,0},
-{"write",_wrap_CvANN_MLP_write,0,0,0,0},
-{"get_layer_count",_wrap_CvANN_MLP_get_layer_count,0,0,0,0},
-{"get_layer_sizes",_wrap_CvANN_MLP_get_layer_sizes,0,0,0,0},
-{"get_weights",_wrap_CvANN_MLP_get_weights,0,0,0,0},
-{0,0,0,0}
-};
-static const char *swig_CvANN_MLP_base_names[] = {"_p_CvStatModel",0};
-static const swig_type_info *swig_CvANN_MLP_base[] = {0,0};
-static swig_octave_class _wrap_class_CvANN_MLP = {"CvANN_MLP", &SWIGTYPE_p_CvANN_MLP,0,_wrap_new_CvANN_MLP,0,_wrap_delete_CvANN_MLP,swig_CvANN_MLP_members,swig_CvANN_MLP_base_names,swig_CvANN_MLP_base };
-
-static octave_value_list _wrap_cvRandMVNormal (const octave_value_list& args, int nargout) {
-  CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *arg3 = (CvMat *) 0 ;
-  CvRNG *arg4 = (CvRNG *) 0 ;
+static octave_value_list _wrap_CvMLData_set_delimiter (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  char arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  void *vptr4 ;
-  CvRNG_Wrapper *wrapper4 ;
+  char val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvRandMVNormal",args.length(),4,3,0)) {
+  if (!SWIG_check_num_args("CvMLData_set_delimiter",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRandMVNormal" "', argument " "1"" of type '" "CvMat *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_set_delimiter" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg1 = (CvMat *)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvRandMVNormal" "', argument " "2"" of type '" "CvMat *""'"); 
+  arg1 = (CvMLData *)(argp1);
+  ecode2 = SWIG_AsVal_char(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMLData_set_delimiter" "', argument " "2"" of type '" "char""'");
+  } 
+  arg2 = (char)(val2);
+  {
+    try {
+      (arg1)->set_delimiter(arg2); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
   }
-  arg2 = (CvMat *)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvRandMVNormal" "', argument " "3"" of type '" "CvMat *""'"); 
+  _outv = octave_value();
+  if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
+fail:
+  return _out;
+}
+
+
+static octave_value_list _wrap_CvMLData_get_delimiter (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  octave_value_list _out;
+  octave_value_list *_outp=&_out;
+  octave_value _outv;
+  char result;
+  
+  if (!SWIG_check_num_args("CvMLData_get_delimiter",args.length(),1,1,0)) {
+    SWIG_fail;
   }
-  arg3 = (CvMat *)(argp3);
-  if (3<args.length()) {
-    {
-      if(SWIG_ConvertPtr(args(3), &vptr4, SWIGTYPE_p_CvRNG_Wrapper, 0)==-1){
-        SWIG_exception( SWIG_TypeError, "could not convert Octave object to C value");
-        SWIG_fail;
-      }
-      wrapper4 = (CvRNG_Wrapper *) vptr4;
-      arg4 = wrapper4->ptr();
-    }
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_delimiter" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      cvRandMVNormal(arg1,arg2,arg3,arg4); 
+      result = (char)(arg1)->get_delimiter(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_From_char((char)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
-static octave_value_list _wrap_cvRandGaussMixture (const octave_value_list& args, int nargout) {
-  CvMat **arg1 ;
-  CvMat **arg2 ;
-  float *arg3 ;
-  int arg4 ;
-  CvMat *arg5 = (CvMat *) 0 ;
-  CvMat *arg6 = (CvMat *) 0 ;
+static octave_value_list _wrap_CvMLData_set_miss_ch (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  char arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
+  char val2 ;
+  int ecode2 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
   
-  if (!SWIG_check_num_args("cvRandGaussMixture",args.length(),6,5,0)) {
+  if (!SWIG_check_num_args("CvMLData_set_miss_ch",args.length(),2,2,0)) {
     SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_p_CvMat, 0 |  0 );
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRandGaussMixture" "', argument " "1"" of type '" "CvMat *[]""'"); 
-  } 
-  arg1 = (CvMat **)(argp1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvRandGaussMixture" "', argument " "2"" of type '" "CvMat *[]""'"); 
-  } 
-  arg2 = (CvMat **)(argp2);
-  res3 = SWIG_ConvertPtr(args(2), &argp3,SWIGTYPE_p_float, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvRandGaussMixture" "', argument " "3"" of type '" "float []""'"); 
-  } 
-  arg3 = (float *)(argp3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvRandGaussMixture" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvRandGaussMixture" "', argument " "5"" of type '" "CvMat *""'"); 
-  }
-  arg5 = (CvMat *)(argp5);
-  if (5<args.length()) {
-    res6 = SWIG_ConvertPtr(args(5), &argp6,SWIGTYPE_p_CvMat, 0 |  0 );
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvRandGaussMixture" "', argument " "6"" of type '" "CvMat *""'"); 
-    }
-    arg6 = (CvMat *)(argp6);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_set_miss_ch" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
+  arg1 = (CvMLData *)(argp1);
+  ecode2 = SWIG_AsVal_char(args(1), &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvMLData_set_miss_ch" "', argument " "2"" of type '" "char""'");
+  } 
+  arg2 = (char)(val2);
   {
     try {
-      cvRandGaussMixture(arg1,arg2,arg3,arg4,arg5,arg6); 
+      (arg1)->set_miss_ch(arg2); 
     } 
     catch (...) 
     {
@@ -35881,92 +42846,79 @@ fail:
 }
 
 
-static octave_value_list _wrap_cvCreateTestSet (const octave_value_list& args, int nargout) {
-  int arg1 ;
-  CvMat **arg2 = (CvMat **) 0 ;
-  int arg3 ;
-  int arg4 ;
-  CvMat **arg5 = (CvMat **) 0 ;
-  int arg6 ;
-  void *arg7 = 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
+static octave_value_list _wrap_CvMLData_get_miss_ch (const octave_value_list& args, int nargout) {
+  CvMLData *arg1 = (CvMLData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   octave_value_list _out;
   octave_value_list *_outp=&_out;
   octave_value _outv;
+  char result;
   
-  if (!SWIG_check_num_args("cvCreateTestSet",args.length(),6,6,1)) {
+  if (!SWIG_check_num_args("CvMLData_get_miss_ch",args.length(),1,1,0)) {
     SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_int(args(0), &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCreateTestSet" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  res2 = SWIG_ConvertPtr(args(1), &argp2,SWIGTYPE_p_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCreateTestSet" "', argument " "2"" of type '" "CvMat **""'"); 
-  }
-  arg2 = (CvMat **)(argp2);
-  ecode3 = SWIG_AsVal_int(args(2), &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "cvCreateTestSet" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_int(args(3), &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvCreateTestSet" "', argument " "4"" of type '" "int""'");
-  } 
-  arg4 = (int)(val4);
-  res5 = SWIG_ConvertPtr(args(4), &argp5,SWIGTYPE_p_p_CvMat, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "cvCreateTestSet" "', argument " "5"" of type '" "CvMat **""'"); 
+  res1 = SWIG_ConvertPtr(args(0), &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvMLData_get_miss_ch" "', argument " "1"" of type '" "CvMLData *""'"); 
   }
-  arg5 = (CvMat **)(argp5);
-  ecode6 = SWIG_AsVal_int(args(5), &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvCreateTestSet" "', argument " "6"" of type '" "int""'");
-  } 
-  arg6 = (int)(val6);
+  arg1 = (CvMLData *)(argp1);
   {
     try {
-      cvCreateTestSet(arg1,arg2,arg3,arg4,arg5,arg6,arg7); 
+      result = (char)(arg1)->get_miss_ch(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  _outv = octave_value();
+  _outv = SWIG_From_char((char)(result));
   if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
 fail:
   return _out;
 }
 
 
+static swig_octave_member swig_CvMLData_members[] = {
+{"read_csv",_wrap_CvMLData_read_csv,0,0,0,0},
+{"get_values",_wrap_CvMLData_get_values,0,0,0,0},
+{"get_response",_wrap_CvMLData_get_response,0,0,0,0},
+{"get_missing",_wrap_CvMLData_get_missing,0,0,0,0},
+{"set_response_idx",_wrap_CvMLData_set_response_idx,0,0,0,0},
+{"get_response_idx",_wrap_CvMLData_get_response_idx,0,0,0,0},
+{"get_train_sample_idx",_wrap_CvMLData_get_train_sample_idx,0,0,0,0},
+{"get_test_sample_idx",_wrap_CvMLData_get_test_sample_idx,0,0,0,0},
+{"mix_train_and_test_idx",_wrap_CvMLData_mix_train_and_test_idx,0,0,0,0},
+{"set_train_test_split",_wrap_CvMLData_set_train_test_split,0,0,0,0},
+{"get_var_idx",_wrap_CvMLData_get_var_idx,0,0,0,0},
+{"chahge_var_idx",_wrap_CvMLData_chahge_var_idx,0,0,0,0},
+{"get_var_types",_wrap_CvMLData_get_var_types,0,0,0,0},
+{"get_var_type",_wrap_CvMLData_get_var_type,0,0,0,0},
+{"set_var_types",_wrap_CvMLData_set_var_types,0,0,0,0},
+{"change_var_type",_wrap_CvMLData_change_var_type,0,0,0,0},
+{"set_delimiter",_wrap_CvMLData_set_delimiter,0,0,0,0},
+{"get_delimiter",_wrap_CvMLData_get_delimiter,0,0,0,0},
+{"set_miss_ch",_wrap_CvMLData_set_miss_ch,0,0,0,0},
+{"get_miss_ch",_wrap_CvMLData_get_miss_ch,0,0,0,0},
+{0,0,0,0}
+};
+static const char *swig_CvMLData_base_names[] = {0};
+static const swig_type_info *swig_CvMLData_base[] = {0};
+static swig_octave_class _wrap_class_CvMLData = {"CvMLData", &SWIGTYPE_p_CvMLData,0,_wrap_new_CvMLData,0,_wrap_delete_CvMLData,swig_CvMLData_members,swig_CvMLData_base_names,swig_CvMLData_base };
+
 
 static const struct swig_octave_member swig_globals[] = {
 {"new_CvRNG_Wrapper",_wrap_new_CvRNG_Wrapper,0,0,2,0},
 {"CvRNG_Wrapper_ptr",_wrap_CvRNG_Wrapper_ptr,0,0,2,0},
 {"CvRNG_Wrapper_ref",_wrap_CvRNG_Wrapper_ref,0,0,2,0},
-{"CvRNG_Wrapper___eq",_wrap_CvRNG_Wrapper___eq,0,0,2,0},
-{"CvRNG_Wrapper___ne",_wrap_CvRNG_Wrapper___ne,0,0,2,0},
+{"CvRNG_Wrapper___eq__",_wrap_CvRNG_Wrapper___eq__,0,0,2,0},
+{"CvRNG_Wrapper___ne__",_wrap_CvRNG_Wrapper___ne__,0,0,2,0},
 {"delete_CvRNG_Wrapper",_wrap_delete_CvRNG_Wrapper,0,0,2,0},
 {"new_CvSubdiv2DEdge_Wrapper",_wrap_new_CvSubdiv2DEdge_Wrapper,0,0,2,0},
 {"CvSubdiv2DEdge_Wrapper_ptr",_wrap_CvSubdiv2DEdge_Wrapper_ptr,0,0,2,0},
 {"CvSubdiv2DEdge_Wrapper_ref",_wrap_CvSubdiv2DEdge_Wrapper_ref,0,0,2,0},
-{"CvSubdiv2DEdge_Wrapper___eq",_wrap_CvSubdiv2DEdge_Wrapper___eq,0,0,2,0},
-{"CvSubdiv2DEdge_Wrapper___ne",_wrap_CvSubdiv2DEdge_Wrapper___ne,0,0,2,0},
+{"CvSubdiv2DEdge_Wrapper___eq__",_wrap_CvSubdiv2DEdge_Wrapper___eq__,0,0,2,0},
+{"CvSubdiv2DEdge_Wrapper___ne__",_wrap_CvSubdiv2DEdge_Wrapper___ne__,0,0,2,0},
 {"delete_CvSubdiv2DEdge_Wrapper",_wrap_delete_CvSubdiv2DEdge_Wrapper,0,0,2,0},
 {"CvVectors_type_set",_wrap_CvVectors_type_set,0,0,2,0},
 {"CvVectors_type_get",_wrap_CvVectors_type_get,0,0,2,0},
@@ -36192,14 +43144,16 @@ static const struct swig_octave_member swig_globals[] = {
 {"CvEM_get_probs",_wrap_CvEM_get_probs,0,0,2,0},
 {"CvEM_get_log_likelihood",_wrap_CvEM_get_log_likelihood,0,0,2,0},
 {"CvEM_get_covs",_wrap_CvEM_get_covs,0,0,2,0},
-{"CvPair32s32f_i_set",_wrap_CvPair32s32f_i_set,0,0,2,0},
-{"CvPair32s32f_i_get",_wrap_CvPair32s32f_i_get,0,0,2,0},
-{"CvPair32s32f_val_set",_wrap_CvPair32s32f_val_set,0,0,2,0},
-{"CvPair32s32f_val_get",_wrap_CvPair32s32f_val_get,0,0,2,0},
-{"new_CvPair32s32f",_wrap_new_CvPair32s32f,0,0,2,0},
-{"delete_CvPair32s32f",_wrap_delete_CvPair32s32f,0,0,2,0},
+{"CvPair16u32s_u_set",_wrap_CvPair16u32s_u_set,0,0,2,0},
+{"CvPair16u32s_u_get",_wrap_CvPair16u32s_u_get,0,0,2,0},
+{"CvPair16u32s_i_set",_wrap_CvPair16u32s_i_set,0,0,2,0},
+{"CvPair16u32s_i_get",_wrap_CvPair16u32s_i_get,0,0,2,0},
+{"new_CvPair16u32s",_wrap_new_CvPair16u32s,0,0,2,0},
+{"delete_CvPair16u32s",_wrap_delete_CvPair16u32s,0,0,2,0},
 {"CvDTreeSplit_var_idx_set",_wrap_CvDTreeSplit_var_idx_set,0,0,2,0},
 {"CvDTreeSplit_var_idx_get",_wrap_CvDTreeSplit_var_idx_get,0,0,2,0},
+{"CvDTreeSplit_condensed_idx_set",_wrap_CvDTreeSplit_condensed_idx_set,0,0,2,0},
+{"CvDTreeSplit_condensed_idx_get",_wrap_CvDTreeSplit_condensed_idx_get,0,0,2,0},
 {"CvDTreeSplit_inversed_set",_wrap_CvDTreeSplit_inversed_set,0,0,2,0},
 {"CvDTreeSplit_inversed_get",_wrap_CvDTreeSplit_inversed_get,0,0,2,0},
 {"CvDTreeSplit_quality_set",_wrap_CvDTreeSplit_quality_set,0,0,2,0},
@@ -36277,6 +43231,7 @@ static const struct swig_octave_member swig_globals[] = {
 {"new_CvDTreeTrainData",_wrap_new_CvDTreeTrainData,0,0,2,0},
 {"delete_CvDTreeTrainData",_wrap_delete_CvDTreeTrainData,0,0,2,0},
 {"CvDTreeTrainData_set_data",_wrap_CvDTreeTrainData_set_data,0,0,2,0},
+{"CvDTreeTrainData_do_responses_copy",_wrap_CvDTreeTrainData_do_responses_copy,0,0,2,0},
 {"CvDTreeTrainData_get_vectors",_wrap_CvDTreeTrainData_get_vectors,0,0,2,0},
 {"CvDTreeTrainData_subsample_data",_wrap_CvDTreeTrainData_subsample_data,0,0,2,0},
 {"CvDTreeTrainData_write_params",_wrap_CvDTreeTrainData_write_params,0,0,2,0},
@@ -36285,9 +43240,10 @@ static const struct swig_octave_member swig_globals[] = {
 {"CvDTreeTrainData_get_num_classes",_wrap_CvDTreeTrainData_get_num_classes,0,0,2,0},
 {"CvDTreeTrainData_get_var_type",_wrap_CvDTreeTrainData_get_var_type,0,0,2,0},
 {"CvDTreeTrainData_get_work_var_count",_wrap_CvDTreeTrainData_get_work_var_count,0,0,2,0},
-{"CvDTreeTrainData_get_class_labels",_wrap_CvDTreeTrainData_get_class_labels,0,0,2,0},
 {"CvDTreeTrainData_get_ord_responses",_wrap_CvDTreeTrainData_get_ord_responses,0,0,2,0},
-{"CvDTreeTrainData_get_labels",_wrap_CvDTreeTrainData_get_labels,0,0,2,0},
+{"CvDTreeTrainData_get_class_labels",_wrap_CvDTreeTrainData_get_class_labels,0,0,2,0},
+{"CvDTreeTrainData_get_cv_labels",_wrap_CvDTreeTrainData_get_cv_labels,0,0,2,0},
+{"CvDTreeTrainData_get_sample_indices",_wrap_CvDTreeTrainData_get_sample_indices,0,0,2,0},
 {"CvDTreeTrainData_get_cat_var_data",_wrap_CvDTreeTrainData_get_cat_var_data,0,0,2,0},
 {"CvDTreeTrainData_get_ord_var_data",_wrap_CvDTreeTrainData_get_ord_var_data,0,0,2,0},
 {"CvDTreeTrainData_get_child_buf_idx",_wrap_CvDTreeTrainData_get_child_buf_idx,0,0,2,0},
@@ -36298,6 +43254,18 @@ static const struct swig_octave_member swig_globals[] = {
 {"CvDTreeTrainData_free_node_data",_wrap_CvDTreeTrainData_free_node_data,0,0,2,0},
 {"CvDTreeTrainData_free_train_data",_wrap_CvDTreeTrainData_free_train_data,0,0,2,0},
 {"CvDTreeTrainData_free_node",_wrap_CvDTreeTrainData_free_node,0,0,2,0},
+{"CvDTreeTrainData_pred_float_buf_set",_wrap_CvDTreeTrainData_pred_float_buf_set,0,0,2,0},
+{"CvDTreeTrainData_pred_float_buf_get",_wrap_CvDTreeTrainData_pred_float_buf_get,0,0,2,0},
+{"CvDTreeTrainData_pred_int_buf_set",_wrap_CvDTreeTrainData_pred_int_buf_set,0,0,2,0},
+{"CvDTreeTrainData_pred_int_buf_get",_wrap_CvDTreeTrainData_pred_int_buf_get,0,0,2,0},
+{"CvDTreeTrainData_resp_float_buf_set",_wrap_CvDTreeTrainData_resp_float_buf_set,0,0,2,0},
+{"CvDTreeTrainData_resp_float_buf_get",_wrap_CvDTreeTrainData_resp_float_buf_get,0,0,2,0},
+{"CvDTreeTrainData_resp_int_buf_set",_wrap_CvDTreeTrainData_resp_int_buf_set,0,0,2,0},
+{"CvDTreeTrainData_resp_int_buf_get",_wrap_CvDTreeTrainData_resp_int_buf_get,0,0,2,0},
+{"CvDTreeTrainData_cv_lables_buf_set",_wrap_CvDTreeTrainData_cv_lables_buf_set,0,0,2,0},
+{"CvDTreeTrainData_cv_lables_buf_get",_wrap_CvDTreeTrainData_cv_lables_buf_get,0,0,2,0},
+{"CvDTreeTrainData_sample_idx_buf_set",_wrap_CvDTreeTrainData_sample_idx_buf_set,0,0,2,0},
+{"CvDTreeTrainData_sample_idx_buf_get",_wrap_CvDTreeTrainData_sample_idx_buf_get,0,0,2,0},
 {"CvDTreeTrainData_sample_count_set",_wrap_CvDTreeTrainData_sample_count_set,0,0,2,0},
 {"CvDTreeTrainData_sample_count_get",_wrap_CvDTreeTrainData_sample_count_get,0,0,2,0},
 {"CvDTreeTrainData_var_all_set",_wrap_CvDTreeTrainData_var_all_set,0,0,2,0},
@@ -36310,18 +43278,30 @@ static const struct swig_octave_member swig_globals[] = {
 {"CvDTreeTrainData_ord_var_count_get",_wrap_CvDTreeTrainData_ord_var_count_get,0,0,2,0},
 {"CvDTreeTrainData_cat_var_count_set",_wrap_CvDTreeTrainData_cat_var_count_set,0,0,2,0},
 {"CvDTreeTrainData_cat_var_count_get",_wrap_CvDTreeTrainData_cat_var_count_get,0,0,2,0},
+{"CvDTreeTrainData_work_var_count_set",_wrap_CvDTreeTrainData_work_var_count_set,0,0,2,0},
+{"CvDTreeTrainData_work_var_count_get",_wrap_CvDTreeTrainData_work_var_count_get,0,0,2,0},
 {"CvDTreeTrainData_have_labels_set",_wrap_CvDTreeTrainData_have_labels_set,0,0,2,0},
 {"CvDTreeTrainData_have_labels_get",_wrap_CvDTreeTrainData_have_labels_get,0,0,2,0},
 {"CvDTreeTrainData_have_priors_set",_wrap_CvDTreeTrainData_have_priors_set,0,0,2,0},
 {"CvDTreeTrainData_have_priors_get",_wrap_CvDTreeTrainData_have_priors_get,0,0,2,0},
 {"CvDTreeTrainData_is_classifier_set",_wrap_CvDTreeTrainData_is_classifier_set,0,0,2,0},
 {"CvDTreeTrainData_is_classifier_get",_wrap_CvDTreeTrainData_is_classifier_get,0,0,2,0},
+{"CvDTreeTrainData_tflag_set",_wrap_CvDTreeTrainData_tflag_set,0,0,2,0},
+{"CvDTreeTrainData_tflag_get",_wrap_CvDTreeTrainData_tflag_get,0,0,2,0},
+{"CvDTreeTrainData_train_data_set",_wrap_CvDTreeTrainData_train_data_set,0,0,2,0},
+{"CvDTreeTrainData_train_data_get",_wrap_CvDTreeTrainData_train_data_get,0,0,2,0},
+{"CvDTreeTrainData_responses_set",_wrap_CvDTreeTrainData_responses_set,0,0,2,0},
+{"CvDTreeTrainData_responses_get",_wrap_CvDTreeTrainData_responses_get,0,0,2,0},
+{"CvDTreeTrainData_responses_copy_set",_wrap_CvDTreeTrainData_responses_copy_set,0,0,2,0},
+{"CvDTreeTrainData_responses_copy_get",_wrap_CvDTreeTrainData_responses_copy_get,0,0,2,0},
 {"CvDTreeTrainData_buf_count_set",_wrap_CvDTreeTrainData_buf_count_set,0,0,2,0},
 {"CvDTreeTrainData_buf_count_get",_wrap_CvDTreeTrainData_buf_count_get,0,0,2,0},
 {"CvDTreeTrainData_buf_size_set",_wrap_CvDTreeTrainData_buf_size_set,0,0,2,0},
 {"CvDTreeTrainData_buf_size_get",_wrap_CvDTreeTrainData_buf_size_get,0,0,2,0},
 {"CvDTreeTrainData_shared_set",_wrap_CvDTreeTrainData_shared_set,0,0,2,0},
 {"CvDTreeTrainData_shared_get",_wrap_CvDTreeTrainData_shared_get,0,0,2,0},
+{"CvDTreeTrainData_is_buf_16u_set",_wrap_CvDTreeTrainData_is_buf_16u_set,0,0,2,0},
+{"CvDTreeTrainData_is_buf_16u_get",_wrap_CvDTreeTrainData_is_buf_16u_get,0,0,2,0},
 {"CvDTreeTrainData_cat_count_set",_wrap_CvDTreeTrainData_cat_count_set,0,0,2,0},
 {"CvDTreeTrainData_cat_count_get",_wrap_CvDTreeTrainData_cat_count_get,0,0,2,0},
 {"CvDTreeTrainData_cat_ofs_set",_wrap_CvDTreeTrainData_cat_ofs_set,0,0,2,0},
@@ -36364,6 +43344,7 @@ static const struct swig_octave_member swig_globals[] = {
 {"CvDTreeTrainData_rng_get",_wrap_CvDTreeTrainData_rng_get,0,0,2,0},
 {"new_CvDTree",_wrap_new_CvDTree,0,0,2,0},
 {"delete_CvDTree",_wrap_delete_CvDTree,0,0,2,0},
+{"CvDTree_calc_error",_wrap_CvDTree_calc_error,0,0,2,0},
 {"CvDTree_train",_wrap_CvDTree_train,0,0,2,0},
 {"CvDTree_predict",_wrap_CvDTree_predict,0,0,2,0},
 {"CvDTree_get_var_importance",_wrap_CvDTree_get_var_importance,0,0,2,0},
@@ -36390,15 +43371,34 @@ static const struct swig_octave_member swig_globals[] = {
 {"delete_CvRTrees",_wrap_delete_CvRTrees,0,0,2,0},
 {"CvRTrees_train",_wrap_CvRTrees_train,0,0,2,0},
 {"CvRTrees_predict",_wrap_CvRTrees_predict,0,0,2,0},
+{"CvRTrees_predict_prob",_wrap_CvRTrees_predict_prob,0,0,2,0},
 {"CvRTrees_clear",_wrap_CvRTrees_clear,0,0,2,0},
 {"CvRTrees_get_var_importance",_wrap_CvRTrees_get_var_importance,0,0,2,0},
 {"CvRTrees_get_proximity",_wrap_CvRTrees_get_proximity,0,0,2,0},
+{"CvRTrees_calc_error",_wrap_CvRTrees_calc_error,0,0,2,0},
+{"CvRTrees_get_train_error",_wrap_CvRTrees_get_train_error,0,0,2,0},
 {"CvRTrees_read",_wrap_CvRTrees_read,0,0,2,0},
 {"CvRTrees_write",_wrap_CvRTrees_write,0,0,2,0},
 {"CvRTrees_get_active_var_mask",_wrap_CvRTrees_get_active_var_mask,0,0,2,0},
 {"CvRTrees_get_rng",_wrap_CvRTrees_get_rng,0,0,2,0},
 {"CvRTrees_get_tree_count",_wrap_CvRTrees_get_tree_count,0,0,2,0},
 {"CvRTrees_get_tree",_wrap_CvRTrees_get_tree,0,0,2,0},
+{"CvERTreeTrainData_set_data",_wrap_CvERTreeTrainData_set_data,0,0,2,0},
+{"CvERTreeTrainData_get_ord_var_data",_wrap_CvERTreeTrainData_get_ord_var_data,0,0,2,0},
+{"CvERTreeTrainData_get_sample_indices",_wrap_CvERTreeTrainData_get_sample_indices,0,0,2,0},
+{"CvERTreeTrainData_get_cv_labels",_wrap_CvERTreeTrainData_get_cv_labels,0,0,2,0},
+{"CvERTreeTrainData_get_cat_var_data",_wrap_CvERTreeTrainData_get_cat_var_data,0,0,2,0},
+{"CvERTreeTrainData_get_vectors",_wrap_CvERTreeTrainData_get_vectors,0,0,2,0},
+{"CvERTreeTrainData_subsample_data",_wrap_CvERTreeTrainData_subsample_data,0,0,2,0},
+{"CvERTreeTrainData_missing_mask_set",_wrap_CvERTreeTrainData_missing_mask_set,0,0,2,0},
+{"CvERTreeTrainData_missing_mask_get",_wrap_CvERTreeTrainData_missing_mask_get,0,0,2,0},
+{"new_CvERTreeTrainData",_wrap_new_CvERTreeTrainData,0,0,2,0},
+{"delete_CvERTreeTrainData",_wrap_delete_CvERTreeTrainData,0,0,2,0},
+{"new_CvForestERTree",_wrap_new_CvForestERTree,0,0,2,0},
+{"delete_CvForestERTree",_wrap_delete_CvForestERTree,0,0,2,0},
+{"new_CvERTrees",_wrap_new_CvERTrees,0,0,2,0},
+{"delete_CvERTrees",_wrap_delete_CvERTrees,0,0,2,0},
+{"CvERTrees_train",_wrap_CvERTrees_train,0,0,2,0},
 {"CvBoostParams_boost_type_set",_wrap_CvBoostParams_boost_type_set,0,0,2,0},
 {"CvBoostParams_boost_type_get",_wrap_CvBoostParams_boost_type_get,0,0,2,0},
 {"CvBoostParams_weak_count_set",_wrap_CvBoostParams_weak_count_set,0,0,2,0},
@@ -36419,15 +43419,18 @@ static const struct swig_octave_member swig_globals[] = {
 {"new_CvBoost",_wrap_new_CvBoost,0,0,2,0},
 {"CvBoost_train",_wrap_CvBoost_train,0,0,2,0},
 {"CvBoost_predict",_wrap_CvBoost_predict,0,0,2,0},
+{"CvBoost_calc_error",_wrap_CvBoost_calc_error,0,0,2,0},
 {"CvBoost_prune",_wrap_CvBoost_prune,0,0,2,0},
 {"CvBoost_clear",_wrap_CvBoost_clear,0,0,2,0},
 {"CvBoost_write",_wrap_CvBoost_write,0,0,2,0},
 {"CvBoost_read",_wrap_CvBoost_read,0,0,2,0},
+{"CvBoost_get_active_vars",_wrap_CvBoost_get_active_vars,0,0,2,0},
 {"CvBoost_get_weak_predictors",_wrap_CvBoost_get_weak_predictors,0,0,2,0},
 {"CvBoost_get_weights",_wrap_CvBoost_get_weights,0,0,2,0},
 {"CvBoost_get_subtree_weights",_wrap_CvBoost_get_subtree_weights,0,0,2,0},
 {"CvBoost_get_weak_response",_wrap_CvBoost_get_weak_response,0,0,2,0},
 {"CvBoost_get_params",_wrap_CvBoost_get_params,0,0,2,0},
+{"CvBoost_get_data",_wrap_CvBoost_get_data,0,0,2,0},
 {"new_CvANN_MLP_TrainParams",_wrap_new_CvANN_MLP_TrainParams,0,0,2,0},
 {"delete_CvANN_MLP_TrainParams",_wrap_delete_CvANN_MLP_TrainParams,0,0,2,0},
 {"CvANN_MLP_TrainParams_term_crit_set",_wrap_CvANN_MLP_TrainParams_term_crit_set,0,0,2,0},
@@ -36462,17 +43465,79 @@ static const struct swig_octave_member swig_globals[] = {
 {"cvRandMVNormal",_wrap_cvRandMVNormal,0,0,2,0},
 {"cvRandGaussMixture",_wrap_cvRandGaussMixture,0,0,2,0},
 {"cvCreateTestSet",_wrap_cvCreateTestSet,0,0,2,0},
+{"new_CvTrainTestSplit",_wrap_new_CvTrainTestSplit,0,0,2,0},
+{"CvTrainTestSplit_train_sample_part_mode_set",_wrap_CvTrainTestSplit_train_sample_part_mode_set,0,0,2,0},
+{"CvTrainTestSplit_train_sample_part_mode_get",_wrap_CvTrainTestSplit_train_sample_part_mode_get,0,0,2,0},
+{"CvTrainTestSplit_class_part_mode_set",_wrap_CvTrainTestSplit_class_part_mode_set,0,0,2,0},
+{"CvTrainTestSplit_class_part_mode_get",_wrap_CvTrainTestSplit_class_part_mode_get,0,0,2,0},
+{"CvTrainTestSplit_mix_set",_wrap_CvTrainTestSplit_mix_set,0,0,2,0},
+{"CvTrainTestSplit_mix_get",_wrap_CvTrainTestSplit_mix_get,0,0,2,0},
+{"CvTrainTestSplit_class_part_get",_wrap_CvTrainTestSplit_class_part_get,0,0,2,0},
+{"CvTrainTestSplit_train_sample_part_get",_wrap_CvTrainTestSplit_train_sample_part_get,0,0,2,0},
+{"delete_CvTrainTestSplit",_wrap_delete_CvTrainTestSplit,0,0,2,0},
+{"CvTrainTestSplit_class_part_count_set",_wrap_CvTrainTestSplit_class_part_count_set,0,0,2,0},
+{"CvTrainTestSplit_class_part_count_get",_wrap_CvTrainTestSplit_class_part_count_get,0,0,2,0},
+{"CvTrainTestSplit_class_part_portion_set",_wrap_CvTrainTestSplit_class_part_portion_set,0,0,2,0},
+{"CvTrainTestSplit_class_part_portion_get",_wrap_CvTrainTestSplit_class_part_portion_get,0,0,2,0},
+{"new_CvTrainTestSplit_class_part",_wrap_new_CvTrainTestSplit_class_part,0,0,2,0},
+{"delete_CvTrainTestSplit_class_part",_wrap_delete_CvTrainTestSplit_class_part,0,0,2,0},
+{"CvTrainTestSplit_train_sample_part_count_set",_wrap_CvTrainTestSplit_train_sample_part_count_set,0,0,2,0},
+{"CvTrainTestSplit_train_sample_part_count_get",_wrap_CvTrainTestSplit_train_sample_part_count_get,0,0,2,0},
+{"CvTrainTestSplit_train_sample_part_portion_set",_wrap_CvTrainTestSplit_train_sample_part_portion_set,0,0,2,0},
+{"CvTrainTestSplit_train_sample_part_portion_get",_wrap_CvTrainTestSplit_train_sample_part_portion_get,0,0,2,0},
+{"new_CvTrainTestSplit_train_sample_part",_wrap_new_CvTrainTestSplit_train_sample_part,0,0,2,0},
+{"delete_CvTrainTestSplit_train_sample_part",_wrap_delete_CvTrainTestSplit_train_sample_part,0,0,2,0},
+{"new_CvMLData",_wrap_new_CvMLData,0,0,2,0},
+{"delete_CvMLData",_wrap_delete_CvMLData,0,0,2,0},
+{"CvMLData_read_csv",_wrap_CvMLData_read_csv,0,0,2,0},
+{"CvMLData_get_values",_wrap_CvMLData_get_values,0,0,2,0},
+{"CvMLData_get_response",_wrap_CvMLData_get_response,0,0,2,0},
+{"CvMLData_get_missing",_wrap_CvMLData_get_missing,0,0,2,0},
+{"CvMLData_set_response_idx",_wrap_CvMLData_set_response_idx,0,0,2,0},
+{"CvMLData_get_response_idx",_wrap_CvMLData_get_response_idx,0,0,2,0},
+{"CvMLData_get_train_sample_idx",_wrap_CvMLData_get_train_sample_idx,0,0,2,0},
+{"CvMLData_get_test_sample_idx",_wrap_CvMLData_get_test_sample_idx,0,0,2,0},
+{"CvMLData_mix_train_and_test_idx",_wrap_CvMLData_mix_train_and_test_idx,0,0,2,0},
+{"CvMLData_set_train_test_split",_wrap_CvMLData_set_train_test_split,0,0,2,0},
+{"CvMLData_get_var_idx",_wrap_CvMLData_get_var_idx,0,0,2,0},
+{"CvMLData_chahge_var_idx",_wrap_CvMLData_chahge_var_idx,0,0,2,0},
+{"CvMLData_get_var_types",_wrap_CvMLData_get_var_types,0,0,2,0},
+{"CvMLData_get_var_type",_wrap_CvMLData_get_var_type,0,0,2,0},
+{"CvMLData_set_var_types",_wrap_CvMLData_set_var_types,0,0,2,0},
+{"CvMLData_change_var_type",_wrap_CvMLData_change_var_type,0,0,2,0},
+{"CvMLData_set_delimiter",_wrap_CvMLData_set_delimiter,0,0,2,0},
+{"CvMLData_get_delimiter",_wrap_CvMLData_get_delimiter,0,0,2,0},
+{"CvMLData_set_miss_ch",_wrap_CvMLData_set_miss_ch,0,0,2,0},
+{"CvMLData_get_miss_ch",_wrap_CvMLData_get_miss_ch,0,0,2,0},
 {0,0,0,0,0}
 };
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
+static void *_p_CvERTreesTo_p_CvRTrees(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvRTrees *)  ((CvERTrees *) x));
+}
+static void *_p_CvERTreeTrainDataTo_p_CvDTreeTrainData(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvDTreeTrainData *)  ((CvERTreeTrainData *) x));
+}
+static void *_p_CvForestERTreeTo_p_CvForestTree(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvForestTree *)  ((CvForestERTree *) x));
+}
+static void *_p_CvRTParamsTo_p_CvDTreeParams(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvDTreeParams *)  ((CvRTParams *) x));
+}
+static void *_p_CvBoostParamsTo_p_CvDTreeParams(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvDTreeParams *)  ((CvBoostParams *) x));
+}
 static void *_p_CvNormalBayesClassifierTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvNormalBayesClassifier *) x));
 }
 static void *_p_CvSVMTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvSVM *) x));
 }
+static void *_p_CvForestERTreeTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvStatModel *) (CvDTree *)(CvForestTree *) ((CvForestERTree *) x));
+}
 static void *_p_CvANN_MLPTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvANN_MLP *) x));
 }
@@ -36488,6 +43553,9 @@ static void *_p_CvRTreesTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)
 static void *_p_CvBoostTreeTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *) (CvDTree *) ((CvBoostTree *) x));
 }
+static void *_p_CvERTreesTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvStatModel *) (CvRTrees *) ((CvERTrees *) x));
+}
 static void *_p_CvEMTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvEM *) x));
 }
@@ -36497,11 +43565,8 @@ static void *_p_CvDTreeTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory))
 static void *_p_CvBoostTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvBoost *) x));
 }
-static void *_p_CvRTParamsTo_p_CvDTreeParams(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((CvDTreeParams *)  ((CvRTParams *) x));
-}
-static void *_p_CvBoostParamsTo_p_CvDTreeParams(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((CvDTreeParams *)  ((CvBoostParams *) x));
+static void *_p_CvForestERTreeTo_p_CvDTree(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvDTree *) (CvForestTree *) ((CvForestERTree *) x));
 }
 static void *_p_CvForestTreeTo_p_CvDTree(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvDTree *)  ((CvForestTree *) x));
@@ -36539,10 +43604,13 @@ static swig_type_info _swigt__p_CvDTreeSplit = {"_p_CvDTreeSplit", "CvDTreeSplit
 static swig_type_info _swigt__p_CvDTreeTrainData = {"_p_CvDTreeTrainData", "CvDTreeTrainData *", 0, 0, (void*)&_wrap_class_CvDTreeTrainData, 0};
 static swig_type_info _swigt__p_CvEM = {"_p_CvEM", "CvEM *", 0, 0, (void*)&_wrap_class_CvEM, 0};
 static swig_type_info _swigt__p_CvEMParams = {"_p_CvEMParams", "CvEMParams *", 0, 0, (void*)&_wrap_class_CvEMParams, 0};
+static swig_type_info _swigt__p_CvERTreeTrainData = {"_p_CvERTreeTrainData", "CvERTreeTrainData *", 0, 0, (void*)&_wrap_class_CvERTreeTrainData, 0};
+static swig_type_info _swigt__p_CvERTrees = {"_p_CvERTrees", "CvERTrees *", 0, 0, (void*)&_wrap_class_CvERTrees, 0};
 static swig_type_info _swigt__p_CvFileNode = {"_p_CvFileNode", "CvFileNode *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvFileStorage = {"_p_CvFileStorage", "CvFileStorage *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvFilter = {"_p_CvFilter", "enum CvFilter *|CvFilter *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvFont = {"_p_CvFont", "CvFont *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvForestERTree = {"_p_CvForestERTree", "CvForestERTree *", 0, 0, (void*)&_wrap_class_CvForestERTree, 0};
 static swig_type_info _swigt__p_CvForestTree = {"_p_CvForestTree", "CvForestTree *", 0, 0, (void*)&_wrap_class_CvForestTree, 0};
 static swig_type_info _swigt__p_CvGenericHash = {"_p_CvGenericHash", "CvGenericHash *|CvFileNodeHash *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvGraph = {"_p_CvGraph", "CvGraph *", 0, 0, (void*)0, 0};
@@ -36560,6 +43628,8 @@ static swig_type_info _swigt__p_CvHuMoments = {"_p_CvHuMoments", "CvHuMoments *"
 static swig_type_info _swigt__p_CvKNearest = {"_p_CvKNearest", "CvKNearest *", 0, 0, (void*)&_wrap_class_CvKNearest, 0};
 static swig_type_info _swigt__p_CvKalman = {"_p_CvKalman", "CvKalman *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvLineIterator = {"_p_CvLineIterator", "CvLineIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvMLData = {"_p_CvMLData", "CvMLData *", 0, 0, (void*)&_wrap_class_CvMLData, 0};
+static swig_type_info _swigt__p_CvMSERParams = {"_p_CvMSERParams", "CvMSERParams *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvMat = {"_p_CvMat", "CvMat *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvMatND = {"_p_CvMatND", "CvMatND *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvMatrix3 = {"_p_CvMatrix3", "CvMatrix3 *", 0, 0, (void*)0, 0};
@@ -36572,7 +43642,7 @@ static swig_type_info _swigt__p_CvNArrayIterator = {"_p_CvNArrayIterator", "CvNA
 static swig_type_info _swigt__p_CvNextEdgeType = {"_p_CvNextEdgeType", "enum CvNextEdgeType *|CvNextEdgeType *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvNormalBayesClassifier = {"_p_CvNormalBayesClassifier", "CvNormalBayesClassifier *", 0, 0, (void*)&_wrap_class_CvNormalBayesClassifier, 0};
 static swig_type_info _swigt__p_CvPOSITObject = {"_p_CvPOSITObject", "CvPOSITObject *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvPair32s32f = {"_p_CvPair32s32f", "CvPair32s32f *", 0, 0, (void*)&_wrap_class_CvPair32s32f, 0};
+static swig_type_info _swigt__p_CvPair16u32s = {"_p_CvPair16u32s", "CvPair16u32s *", 0, 0, (void*)&_wrap_class_CvPair16u32s, 0};
 static swig_type_info _swigt__p_CvParamGrid = {"_p_CvParamGrid", "CvParamGrid *", 0, 0, (void*)&_wrap_class_CvParamGrid, 0};
 static swig_type_info _swigt__p_CvPluginFuncInfo = {"_p_CvPluginFuncInfo", "CvPluginFuncInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvPoint = {"_p_CvPoint", "CvPoint *", 0, 0, (void*)0, 0};
@@ -36619,6 +43689,9 @@ static swig_type_info _swigt__p_CvSubdiv2DEdge_Wrapper = {"_p_CvSubdiv2DEdge_Wra
 static swig_type_info _swigt__p_CvSubdiv2DPoint = {"_p_CvSubdiv2DPoint", "CvSubdiv2DPoint *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvSubdiv2DPointLocation = {"_p_CvSubdiv2DPointLocation", "enum CvSubdiv2DPointLocation *|CvSubdiv2DPointLocation *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvTermCriteria = {"_p_CvTermCriteria", "CvTermCriteria *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTrainTestSplit = {"_p_CvTrainTestSplit", "CvTrainTestSplit *", 0, 0, (void*)&_wrap_class_CvTrainTestSplit, 0};
+static swig_type_info _swigt__p_CvTrainTestSplit_class_part = {"_p_CvTrainTestSplit_class_part", "CvTrainTestSplit_class_part *", 0, 0, (void*)&_wrap_class_CvTrainTestSplit_class_part, 0};
+static swig_type_info _swigt__p_CvTrainTestSplit_train_sample_part = {"_p_CvTrainTestSplit_train_sample_part", "CvTrainTestSplit_train_sample_part *", 0, 0, (void*)&_wrap_class_CvTrainTestSplit_train_sample_part, 0};
 static swig_type_info _swigt__p_CvTreeNodeIterator = {"_p_CvTreeNodeIterator", "CvTreeNodeIterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvTypeInfo = {"_p_CvTypeInfo", "CvTypeInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvVectors = {"_p_CvVectors", "CvVectors *", 0, 0, (void*)&_wrap_class_CvVectors, 0};
@@ -36639,6 +43712,7 @@ static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64 *|long long
 static swig_type_info _swigt__p_p_CvMat = {"_p_p_CvMat", "CvMat **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_double = {"_p_p_double", "double **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_float = {"_p_p_float", "float **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_int = {"_p_p_int", "int **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_unsigned_char = {"_p_p_unsigned_char", "unsigned char **|uchar **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "schar *|signed char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_t = {"_p_size_t", "size_t *|CvSubdiv2DEdge *", 0, 0, (void*)0, 0};
@@ -36678,10 +43752,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvDTreeTrainData,
   &_swigt__p_CvEM,
   &_swigt__p_CvEMParams,
+  &_swigt__p_CvERTreeTrainData,
+  &_swigt__p_CvERTrees,
   &_swigt__p_CvFileNode,
   &_swigt__p_CvFileStorage,
   &_swigt__p_CvFilter,
   &_swigt__p_CvFont,
+  &_swigt__p_CvForestERTree,
   &_swigt__p_CvForestTree,
   &_swigt__p_CvGenericHash,
   &_swigt__p_CvGraph,
@@ -36699,6 +43776,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvKNearest,
   &_swigt__p_CvKalman,
   &_swigt__p_CvLineIterator,
+  &_swigt__p_CvMLData,
+  &_swigt__p_CvMSERParams,
   &_swigt__p_CvMat,
   &_swigt__p_CvMatND,
   &_swigt__p_CvMatrix3,
@@ -36711,7 +43790,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvNextEdgeType,
   &_swigt__p_CvNormalBayesClassifier,
   &_swigt__p_CvPOSITObject,
-  &_swigt__p_CvPair32s32f,
+  &_swigt__p_CvPair16u32s,
   &_swigt__p_CvParamGrid,
   &_swigt__p_CvPluginFuncInfo,
   &_swigt__p_CvPoint,
@@ -36758,6 +43837,9 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvSubdiv2DPoint,
   &_swigt__p_CvSubdiv2DPointLocation,
   &_swigt__p_CvTermCriteria,
+  &_swigt__p_CvTrainTestSplit,
+  &_swigt__p_CvTrainTestSplit_class_part,
+  &_swigt__p_CvTrainTestSplit_train_sample_part,
   &_swigt__p_CvTreeNodeIterator,
   &_swigt__p_CvTypeInfo,
   &_swigt__p_CvVectors,
@@ -36778,6 +43860,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_CvMat,
   &_swigt__p_p_double,
   &_swigt__p_p_float,
+  &_swigt__p_p_int,
   &_swigt__p_p_unsigned_char,
   &_swigt__p_signed_char,
   &_swigt__p_size_t,
@@ -36810,18 +43893,21 @@ static swig_cast_info _swigc__p_CvConnectedComp[] = {  {&_swigt__p_CvConnectedCo
 static swig_cast_info _swigc__p_CvContour[] = {  {&_swigt__p_CvContour, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvContourTree[] = {  {&_swigt__p_CvContourTree, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvConvexityDefect[] = {  {&_swigt__p_CvConvexityDefect, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvDTree[] = {  {&_swigt__p_CvForestTree, _p_CvForestTreeTo_p_CvDTree, 0, 0},  {&_swigt__p_CvBoostTree, _p_CvBoostTreeTo_p_CvDTree, 0, 0},  {&_swigt__p_CvDTree, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvDTree[] = {  {&_swigt__p_CvForestERTree, _p_CvForestERTreeTo_p_CvDTree, 0, 0},  {&_swigt__p_CvForestTree, _p_CvForestTreeTo_p_CvDTree, 0, 0},  {&_swigt__p_CvBoostTree, _p_CvBoostTreeTo_p_CvDTree, 0, 0},  {&_swigt__p_CvDTree, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvDTreeNode[] = {  {&_swigt__p_CvDTreeNode, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvDTreeParams[] = {  {&_swigt__p_CvRTParams, _p_CvRTParamsTo_p_CvDTreeParams, 0, 0},  {&_swigt__p_CvBoostParams, _p_CvBoostParamsTo_p_CvDTreeParams, 0, 0},  {&_swigt__p_CvDTreeParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvDTreeSplit[] = {  {&_swigt__p_CvDTreeSplit, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvDTreeTrainData[] = {  {&_swigt__p_CvDTreeTrainData, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvDTreeTrainData[] = {  {&_swigt__p_CvDTreeTrainData, 0, 0, 0},  {&_swigt__p_CvERTreeTrainData, _p_CvERTreeTrainDataTo_p_CvDTreeTrainData, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvEM[] = {  {&_swigt__p_CvEM, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvEMParams[] = {  {&_swigt__p_CvEMParams, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvERTreeTrainData[] = {  {&_swigt__p_CvERTreeTrainData, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvERTrees[] = {  {&_swigt__p_CvERTrees, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvFileNode[] = {  {&_swigt__p_CvFileNode, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvFileStorage[] = {  {&_swigt__p_CvFileStorage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvFilter[] = {  {&_swigt__p_CvFilter, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvFont[] = {  {&_swigt__p_CvFont, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvForestTree[] = {  {&_swigt__p_CvForestTree, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvForestERTree[] = {  {&_swigt__p_CvForestERTree, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvForestTree[] = {  {&_swigt__p_CvForestERTree, _p_CvForestERTreeTo_p_CvForestTree, 0, 0},  {&_swigt__p_CvForestTree, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvGenericHash[] = {  {&_swigt__p_CvGenericHash, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvGraph[] = {  {&_swigt__p_CvGraph, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvGraphEdge[] = {  {&_swigt__p_CvGraphEdge, 0, 0, 0},{0, 0, 0, 0}};
@@ -36838,6 +43924,8 @@ static swig_cast_info _swigc__p_CvHuMoments[] = {  {&_swigt__p_CvHuMoments, 0, 0
 static swig_cast_info _swigc__p_CvKNearest[] = {  {&_swigt__p_CvKNearest, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvKalman[] = {  {&_swigt__p_CvKalman, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvLineIterator[] = {  {&_swigt__p_CvLineIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvMLData[] = {  {&_swigt__p_CvMLData, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvMSERParams[] = {  {&_swigt__p_CvMSERParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMat[] = {  {&_swigt__p_CvMat, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMatND[] = {  {&_swigt__p_CvMatND, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvMatrix3[] = {  {&_swigt__p_CvMatrix3, 0, 0, 0},{0, 0, 0, 0}};
@@ -36850,7 +43938,7 @@ static swig_cast_info _swigc__p_CvNArrayIterator[] = {  {&_swigt__p_CvNArrayIter
 static swig_cast_info _swigc__p_CvNextEdgeType[] = {  {&_swigt__p_CvNextEdgeType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvNormalBayesClassifier[] = {  {&_swigt__p_CvNormalBayesClassifier, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPOSITObject[] = {  {&_swigt__p_CvPOSITObject, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvPair32s32f[] = {  {&_swigt__p_CvPair32s32f, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvPair16u32s[] = {  {&_swigt__p_CvPair16u32s, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvParamGrid[] = {  {&_swigt__p_CvParamGrid, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPluginFuncInfo[] = {  {&_swigt__p_CvPluginFuncInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPoint[] = {  {&_swigt__p_CvPoint, 0, 0, 0},{0, 0, 0, 0}};
@@ -36861,7 +43949,7 @@ static swig_cast_info _swigc__p_CvPoint3D64f[] = {  {&_swigt__p_CvPoint3D64f, 0,
 static swig_cast_info _swigc__p_CvQuadEdge2D[] = {  {&_swigt__p_CvQuadEdge2D, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvRNG_Wrapper[] = {  {&_swigt__p_CvRNG_Wrapper, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvRTParams[] = {  {&_swigt__p_CvRTParams, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvRTrees[] = {  {&_swigt__p_CvRTrees, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvRTrees[] = {  {&_swigt__p_CvRTrees, 0, 0, 0},  {&_swigt__p_CvERTrees, _p_CvERTreesTo_p_CvRTrees, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvRect[] = {  {&_swigt__p_CvRect, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSURFParams[] = {  {&_swigt__p_CvSURFParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSURFPoint[] = {  {&_swigt__p_CvSURFPoint, 0, 0, 0},{0, 0, 0, 0}};
@@ -36887,7 +43975,7 @@ static swig_cast_info _swigc__p_CvSparseMatIterator[] = {  {&_swigt__p_CvSparseM
 static swig_cast_info _swigc__p_CvSparseNode[] = {  {&_swigt__p_CvSparseNode, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvStarDetectorParams[] = {  {&_swigt__p_CvStarDetectorParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvStarKeypoint[] = {  {&_swigt__p_CvStarKeypoint, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvStatModel[] = {  {&_swigt__p_CvNormalBayesClassifier, _p_CvNormalBayesClassifierTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvANN_MLP, _p_CvANN_MLPTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvStatModel, 0, 0, 0},  {&_swigt__p_CvKNearest, _p_CvKNearestTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvForestTree, _p_CvForestTreeTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvRTrees, _p_CvRTreesTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvBoostTree, _p_CvBoostTreeTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvEM, _p_CvEMTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvSVM, _p_CvSVMTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvDTree, _p_CvDTreeTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvBoost, _p_CvBoostTo_p_CvStatModel, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvStatModel[] = {  {&_swigt__p_CvNormalBayesClassifier, _p_CvNormalBayesClassifierTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvForestERTree, _p_CvForestERTreeTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvANN_MLP, _p_CvANN_MLPTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvStatModel, 0, 0, 0},  {&_swigt__p_CvKNearest, _p_CvKNearestTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvForestTree, _p_CvForestTreeTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvRTrees, _p_CvRTreesTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvBoostTree, _p_CvBoostTreeTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvERTrees, _p_CvERTreesTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvEM, _p_CvEMTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvSVM, _p_CvSVMTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvDTree, _p_CvDTreeTo_p_CvStatModel, 0, 0},  {&_swigt__p_CvBoost, _p_CvBoostTo_p_CvStatModel, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvStereoBMState[] = {  {&_swigt__p_CvStereoBMState, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvStereoGCState[] = {  {&_swigt__p_CvStereoGCState, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvString[] = {  {&_swigt__p_CvString, 0, 0, 0},{0, 0, 0, 0}};
@@ -36897,6 +43985,9 @@ static swig_cast_info _swigc__p_CvSubdiv2DEdge_Wrapper[] = {  {&_swigt__p_CvSubd
 static swig_cast_info _swigc__p_CvSubdiv2DPoint[] = {  {&_swigt__p_CvSubdiv2DPoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSubdiv2DPointLocation[] = {  {&_swigt__p_CvSubdiv2DPointLocation, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvTermCriteria[] = {  {&_swigt__p_CvTermCriteria, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTrainTestSplit[] = {  {&_swigt__p_CvTrainTestSplit, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTrainTestSplit_class_part[] = {  {&_swigt__p_CvTrainTestSplit_class_part, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTrainTestSplit_train_sample_part[] = {  {&_swigt__p_CvTrainTestSplit_train_sample_part, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvTreeNodeIterator[] = {  {&_swigt__p_CvTreeNodeIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvTypeInfo[] = {  {&_swigt__p_CvTypeInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvVectors[] = {  {&_swigt__p_CvVectors, 0, 0, 0},{0, 0, 0, 0}};
@@ -36917,6 +44008,7 @@ static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0}
 static swig_cast_info _swigc__p_p_CvMat[] = {  {&_swigt__p_p_CvMat, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_double[] = {  {&_swigt__p_p_double, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_float[] = {  {&_swigt__p_p_float, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_int[] = {  {&_swigt__p_p_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_unsigned_char[] = {  {&_swigt__p_p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_signed_char[] = {  {&_swigt__p_signed_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_size_t[] = {  {&_swigt__p_size_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -36956,10 +44048,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvDTreeTrainData,
   _swigc__p_CvEM,
   _swigc__p_CvEMParams,
+  _swigc__p_CvERTreeTrainData,
+  _swigc__p_CvERTrees,
   _swigc__p_CvFileNode,
   _swigc__p_CvFileStorage,
   _swigc__p_CvFilter,
   _swigc__p_CvFont,
+  _swigc__p_CvForestERTree,
   _swigc__p_CvForestTree,
   _swigc__p_CvGenericHash,
   _swigc__p_CvGraph,
@@ -36977,6 +44072,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvKNearest,
   _swigc__p_CvKalman,
   _swigc__p_CvLineIterator,
+  _swigc__p_CvMLData,
+  _swigc__p_CvMSERParams,
   _swigc__p_CvMat,
   _swigc__p_CvMatND,
   _swigc__p_CvMatrix3,
@@ -36989,7 +44086,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvNextEdgeType,
   _swigc__p_CvNormalBayesClassifier,
   _swigc__p_CvPOSITObject,
-  _swigc__p_CvPair32s32f,
+  _swigc__p_CvPair16u32s,
   _swigc__p_CvParamGrid,
   _swigc__p_CvPluginFuncInfo,
   _swigc__p_CvPoint,
@@ -37036,6 +44133,9 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvSubdiv2DPoint,
   _swigc__p_CvSubdiv2DPointLocation,
   _swigc__p_CvTermCriteria,
+  _swigc__p_CvTrainTestSplit,
+  _swigc__p_CvTrainTestSplit_class_part,
+  _swigc__p_CvTrainTestSplit_train_sample_part,
   _swigc__p_CvTreeNodeIterator,
   _swigc__p_CvTypeInfo,
   _swigc__p_CvVectors,
@@ -37056,6 +44156,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_CvMat,
   _swigc__p_p_double,
   _swigc__p_p_float,
+  _swigc__p_p_int,
   _swigc__p_p_unsigned_char,
   _swigc__p_signed_char,
   _swigc__p_size_t,
@@ -37390,6 +44491,8 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CV_TYPE_NAME_ML_ANN_MLP",SWIG_FromCharPtr("opencv-ml-ann-mlp"));
   SWIG_Octave_SetConstant(module_ns,"CV_TYPE_NAME_ML_CNN",SWIG_FromCharPtr("opencv-ml-cnn"));
   SWIG_Octave_SetConstant(module_ns,"CV_TYPE_NAME_ML_RTREES",SWIG_FromCharPtr("opencv-ml-random-trees"));
+  SWIG_Octave_SetConstant(module_ns,"CV_TRAIN_ERROR",SWIG_From_int((int)(0)));
+  SWIG_Octave_SetConstant(module_ns,"CV_TEST_ERROR",SWIG_From_int((int)(1)));
   SWIG_Octave_SetConstant(module_ns,"CvParamGrid_SVM_C",SWIG_From_int((int)(CvParamGrid::SVM_C)));
   SWIG_Octave_SetConstant(module_ns,"CvParamGrid_SVM_GAMMA",SWIG_From_int((int)(CvParamGrid::SVM_GAMMA)));
   SWIG_Octave_SetConstant(module_ns,"CvParamGrid_SVM_P",SWIG_From_int((int)(CvParamGrid::SVM_P)));
@@ -37434,5 +44537,7 @@ static void SWIG_init_user(octave_swig_type* module_ns)
   SWIG_Octave_SetConstant(module_ns,"CvANN_MLP_NO_INPUT_SCALE",SWIG_From_int((int)(CvANN_MLP::NO_INPUT_SCALE)));
   SWIG_Octave_SetConstant(module_ns,"CvANN_MLP_NO_OUTPUT_SCALE",SWIG_From_int((int)(CvANN_MLP::NO_OUTPUT_SCALE)));
   SWIG_Octave_SetConstant(module_ns,"CV_TS_CONCENTRIC_SPHERES",SWIG_From_int((int)(0)));
+  SWIG_Octave_SetConstant(module_ns,"CV_COUNT",SWIG_From_int((int)(0)));
+  SWIG_Octave_SetConstant(module_ns,"CV_PORTION",SWIG_From_int((int)(1)));
 }
 
index 2c84bd318e8506bb90a8f1f951389dcef0162258..ce4a89db3e523a032b539cc43537ebfbedd82f5f 100644 (file)
@@ -25,9 +25,11 @@ EXTRA_DIST = \
   \
   cv.i             \
   cvaliases.i      \
+  cvaliases_autogen.i \
   cvarr.i          \
   cvseq.i          \
   cvshadow.i       \
+  cvswigmacros.i   \
   ml.i             \
   highgui.i        \
   imagedata.i      \
@@ -54,8 +56,8 @@ EXTRA_DIST = \
 if UPDATE_SWIG_WRAPPERS
 
 # this rule creates the Python wrapper sources for cxcore and cv
-_cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i pyhelpers.i       \
-         nointpb.i pytypemaps.i cvshadow.i cvseq.i              \
+_cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i cvaliases_autogen.i pyhelpers.i \
+         nointpb.i pytypemaps.i cvshadow.i cvseq.i cvswigmacros.i \
          error.cpp error.h                                      \
          pyhelpers.h cvshadow.h pycvseq.hpp                     \
          $(top_srcdir)/interfaces/swig/general/cv.i             \
@@ -71,7 +73,7 @@ _cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i pyhelpers.i       \
        $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -o $@ $<
 
 # this rule creates the Python wrapper sources for ml
-_ml.cpp: ml.i nointpb.i pytypemaps.i                            \
+_ml.cpp: ml.i nointpb.i pytypemaps.i cvswigmacros.i             \
               $(top_srcdir)/interfaces/swig/general/typemaps.i  \
               $(top_srcdir)/interfaces/swig/general/memory.i    \
               $(top_srcdir)/include/opencv/ml.h                 \
@@ -79,7 +81,7 @@ _ml.cpp: ml.i nointpb.i pytypemaps.i                            \
        $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
 
 # this rule creates the Python wrapper sources for highgui
-_highgui.cpp: highgui.i nointpb.i pytypemaps.i                  \
+_highgui.cpp: highgui.i nointpb.i pytypemaps.i cvswigmacros.i   \
               $(top_srcdir)/interfaces/swig/general/highgui.i   \
               $(top_srcdir)/interfaces/swig/general/typemaps.i  \
               $(top_srcdir)/interfaces/swig/general/memory.i    \
@@ -93,7 +95,7 @@ CV_HEADER_FILES = \
   $(top_srcdir)/include/opencv/cvtypes.h \
   $(top_srcdir)/include/opencv/cv.h
 
-cvaliases.i: $(CV_HEADER_FILES) Makefile.in
+cvaliases_autogen.i: $(CV_HEADER_FILES) Makefile.in
        $(PYTHON) $(top_srcdir)/utils/extract_aliases.py $(CV_HEADER_FILES) > $@
 
 endif
index 2af7f8faf89881e8860d91ef28b2ccba36a8832a..4d0e9c4ac377b9810a475ddf51f294404b7c3079 100644 (file)
@@ -48,7 +48,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -165,15 +169,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -190,10 +193,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -203,6 +208,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -212,6 +218,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,7 +261,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -284,6 +292,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -326,9 +335,11 @@ EXTRA_DIST = \
   \
   cv.i             \
   cvaliases.i      \
+  cvaliases_autogen.i \
   cvarr.i          \
   cvseq.i          \
   cvshadow.i       \
+  cvswigmacros.i   \
   ml.i             \
   highgui.i        \
   imagedata.i      \
@@ -761,8 +772,8 @@ uninstall-am: uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON
 # the following rules keep wrappers up to date, if SWIG is present
 
 # this rule creates the Python wrapper sources for cxcore and cv
-@UPDATE_SWIG_WRAPPERS_TRUE@_cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i pyhelpers.i       \
-@UPDATE_SWIG_WRAPPERS_TRUE@         nointpb.i pytypemaps.i cvshadow.i cvseq.i              \
+@UPDATE_SWIG_WRAPPERS_TRUE@_cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i cvaliases_autogen.i pyhelpers.i \
+@UPDATE_SWIG_WRAPPERS_TRUE@         nointpb.i pytypemaps.i cvshadow.i cvseq.i cvswigmacros.i \
 @UPDATE_SWIG_WRAPPERS_TRUE@         error.cpp error.h                                      \
 @UPDATE_SWIG_WRAPPERS_TRUE@         pyhelpers.h cvshadow.h pycvseq.hpp                     \
 @UPDATE_SWIG_WRAPPERS_TRUE@         $(top_srcdir)/interfaces/swig/general/cv.i             \
@@ -778,7 +789,7 @@ uninstall-am: uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -o $@ $<
 
 # this rule creates the Python wrapper sources for ml
-@UPDATE_SWIG_WRAPPERS_TRUE@_ml.cpp: ml.i nointpb.i pytypemaps.i                            \
+@UPDATE_SWIG_WRAPPERS_TRUE@_ml.cpp: ml.i nointpb.i pytypemaps.i cvswigmacros.i             \
 @UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/interfaces/swig/general/typemaps.i  \
 @UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/interfaces/swig/general/memory.i    \
 @UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/include/opencv/ml.h                 \
@@ -786,7 +797,7 @@ uninstall-am: uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
 
 # this rule creates the Python wrapper sources for highgui
-@UPDATE_SWIG_WRAPPERS_TRUE@_highgui.cpp: highgui.i nointpb.i pytypemaps.i                  \
+@UPDATE_SWIG_WRAPPERS_TRUE@_highgui.cpp: highgui.i nointpb.i pytypemaps.i cvswigmacros.i   \
 @UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/interfaces/swig/general/highgui.i   \
 @UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/interfaces/swig/general/typemaps.i  \
 @UPDATE_SWIG_WRAPPERS_TRUE@              $(top_srcdir)/interfaces/swig/general/memory.i    \
@@ -794,7 +805,7 @@ uninstall-am: uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON
 @UPDATE_SWIG_WRAPPERS_TRUE@              Makefile.in
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
 
-@UPDATE_SWIG_WRAPPERS_TRUE@cvaliases.i: $(CV_HEADER_FILES) Makefile.in
+@UPDATE_SWIG_WRAPPERS_TRUE@cvaliases_autogen.i: $(CV_HEADER_FILES) Makefile.in
 @UPDATE_SWIG_WRAPPERS_TRUE@    $(PYTHON) $(top_srcdir)/utils/extract_aliases.py $(CV_HEADER_FILES) > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
index a830901f47b111a3cd1d5e2c53cecd3b326c50d5..5f674bcb65e5b5517d5e750d325e195c50f85298 100644 (file)
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.39
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
 #define SWIGPYTHON
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
 
+
 #ifdef __cplusplus
-template<class T> class SwigValueWrapper {
-    T *tt;
+/* SwigValueWrapper is described in swig.swg */
+template<typename T> class SwigValueWrapper {
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
-    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -34,14 +42,14 @@ private:
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -69,6 +77,12 @@ private:
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -124,6 +138,12 @@ private:
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 
 /* Python.h has to appear first */
 #include <Python.h>
@@ -131,13 +151,13 @@ private:
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
  * type checking.
  * ----------------------------------------------------------------------------- */
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -150,11 +170,11 @@ private:
 
 /*
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the swig runtime code.
-  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  creating a static or dynamic library from the SWIG runtime code.
+  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
   
-  But only do this if is strictly necessary, ie, if you have problems
-  with your compiler or so.
+  But only do this if strictly necessary, ie, if you have problems
+  with your compiler or suchlike.
 */
 
 #ifndef SWIGRUNTIME
@@ -172,6 +192,7 @@ private:
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -180,14 +201,14 @@ private:
 /* 
    Flags/methods for returning states.
    
-   The swig conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
    Use the following macros/flags to set or process the returning
    states.
    
-   In old swig versions, you usually write code as:
+   In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
        // success code
@@ -195,7 +216,7 @@ private:
        //fail code
      }
 
-   Now you can be more explicit as:
+   Now you can be more explicit:
 
     int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
     if (SWIG_IsOK(res)) {
@@ -204,7 +225,7 @@ private:
       // fail code
     }
 
-   that seems to be the same, but now you can also do
+   which is the same really, but now you can also do
 
     Type *ptr;
     int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -222,7 +243,7 @@ private:
     
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
-   requires also to SWIG_ConvertPtr to return new result values, as
+   also requires SWIG_ConvertPtr to return new result values, such as
 
       int SWIG_ConvertPtr(obj, ptr,...) {         
         if (<obj is ok>) {                            
@@ -240,7 +261,7 @@ private:
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
    more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   swig errors code.
+   SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
    allows to return the 'cast rank', for example, if you have this
@@ -254,9 +275,8 @@ private:
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
+*/
 
-
- */
 #define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
@@ -281,7 +301,6 @@ private:
 #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
 #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
 
-
 /* Cast-Rank Mode */
 #if defined(SWIG_CASTRANK_MODE)
 #  ifndef SWIG_TypeRank
@@ -304,18 +323,16 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
-
-
 #include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;                        /* mangled name of this type */
   const char             *str;                 /* human readable name of this type */
@@ -360,7 +377,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
 /*
@@ -402,48 +419,66 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
 }
 
 
-/* think of this as a c++ template<> or a scheme macro */
-#define SWIG_TypeCheck_Template(comparison, ty)         \
-  if (ty) {                                             \
-    swig_cast_info *iter = ty->cast;                    \
-    while (iter) {                                      \
-      if (comparison) {                                 \
-        if (iter == ty->cast) return iter;              \
-        /* Move iter to the top of the linked list */   \
-        iter->prev->next = iter->next;                  \
-        if (iter->next)                                 \
-          iter->next->prev = iter->prev;                \
-        iter->next = ty->cast;                          \
-        iter->prev = 0;                                 \
-        if (ty->cast) ty->cast->prev = iter;            \
-        ty->cast = iter;                                \
-        return iter;                                    \
-      }                                                 \
-      iter = iter->next;                                \
-    }                                                   \
-  }                                                     \
-  return 0
-
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (strcmp(iter->type->name, c) == 0) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
-/* Same as previous function, except strcmp is replaced with a pointer comparison */
+/* 
+  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
-  SWIG_TypeCheck_Template(iter->type == from, into);
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (iter->type == from) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
 /*
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -714,6 +749,67 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 
 
+/* Compatibility marcos for Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+
+#define PyClass_Check(obj) PyObject_IsInstance(obj, (PyObject *)&PyType_Type)
+#define PyInt_Check(x) PyLong_Check(x)
+#define PyInt_AsLong(x) PyLong_AsLong(x)
+#define PyInt_FromLong(x) PyLong_FromLong(x)
+#define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
+
+#endif
+
+#ifndef Py_TYPE
+#  define Py_TYPE(op) ((op)->ob_type)
+#endif
+
+/* SWIG APIs for compatibility of both Python 2 & 3 */
+
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_Python_str_FromFormat PyUnicode_FromFormat
+#else
+#  define SWIG_Python_str_FromFormat PyString_FromFormat
+#endif
+
+
+/* Warning: This function will allocate a new string in Python 3,
+ * so please call SWIG_Python_str_DelForPy3(x) to free the space.
+ */
+SWIGINTERN char*
+SWIG_Python_str_AsChar(PyObject *str)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  char *cstr;
+  char *newstr;
+  int len;
+  str = PyUnicode_AsUTF8String(str);
+  PyBytes_AsStringAndSize(str, &cstr, &len);
+  newstr = (char *) malloc(len+1);
+  memcpy(newstr, cstr, len+1);
+  Py_XDECREF(str);
+  return newstr;
+#else
+  return PyString_AsString(str);
+#endif
+}
+
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
+#else
+#  define SWIG_Python_str_DelForPy3(x) 
+#endif
+
+
+SWIGINTERN PyObject*
+SWIG_Python_str_FromChar(const char *c)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  return PyUnicode_FromString(c); 
+#else
+  return PyString_FromString(c);
+#endif
+}
 
 /* Add PyOS_snprintf for old Pythons */
 #if PY_VERSION_HEX < 0x02020000
@@ -760,6 +856,7 @@ PyString_FromFormat(const char *fmt, ...) {
 #  define PyObject_GenericGetAttr 0
 # endif
 #endif
+
 /* Py_NotImplemented is defined in 2.1 and up. */
 #if PY_VERSION_HEX < 0x02010000
 # ifndef Py_NotImplemented
@@ -767,7 +864,6 @@ PyString_FromFormat(const char *fmt, ...) {
 # endif
 #endif
 
-
 /* A crude PyString_AsStringAndSize implementation for old Pythons */
 #if PY_VERSION_HEX < 0x02010000
 # ifndef PyString_AsStringAndSize
@@ -782,7 +878,6 @@ PyString_FromFormat(const char *fmt, ...) {
 # endif
 #endif
 
-
 /* PyBool_FromLong for old Pythons */
 #if PY_VERSION_HEX < 0x02030000
 static
@@ -860,19 +955,20 @@ SWIG_Python_AddErrorMsg(const char* mesg)
 
   if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
   if (value) {
+    char *tmp;
     PyObject *old_str = PyObject_Str(value);
     PyErr_Clear();
     Py_XINCREF(type);
-    PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+
+    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+    SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
 
-
-
 #if defined(SWIG_PYTHON_NO_THREADS)
 #  if defined(SWIG_PYTHON_THREADS)
 #    undef SWIG_PYTHON_THREADS
@@ -969,6 +1065,20 @@ typedef struct swig_const_info {
   swig_type_info **ptype;
 } swig_const_info;
 
+
+/* -----------------------------------------------------------------------------
+ * Wrapper of PyInstanceMethod_New() used in Python 3
+ * It is exported to the generated module, used for -fastproxy
+ * ----------------------------------------------------------------------------- */
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  return PyInstanceMethod_New(func);
+#else
+  return NULL;
+#endif
+}
+
 #ifdef __cplusplus
 #if 0
 { /* cc-mode */
@@ -1021,7 +1131,7 @@ typedef struct swig_const_info {
 
 #define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
 #define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
-#define SWIG_NewClientData(obj)                         PySwigClientData_New(obj)
+#define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
 
 #define SWIG_SetErrorObj                                SWIG_Python_SetErrorObj                            
 #define SWIG_SetErrorMsg                               SWIG_Python_SetErrorMsg                            
@@ -1107,14 +1217,14 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
 {
   if (!args) {
     if (!min && !max) {
       return 1;
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-                  name, (min == max ? "" : "at least "), min);
+                  name, (min == max ? "" : "at least "), (int)min);
       return 0;
     }
   }  
@@ -1122,14 +1232,14 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyOb
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register int l = PyTuple_GET_SIZE(args);
+    register Py_ssize_t l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-                  name, (min == max ? "" : "at least "), min, l);
+                  name, (min == max ? "" : "at least "), (int)min, (int)l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-                  name, (min == max ? "" : "at most "), max, l);
+                  name, (min == max ? "" : "at most "), (int)max, (int)l);
       return 0;
     } else {
       register int i;
@@ -1217,7 +1327,7 @@ SWIG_Py_Void(void)
   return none;
 }
 
-/* PySwigClientData */
+/* SwigPyClientData */
 
 typedef struct {
   PyObject *klass;
@@ -1226,30 +1336,30 @@ typedef struct {
   PyObject *destroy;
   int delargs;
   int implicitconv;
-} PySwigClientData;
+} SwigPyClientData;
 
 SWIGRUNTIMEINLINE int 
 SWIG_Python_CheckImplicit(swig_type_info *ty)
 {
-  PySwigClientData *data = (PySwigClientData *)ty->clientdata;
+  SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
   return data ? data->implicitconv : 0;
 }
 
 SWIGRUNTIMEINLINE PyObject *
 SWIG_Python_ExceptionType(swig_type_info *desc) {
-  PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0;
+  SwigPyClientData *data = desc ? (SwigPyClientData *) desc->clientdata : 0;
   PyObject *klass = data ? data->klass : 0;
   return (klass ? klass : PyExc_RuntimeError);
 }
 
 
-SWIGRUNTIME PySwigClientData * 
-PySwigClientData_New(PyObject* obj)
+SWIGRUNTIME SwigPyClientData * 
+SwigPyClientData_New(PyObject* obj)
 {
   if (!obj) {
     return 0;
   } else {
-    PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData));
+    SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData));
     /* the klass element */
     data->klass = obj;
     Py_INCREF(data->klass);
@@ -1297,14 +1407,14 @@ PySwigClientData_New(PyObject* obj)
 }
 
 SWIGRUNTIME void 
-PySwigClientData_Del(PySwigClientData* data)
+SwigPyClientData_Del(SwigPyClientData* data)
 {
   Py_XDECREF(data->newraw);
   Py_XDECREF(data->newargs);
   Py_XDECREF(data->destroy);
 }
 
-/* =============== PySwigObject =====================*/
+/* =============== SwigPyObject =====================*/
 
 typedef struct {
   PyObject_HEAD
@@ -1312,24 +1422,28 @@ typedef struct {
   swig_type_info *ty;
   int own;
   PyObject *next;
-} PySwigObject;
+} SwigPyObject;
 
 SWIGRUNTIME PyObject *
-PySwigObject_long(PySwigObject *v)
+SwigPyObject_long(SwigPyObject *v)
 {
   return PyLong_FromVoidPtr(v->ptr);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_format(const char* fmt, PySwigObject *v)
+SwigPyObject_format(const char* fmt, SwigPyObject *v)
 {
   PyObject *res = NULL;
   PyObject *args = PyTuple_New(1);
   if (args) {
-    if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) {
-      PyObject *ofmt = PyString_FromString(fmt);
+    if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) {
+      PyObject *ofmt = SWIG_Python_str_FromChar(fmt);
       if (ofmt) {
+#if PY_VERSION_HEX >= 0x03000000
+       res = PyUnicode_Format(ofmt,args);
+#else
        res = PyString_Format(ofmt,args);
+#endif
        Py_DECREF(ofmt);
       }
       Py_DECREF(args);
@@ -1339,49 +1453,59 @@ PySwigObject_format(const char* fmt, PySwigObject *v)
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_oct(PySwigObject *v)
+SwigPyObject_oct(SwigPyObject *v)
 {
-  return PySwigObject_format("%o",v);
+  return SwigPyObject_format("%o",v);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_hex(PySwigObject *v)
+SwigPyObject_hex(SwigPyObject *v)
 {
-  return PySwigObject_format("%x",v);
+  return SwigPyObject_format("%x",v);
 }
 
 SWIGRUNTIME PyObject *
 #ifdef METH_NOARGS
-PySwigObject_repr(PySwigObject *v)
+SwigPyObject_repr(SwigPyObject *v)
 #else
-PySwigObject_repr(PySwigObject *v, PyObject *args)
+SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 #endif
 {
   const char *name = SWIG_TypePrettyName(v->ty);
-  PyObject *hex = PySwigObject_hex(v);    
-  PyObject *repr = PyString_FromFormat("<Swig Object of type '%s' at 0x%s>", name, PyString_AsString(hex));
+  PyObject *hex = SwigPyObject_hex(v);    
+  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, hex);
   Py_DECREF(hex);
   if (v->next) {
 #ifdef METH_NOARGS
-    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next);
+    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
 #else
-    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next, args);
+    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
 #endif
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *joined = PyUnicode_Concat(repr, nrep);
+    Py_DecRef(repr);
+    Py_DecRef(nrep);
+    repr = joined;
+#else
     PyString_ConcatAndDel(&repr,nrep);
+#endif
   }
   return repr;  
 }
 
 SWIGRUNTIME int
-PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 {
+  char *str;
 #ifdef METH_NOARGS
-  PyObject *repr = PySwigObject_repr(v);
+  PyObject *repr = SwigPyObject_repr(v);
 #else
-  PyObject *repr = PySwigObject_repr(v, NULL);
+  PyObject *repr = SwigPyObject_repr(v, NULL);
 #endif
   if (repr) {
-    fputs(PyString_AsString(repr), fp);
+    str = SWIG_Python_str_AsChar(repr); 
+    fputs(str, fp);
+    SWIG_Python_str_DelForPy3(str);
     Py_DECREF(repr);
     return 0; 
   } else {
@@ -1390,53 +1514,71 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_str(PySwigObject *v)
+SwigPyObject_str(SwigPyObject *v)
 {
   char result[SWIG_BUFFER_SIZE];
   return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    PyString_FromString(result) : 0;
+    SWIG_Python_str_FromChar(result) : 0;
 }
 
 SWIGRUNTIME int
-PySwigObject_compare(PySwigObject *v, PySwigObject *w)
+SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
   void *j = w->ptr;
   return (i < j) ? -1 : ((i > j) ? 1 : 0);
 }
 
+/* Added for Python 3.x, whould it also useful for Python 2.x? */
+SWIGRUNTIME PyObject*
+SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
+{
+  PyObject* res;
+  if( op != Py_EQ && op != Py_NE ) {
+    Py_INCREF(Py_NotImplemented);
+    return Py_NotImplemented;
+  }
+  if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) )
+    res = Py_True;
+  else
+    res = Py_False;
+  Py_INCREF(res);
+  return res;  
+}
+
+
 SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
 
 SWIGRUNTIME PyTypeObject*
-PySwigObject_type(void) {
+SwigPyObject_type(void) {
   static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
   return type;
 }
 
 SWIGRUNTIMEINLINE int
-PySwigObject_Check(PyObject *op) {
-  return ((op)->ob_type == PySwigObject_type())
-    || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
+SwigPyObject_Check(PyObject *op) {
+  return (Py_TYPE(op) == SwigPyObject_type())
+    || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_New(void *ptr, swig_type_info *ty, int own);
+SwigPyObject_New(void *ptr, swig_type_info *ty, int own);
 
 SWIGRUNTIME void
-PySwigObject_dealloc(PyObject *v)
+SwigPyObject_dealloc(PyObject *v)
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own) {
+  if (sobj->own == SWIG_POINTER_OWN) {
     swig_type_info *ty = sobj->ty;
-    PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+    SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
     if (destroy) {
       /* destroy is always a VARARGS method */
       PyObject *res;
       if (data->delargs) {
        /* we need to create a temporal object to carry the destroy operation */
-       PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0);
+       PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0);
        res = SWIG_Python_CallFunctor(destroy, tmp);
        Py_DECREF(tmp);
       } else {
@@ -1445,27 +1587,28 @@ PySwigObject_dealloc(PyObject *v)
        res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } else {
-      const char *name = SWIG_TypePrettyName(ty);
+    } 
 #if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
-#endif
+    else {
+      const char *name = SWIG_TypePrettyName(ty);
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
     }
+#endif
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
 }
 
 SWIGRUNTIME PyObject* 
-PySwigObject_append(PyObject* v, PyObject* next)
+SwigPyObject_append(PyObject* v, PyObject* next)
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
 #ifndef METH_O
   PyObject *tmp = 0;
   if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
   next = tmp;
 #endif
-  if (!PySwigObject_Check(next)) {
+  if (!SwigPyObject_Check(next)) {
     return NULL;
   }
   sobj->next = next;
@@ -1475,12 +1618,12 @@ PySwigObject_append(PyObject* v, PyObject* next)
 
 SWIGRUNTIME PyObject* 
 #ifdef METH_NOARGS
-PySwigObject_next(PyObject* v)
+SwigPyObject_next(PyObject* v)
 #else
-PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
   if (sobj->next) {    
     Py_INCREF(sobj->next);
     return sobj->next;
@@ -1491,30 +1634,30 @@ PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 
 SWIGINTERN PyObject*
 #ifdef METH_NOARGS
-PySwigObject_disown(PyObject *v)
+SwigPyObject_disown(PyObject *v)
 #else
-PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *)v;
+  SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = 0;
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject*
 #ifdef METH_NOARGS
-PySwigObject_acquire(PyObject *v)
+SwigPyObject_acquire(PyObject *v)
 #else
-PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *)v;
+  SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = SWIG_POINTER_OWN;
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject*
-PySwigObject_own(PyObject *v, PyObject *args)
+SwigPyObject_own(PyObject *v, PyObject *args)
 {
   PyObject *val = 0;
 #if (PY_VERSION_HEX < 0x02020000)
@@ -1527,20 +1670,20 @@ PySwigObject_own(PyObject *v, PyObject *args)
     } 
   else
     {
-      PySwigObject *sobj = (PySwigObject *)v;
+      SwigPyObject *sobj = (SwigPyObject *)v;
       PyObject *obj = PyBool_FromLong(sobj->own);
       if (val) {
 #ifdef METH_NOARGS
        if (PyObject_IsTrue(val)) {
-         PySwigObject_acquire(v);
+         SwigPyObject_acquire(v);
        } else {
-         PySwigObject_disown(v);
+         SwigPyObject_disown(v);
        }
 #else
        if (PyObject_IsTrue(val)) {
-         PySwigObject_acquire(v,args);
+         SwigPyObject_acquire(v,args);
        } else {
-         PySwigObject_disown(v,args);
+         SwigPyObject_disown(v,args);
        }
 #endif
       } 
@@ -1551,30 +1694,30 @@ PySwigObject_own(PyObject *v, PyObject *args)
 #ifdef METH_O
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_O,       (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
+  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
   {0, 0, 0, 0}  
 };
 #else
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
+  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
   {0, 0, 0, 0}  
 };
 #endif
 
 #if PY_VERSION_HEX < 0x02020000
 SWIGINTERN PyObject *
-PySwigObject_getattr(PySwigObject *sobj,char *name)
+SwigPyObject_getattr(SwigPyObject *sobj,char *name)
 {
   return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
 }
@@ -1584,11 +1727,14 @@ SWIGRUNTIME PyTypeObject*
 _PySwigObject_type(void) {
   static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
   
-  static PyNumberMethods PySwigObject_as_number = {
+  static PyNumberMethods SwigPyObject_as_number = {
     (binaryfunc)0, /*nb_add*/
     (binaryfunc)0, /*nb_subtract*/
     (binaryfunc)0, /*nb_multiply*/
+    /* nb_divide removed in Python 3 */
+#if PY_VERSION_HEX < 0x03000000
     (binaryfunc)0, /*nb_divide*/
+#endif
     (binaryfunc)0, /*nb_remainder*/
     (binaryfunc)0, /*nb_divmod*/
     (ternaryfunc)0,/*nb_power*/
@@ -1602,45 +1748,66 @@ _PySwigObject_type(void) {
     0,            /*nb_and*/
     0,            /*nb_xor*/
     0,            /*nb_or*/
-    (coercion)0,   /*nb_coerce*/
-    (unaryfunc)PySwigObject_long, /*nb_int*/
-    (unaryfunc)PySwigObject_long, /*nb_long*/
+#if PY_VERSION_HEX < 0x03000000
+    0,   /*nb_coerce*/
+#endif
+    (unaryfunc)SwigPyObject_long, /*nb_int*/
+#if PY_VERSION_HEX < 0x03000000
+    (unaryfunc)SwigPyObject_long, /*nb_long*/
+#else
+    0, /*nb_reserved*/
+#endif
     (unaryfunc)0,                 /*nb_float*/
-    (unaryfunc)PySwigObject_oct,  /*nb_oct*/
-    (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02020000
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
-#elif PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX < 0x03000000
+    (unaryfunc)SwigPyObject_oct,  /*nb_oct*/
+    (unaryfunc)SwigPyObject_hex,  /*nb_hex*/
+#endif
+#if PY_VERSION_HEX >= 0x03000000 /* 3.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
+#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
     0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
 
-  static PyTypeObject pyswigobject_type;  
+  static PyTypeObject swigpyobject_type;  
   static int type_init = 0;
   if (!type_init) {
     const PyTypeObject tmp
       = {
+       /* PyOjbect header changed in Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+       PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else    
        PyObject_HEAD_INIT(NULL)
        0,                                  /* ob_size */
-       (char *)"PySwigObject",             /* tp_name */
-       sizeof(PySwigObject),               /* tp_basicsize */
+#endif
+       (char *)"SwigPyObject",             /* tp_name */
+       sizeof(SwigPyObject),               /* tp_basicsize */
        0,                                  /* tp_itemsize */
-       (destructor)PySwigObject_dealloc,   /* tp_dealloc */
-       (printfunc)PySwigObject_print,      /* tp_print */
+       (destructor)SwigPyObject_dealloc,   /* tp_dealloc */
+       (printfunc)SwigPyObject_print,      /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
-       (getattrfunc)PySwigObject_getattr,  /* tp_getattr */ 
+       (getattrfunc)SwigPyObject_getattr,  /* tp_getattr */ 
 #else
        (getattrfunc)0,                     /* tp_getattr */ 
 #endif
        (setattrfunc)0,                     /* tp_setattr */ 
-       (cmpfunc)PySwigObject_compare,      /* tp_compare */ 
-       (reprfunc)PySwigObject_repr,        /* tp_repr */    
-       &PySwigObject_as_number,            /* tp_as_number */
+#if PY_VERSION_HEX >= 0x03000000
+    0, /* tp_reserved in 3.0.1 */
+#else
+       (cmpfunc)SwigPyObject_compare,      /* tp_compare */
+#endif
+       (reprfunc)SwigPyObject_repr,        /* tp_repr */    
+       &SwigPyObject_as_number,            /* tp_as_number */
        0,                                  /* tp_as_sequence */
        0,                                  /* tp_as_mapping */
        (hashfunc)0,                        /* tp_hash */
        (ternaryfunc)0,                     /* tp_call */
-       (reprfunc)PySwigObject_str,         /* tp_str */
+       (reprfunc)SwigPyObject_str,         /* tp_str */
        PyObject_GenericGetAttr,            /* tp_getattro */
        0,                                  /* tp_setattro */
        0,                                  /* tp_as_buffer */
@@ -1648,7 +1815,7 @@ _PySwigObject_type(void) {
        swigobject_doc,                     /* tp_doc */        
        0,                                  /* tp_traverse */
        0,                                  /* tp_clear */
-       0,                                  /* tp_richcompare */
+       (richcmpfunc)SwigPyObject_richcompare,           /* tp_richcompare */
        0,                                  /* tp_weaklistoffset */
 #if PY_VERSION_HEX >= 0x02020000
        0,                                  /* tp_iter */
@@ -1665,11 +1832,11 @@ _PySwigObject_type(void) {
        0,                                  /* tp_alloc */              
        0,                                  /* tp_new */                
        0,                                  /* tp_free */          
-        0,                                  /* tp_is_gc */  
+       0,                                  /* tp_is_gc */  
        0,                                  /* tp_bases */   
        0,                                  /* tp_mro */
        0,                                  /* tp_cache */   
-       0,                                  /* tp_subclasses */
+       0,                                  /* tp_subclasses */
        0,                                  /* tp_weaklist */
 #endif
 #if PY_VERSION_HEX >= 0x02030000
@@ -1679,17 +1846,20 @@ _PySwigObject_type(void) {
        0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
       };
-    pyswigobject_type = tmp;
-    pyswigobject_type.ob_type = &PyType_Type;
+    swigpyobject_type = tmp;
+    /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
+    swigpyobject_type.ob_type = &PyType_Type;
+#endif
     type_init = 1;
   }
-  return &pyswigobject_type;
+  return &swigpyobject_type;
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_New(void *ptr, swig_type_info *ty, int own)
+SwigPyObject_New(void *ptr, swig_type_info *ty, int own)
 {
-  PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type());
+  SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type());
   if (sobj) {
     sobj->ptr  = ptr;
     sobj->ty   = ty;
@@ -1708,10 +1878,10 @@ typedef struct {
   void *pack;
   swig_type_info *ty;
   size_t size;
-} PySwigPacked;
+} SwigPyPacked;
 
 SWIGRUNTIME int
-PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 {
   char result[SWIG_BUFFER_SIZE];
   fputs("<Swig Packed ", fp); 
@@ -1725,29 +1895,29 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 }
   
 SWIGRUNTIME PyObject *
-PySwigPacked_repr(PySwigPacked *v)
+SwigPyPacked_repr(SwigPyPacked *v)
 {
   char result[SWIG_BUFFER_SIZE];
   if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    return PyString_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
+    return SWIG_Python_str_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
   } else {
-    return PyString_FromFormat("<Swig Packed %s>", v->ty->name);
+    return SWIG_Python_str_FromFormat("<Swig Packed %s>", v->ty->name);
   }  
 }
 
 SWIGRUNTIME PyObject *
-PySwigPacked_str(PySwigPacked *v)
+SwigPyPacked_str(SwigPyPacked *v)
 {
   char result[SWIG_BUFFER_SIZE];
   if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
-    return PyString_FromFormat("%s%s", result, v->ty->name);
+    return SWIG_Python_str_FromFormat("%s%s", result, v->ty->name);
   } else {
-    return PyString_FromString(v->ty->name);
+    return SWIG_Python_str_FromChar(v->ty->name);
   }  
 }
 
 SWIGRUNTIME int
-PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
+SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
 {
   size_t i = v->size;
   size_t j = w->size;
@@ -1758,22 +1928,22 @@ PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
 SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void);
 
 SWIGRUNTIME PyTypeObject*
-PySwigPacked_type(void) {
+SwigPyPacked_type(void) {
   static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type();
   return type;
 }
 
 SWIGRUNTIMEINLINE int
-PySwigPacked_Check(PyObject *op) {
+SwigPyPacked_Check(PyObject *op) {
   return ((op)->ob_type == _PySwigPacked_type()) 
-    || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0);
+    || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0);
 }
 
 SWIGRUNTIME void
-PySwigPacked_dealloc(PyObject *v)
+SwigPyPacked_dealloc(PyObject *v)
 {
-  if (PySwigPacked_Check(v)) {
-    PySwigPacked *sobj = (PySwigPacked *) v;
+  if (SwigPyPacked_Check(v)) {
+    SwigPyPacked *sobj = (SwigPyPacked *) v;
     free(sobj->pack);
   }
   PyObject_DEL(v);
@@ -1782,28 +1952,37 @@ PySwigPacked_dealloc(PyObject *v)
 SWIGRUNTIME PyTypeObject*
 _PySwigPacked_type(void) {
   static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
-  static PyTypeObject pyswigpacked_type;
+  static PyTypeObject swigpypacked_type;
   static int type_init = 0;  
   if (!type_init) {
     const PyTypeObject tmp
       = {
+    /* PyObject header changed in Python 3 */
+#if PY_VERSION_HEX>=0x03000000
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else
        PyObject_HEAD_INIT(NULL)
-       0,                                  /* ob_size */       
-       (char *)"PySwigPacked",             /* tp_name */       
-       sizeof(PySwigPacked),               /* tp_basicsize */  
+    0,                             /* ob_size */       
+#endif
+       (char *)"SwigPyPacked",             /* tp_name */       
+       sizeof(SwigPyPacked),               /* tp_basicsize */  
        0,                                  /* tp_itemsize */   
-       (destructor)PySwigPacked_dealloc,   /* tp_dealloc */    
-       (printfunc)PySwigPacked_print,      /* tp_print */      
+       (destructor)SwigPyPacked_dealloc,   /* tp_dealloc */    
+       (printfunc)SwigPyPacked_print,      /* tp_print */      
        (getattrfunc)0,                     /* tp_getattr */    
        (setattrfunc)0,                     /* tp_setattr */    
-       (cmpfunc)PySwigPacked_compare,      /* tp_compare */    
-       (reprfunc)PySwigPacked_repr,        /* tp_repr */       
-       0,                                  /* tp_as_number */  
+#if PY_VERSION_HEX>=0x03000000
+    0, /* tp_reserved in 3.0.1 */
+#else
+    (cmpfunc)SwigPyPacked_compare,         /* tp_compare */
+#endif
+       (reprfunc)SwigPyPacked_repr,        /* tp_repr */
+       0,                                  /* tp_as_number */
        0,                                  /* tp_as_sequence */
-       0,                                  /* tp_as_mapping */ 
-       (hashfunc)0,                        /* tp_hash */       
-       (ternaryfunc)0,                     /* tp_call */       
-       (reprfunc)PySwigPacked_str,         /* tp_str */        
+       0,                                  /* tp_as_mapping */
+       (hashfunc)0,                        /* tp_hash */
+       (ternaryfunc)0,                     /* tp_call */
+       (reprfunc)SwigPyPacked_str,         /* tp_str */
        PyObject_GenericGetAttr,            /* tp_getattro */
        0,                                  /* tp_setattro */
        0,                                  /* tp_as_buffer */
@@ -1842,17 +2021,20 @@ _PySwigPacked_type(void) {
        0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
       };
-    pyswigpacked_type = tmp;
-    pyswigpacked_type.ob_type = &PyType_Type;
+    swigpypacked_type = tmp;
+    /* for Python 3 the ob_type already assigned in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
+    swigpypacked_type.ob_type = &PyType_Type;
+#endif
     type_init = 1;
   }
-  return &pyswigpacked_type;
+  return &swigpypacked_type;
 }
 
 SWIGRUNTIME PyObject *
-PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty)
+SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty)
 {
-  PySwigPacked *sobj = PyObject_NEW(PySwigPacked, PySwigPacked_type());
+  SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type());
   if (sobj) {
     void *pack = malloc(size);
     if (pack) {
@@ -1869,10 +2051,10 @@ PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty)
 }
 
 SWIGRUNTIME swig_type_info *
-PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
+SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
 {
-  if (PySwigPacked_Check(obj)) {
-    PySwigPacked *sobj = (PySwigPacked *)obj;
+  if (SwigPyPacked_Check(obj)) {
+    SwigPyPacked *sobj = (SwigPyPacked *)obj;
     if (sobj->size != size) return 0;
     memcpy(ptr, sobj->pack, size);
     return sobj->ty;
@@ -1888,7 +2070,7 @@ PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
 SWIGRUNTIMEINLINE PyObject *
 _SWIG_This(void)
 {
-  return PyString_FromString("this");
+    return SWIG_Python_str_FromChar("this");
 }
 
 SWIGRUNTIME PyObject *
@@ -1900,11 +2082,16 @@ SWIG_This(void)
 
 /* #define SWIG_PYTHON_SLOW_GETSET_THIS */
 
-SWIGRUNTIME PySwigObject *
+/* TODO: I don't know how to implement the fast getset in Python 3 right now */
+#if PY_VERSION_HEX>=0x03000000
+#define SWIG_PYTHON_SLOW_GETSET_THIS 
+#endif
+
+SWIGRUNTIME SwigPyObject *
 SWIG_Python_GetSwigThis(PyObject *pyobj) 
 {
-  if (PySwigObject_Check(pyobj)) {
-    return (PySwigObject *) pyobj;
+  if (SwigPyObject_Check(pyobj)) {
+    return (SwigPyObject *) pyobj;
   } else {
     PyObject *obj = 0;
 #if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
@@ -1940,12 +2127,12 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
       return 0;
     }
 #endif
-    if (obj && !PySwigObject_Check(obj)) {
+    if (obj && !SwigPyObject_Check(obj)) {
       /* a PyObject is called 'this', try to get the 'real this'
-        PySwigObject from it */ 
+        SwigPyObject from it */ 
       return SWIG_Python_GetSwigThis(obj);
     }
-    return (PySwigObject *)obj;
+    return (SwigPyObject *)obj;
   }
 }
 
@@ -1953,8 +2140,8 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own) {
-    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+  if (own == SWIG_POINTER_OWN) {
+    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
       sobj->own = own;
@@ -1973,7 +2160,9 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     if (ptr) *ptr = 0;
     return SWIG_OK;
   } else {
-    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -1985,9 +2174,17 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
        } else {
          swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
          if (!tc) {
-           sobj = (PySwigObject *)sobj->next;
+           sobj = (SwigPyObject *)sobj->next;
          } else {
-           if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+           if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
+              }
+            }
            break;
          }
        }
@@ -1997,7 +2194,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
       }
     }
     if (sobj) {
-      if (own) *own = sobj->own;
+      if (own)
+        *own = *own | sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
        sobj->own = 0;
       }
@@ -2005,7 +2203,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     } else {
       int res = SWIG_ERROR;
       if (flags & SWIG_POINTER_IMPLICIT_CONV) {
-       PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
        if (data && !data->implicitconv) {
          PyObject *klass = data->klass;
          if (klass) {
@@ -2018,7 +2216,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
              impconv = 0;
            }
            if (impconv) {
-             PySwigObject *iobj = SWIG_Python_GetSwigThis(impconv);
+             SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
              if (iobj) {
                void *vptr;
                res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
@@ -2062,8 +2260,13 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (!tc) return SWIG_ERROR;
-      *ptr = SWIG_TypeCast(tc,vptr);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
     } else {
       *ptr = vptr;
     }
@@ -2075,7 +2278,7 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
 
 SWIGRUNTIME int
 SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
-  swig_type_info *to = PySwigPacked_UnpackData(obj, ptr, sz);
+  swig_type_info *to = SwigPyPacked_UnpackData(obj, ptr, sz);
   if (!to) return SWIG_ERROR;
   if (ty) {
     if (to != ty) {
@@ -2097,7 +2300,7 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *t
 */
 
 SWIGRUNTIME PyObject* 
-SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this)
+SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 {
 #if (PY_VERSION_HEX >= 0x02020000)
   PyObject *inst = 0;
@@ -2121,10 +2324,16 @@ SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this)
 #endif
     }
   } else {
+#if PY_VERSION_HEX >= 0x03000000
+    inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
+    PyObject_SetAttr(inst, SWIG_This(), swig_this);
+    Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+#else
     PyObject *dict = PyDict_New();
     PyDict_SetItem(dict, SWIG_This(), swig_this);
     inst = PyInstance_NewRaw(data->newargs, dict);
     Py_DECREF(dict);
+#endif
   }
   return inst;
 #else
@@ -2187,9 +2396,9 @@ SWIG_Python_InitShadowInstance(PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) {
     return NULL;
   } else {
-    PySwigObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
+    SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
     if (sthis) {
-      PySwigObject_append((PyObject*) sthis, obj[1]);
+      SwigPyObject_append((PyObject*) sthis, obj[1]);
     } else {
       SWIG_Python_SetSwigThis(obj[0], obj[1]);
     }
@@ -2205,8 +2414,8 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
     return SWIG_Py_Void();
   } else {
     int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
-    PyObject *robj = PySwigObject_New(ptr, type, own);
-    PySwigClientData *clientdata = type ? (PySwigClientData *)(type->clientdata) : 0;
+    PyObject *robj = SwigPyObject_New(ptr, type, own);
+    SwigPyClientData *clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
     if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
       PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
       if (inst) {
@@ -2222,7 +2431,7 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
 
 SWIGRUNTIMEINLINE PyObject *
 SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
-  return ptr ? PySwigPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
+  return ptr ? SwigPyPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
 }
 
 /* -----------------------------------------------------------------------------*
@@ -2293,8 +2502,8 @@ SWIG_Python_DestroyModule(void *vptr)
   for (i =0; i < swig_module->size; ++i) {
     swig_type_info *ty = types[i];
     if (ty->owndata) {
-      PySwigClientData *data = (PySwigClientData *) ty->clientdata;
-      if (data) PySwigClientData_Del(data);
+      SwigPyClientData *data = (SwigPyClientData *) ty->clientdata;
+      if (data) SwigPyClientData_Del(data);
     }
   }
   Py_DECREF(SWIG_This());
@@ -2304,8 +2513,13 @@ SWIGRUNTIME void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
   static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
 
+#if PY_VERSION_HEX >= 0x03000000
+ /* Add a dummy module object into sys.modules */
+  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
+#else
   PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
                                   swig_empty_runtime_method_table);
+#endif
   PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
   if (pointer && module) {
     PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
@@ -2325,7 +2539,7 @@ SWIGRUNTIME swig_type_info *
 SWIG_Python_TypeQuery(const char *type)
 {
   PyObject *cache = SWIG_Python_TypeCache();
-  PyObject *key = PyString_FromString(type); 
+  PyObject *key = SWIG_Python_str_FromChar(type); 
   PyObject *obj = PyDict_GetItem(cache, key);
   swig_type_info *descriptor;
   if (obj) {
@@ -2352,21 +2566,23 @@ SWIG_Python_TypeQuery(const char *type)
 
 SWIGRUNTIME int
 SWIG_Python_AddErrMesg(const char* mesg, int infront)
-{
+{  
   if (PyErr_Occurred()) {
     PyObject *type = 0;
     PyObject *value = 0;
     PyObject *traceback = 0;
     PyErr_Fetch(&type, &value, &traceback);
     if (value) {
+      char *tmp;
       PyObject *old_str = PyObject_Str(value);
       Py_XINCREF(type);
       PyErr_Clear();
       if (infront) {
-       PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str));
+       PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
       } else {
-       PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+       PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
       }
+      SWIG_Python_str_DelForPy3(tmp);
       Py_DECREF(old_str);
     }
     return 1;
@@ -2389,9 +2605,9 @@ SWIG_Python_ArgFail(int argnum)
 }
 
 SWIGRUNTIMEINLINE const char *
-PySwigObject_GetDesc(PyObject *self)
+SwigPyObject_GetDesc(PyObject *self)
 {
-  PySwigObject *v = (PySwigObject *)self;
+  SwigPyObject *v = (SwigPyObject *)self;
   swig_type_info *ty = v ? v->ty : 0;
   return ty ? ty->str : (char*)"";
 }
@@ -2401,10 +2617,10 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
 {
   if (type) {
 #if defined(SWIG_COBJECT_TYPES)
-    if (obj && PySwigObject_Check(obj)) {
-      const char *otype = (const char *) PySwigObject_GetDesc(obj);
+    if (obj && SwigPyObject_Check(obj)) {
+      const char *otype = (const char *) SwigPyObject_GetDesc(obj);
       if (otype) {
-       PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received",
+       PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'SwigPyObject(%s)' is received",
                     type, otype);
        return;
       }
@@ -2414,10 +2630,11 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
       const char *otype = (obj ? obj->ob_type->tp_name : 0); 
       if (otype) {
        PyObject *str = PyObject_Str(obj);
-       const char *cstr = str ? PyString_AsString(str) : 0;
+       const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0;
        if (cstr) {
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
                       type, otype, cstr);
+          SWIG_Python_str_DelForPy3(cstr);
        } else {
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
@@ -2439,10 +2656,12 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
   void *result;
   if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
     PyErr_Clear();
-    if (flags & SWIG_POINTER_EXCEPTION) {
+#if SWIG_POINTER_EXCEPTION
+    if (flags) {
       SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
       SWIG_Python_ArgFail(argnum);
     }
+#endif
   }
   return result;
 }
@@ -2587,20 +2806,20 @@ double PyFloat_AS_DOUBLE (PyObject *obj) {
 #define SWIGTYPE_p_CvSubdiv2DPointLocation swig_types[88]
 #define SWIGTYPE_p_CvTermCriteria swig_types[89]
 #define SWIGTYPE_p_CvTreeNodeIterator swig_types[90]
-#define SWIGTYPE_p_CvTupleTCvPoint_2_t swig_types[91]
-#define SWIGTYPE_p_CvTupleTfloat_2_t swig_types[92]
-#define SWIGTYPE_p_CvTupleTfloat_3_t swig_types[93]
+#define SWIGTYPE_p_CvTupleT_CvPoint_2_t swig_types[91]
+#define SWIGTYPE_p_CvTupleT_float_2_t swig_types[92]
+#define SWIGTYPE_p_CvTupleT_float_3_t swig_types[93]
 #define SWIGTYPE_p_CvType swig_types[94]
 #define SWIGTYPE_p_CvTypeInfo swig_types[95]
-#define SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t swig_types[96]
-#define SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t swig_types[97]
-#define SWIGTYPE_p_CvTypedSeqTCvPoint_t swig_types[98]
-#define SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t swig_types[99]
-#define SWIGTYPE_p_CvTypedSeqTCvRect_t swig_types[100]
-#define SWIGTYPE_p_CvTypedSeqTCvSeq_p_t swig_types[101]
-#define SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t swig_types[102]
-#define SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t swig_types[103]
-#define SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t swig_types[104]
+#define SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t swig_types[96]
+#define SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t swig_types[97]
+#define SWIGTYPE_p_CvTypedSeqT_CvPoint_t swig_types[98]
+#define SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[99]
+#define SWIGTYPE_p_CvTypedSeqT_CvRect_t swig_types[100]
+#define SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t swig_types[101]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[102]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[103]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[104]
 #define SWIGTYPE_p__CvContourScanner swig_types[105]
 #define SWIGTYPE_p__IplConvKernel swig_types[106]
 #define SWIGTYPE_p__IplConvKernelFP swig_types[107]
@@ -2651,15 +2870,15 @@ double PyFloat_AS_DOUBLE (PyObject *obj) {
 #define SWIGTYPE_p_p_CvStereoBMState swig_types[152]
 #define SWIGTYPE_p_p_CvStereoGCState swig_types[153]
 #define SWIGTYPE_p_p_CvSubdiv2DPoint swig_types[154]
-#define SWIGTYPE_p_p_CvTypedSeqTCvConnectedComp_t swig_types[155]
-#define SWIGTYPE_p_p_CvTypedSeqTCvPoint2D32f_t swig_types[156]
-#define SWIGTYPE_p_p_CvTypedSeqTCvPoint_t swig_types[157]
-#define SWIGTYPE_p_p_CvTypedSeqTCvQuadEdge2D_t swig_types[158]
-#define SWIGTYPE_p_p_CvTypedSeqTCvRect_t swig_types[159]
-#define SWIGTYPE_p_p_CvTypedSeqTCvSeq_p_t swig_types[160]
-#define SWIGTYPE_p_p_CvTypedSeqTCvTupleTCvPoint_2_t_t swig_types[161]
-#define SWIGTYPE_p_p_CvTypedSeqTCvTupleTfloat_2_t_t swig_types[162]
-#define SWIGTYPE_p_p_CvTypedSeqTCvTupleTfloat_3_t_t swig_types[163]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvConnectedComp_t swig_types[155]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvPoint2D32f_t swig_types[156]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvPoint_t swig_types[157]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[158]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvRect_t swig_types[159]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvSeq_p_t swig_types[160]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[161]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[162]
+#define SWIGTYPE_p_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[163]
 #define SWIGTYPE_p_p_PyObject swig_types[164]
 #define SWIGTYPE_p_p__CvContourScanner swig_types[165]
 #define SWIGTYPE_p_p__IplImage swig_types[166]
@@ -2673,12 +2892,12 @@ double PyFloat_AS_DOUBLE (PyObject *obj) {
 #define SWIGTYPE_p_size_t swig_types[174]
 #define SWIGTYPE_p_size_type swig_types[175]
 #define SWIGTYPE_p_std__invalid_argument swig_types[176]
-#define SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t swig_types[177]
-#define SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__allocator_type swig_types[178]
-#define SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type swig_types[179]
-#define SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t swig_types[180]
-#define SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t__allocator_type swig_types[181]
-#define SWIGTYPE_p_swig__PySwigIterator swig_types[182]
+#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t swig_types[177]
+#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type swig_types[178]
+#define SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type swig_types[179]
+#define SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t swig_types[180]
+#define SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type swig_types[181]
+#define SWIGTYPE_p_swig__SwigPyIterator swig_types[182]
 #define SWIGTYPE_p_unsigned_char swig_types[183]
 #define SWIGTYPE_p_unsigned_int swig_types[184]
 #define SWIGTYPE_p_unsigned_long_long swig_types[185]
@@ -2701,11 +2920,16 @@ static swig_module_info swig_module = {swig_types, 189, 0, 0, 0, 0};
 /*-----------------------------------------------
               @(target):= _cv.so
   ------------------------------------------------*/
-#define SWIG_init    init_cv
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_init    PyInit__cv
+
+#else
+#  define SWIG_init    init_cv
 
+#endif
 #define SWIG_name    "_cv"
 
-#define SWIGVERSION 0x010331 
+#define SWIGVERSION 0x010339 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2717,26 +2941,28 @@ static swig_module_info swig_module = {swig_types, 189, 0, 0, 0, 0};
 
 
 namespace swig {
-  class PyObject_ptr {
+  class SwigPtr_PyObject {
   protected:
     PyObject *_obj;
 
   public:
-    PyObject_ptr() :_obj(0)
+    SwigPtr_PyObject() :_obj(0)
     {
     }
 
-    PyObject_ptr(const PyObject_ptr& item) : _obj(item._obj)
+    SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj)
     {
       Py_XINCREF(_obj);      
     }
     
-    PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj)
+    SwigPtr_PyObject(PyObject *obj, bool initial_ref = true) :_obj(obj)
     {
-      if (initial_ref) Py_XINCREF(_obj);
+      if (initial_ref) {
+        Py_XINCREF(_obj);
+      }
     }
     
-    PyObject_ptr & operator=(const PyObject_ptr& item) 
+    SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) 
     {
       Py_XINCREF(item._obj);
       Py_XDECREF(_obj);
@@ -2744,7 +2970,7 @@ namespace swig {
       return *this;      
     }
     
-    ~PyObject_ptr() 
+    ~SwigPtr_PyObject() 
     {
       Py_XDECREF(_obj);
     }
@@ -2763,10 +2989,10 @@ namespace swig {
 
 
 namespace swig {
-  struct PyObject_var : PyObject_ptr {
-    PyObject_var(PyObject* obj = 0) : PyObject_ptr(obj, false) { }
+  struct SwigVar_PyObject : SwigPtr_PyObject {
+    SwigVar_PyObject(PyObject* obj = 0) : SwigPtr_PyObject(obj, false) { }
     
-    PyObject_var & operator = (PyObject* obj)
+    SwigVar_PyObject & operator = (PyObject* obj)
     {
       Py_XDECREF(_obj);
       _obj = obj;
@@ -3164,14 +3390,12 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
 
 
 #include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN     LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX     LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX    ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
 #endif
 
 
@@ -3254,13 +3478,6 @@ SWIG_AsVal_size_t (PyObject * obj, size_t *val)
 #include <stdexcept>
 
 
-  
-#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
-#  define SWIG_STD_NOASSIGN_STL
-#  define SWIG_STD_NOINSERT_TEMPLATE_STL
-#  define SWIG_STD_NOITERATOR_TRAITS_STL
-#endif
-
 #if defined(__GNUC__)
 #  if __GNUC__ == 2 && __GNUC_MINOR <= 96
 #     define SWIG_STD_NOMODERN_STL
@@ -3268,8 +3485,6 @@ SWIG_AsVal_size_t (PyObject * obj, size_t *val)
 #endif
 
 
-
-
 #include <string>
 #include <stdexcept>
 
@@ -3284,93 +3499,104 @@ namespace swig {
   struct stop_iteration {
   };
 
-  struct PySwigIterator {
+  struct SwigPyIterator {
   private:
-    PyObject_ptr _seq;
+    SwigPtr_PyObject _seq;
 
   protected:
-    PySwigIterator(PyObject *seq) : _seq(seq)
+    SwigPyIterator(PyObject *seq) : _seq(seq)
     {
     }
       
   public:
-    virtual ~PySwigIterator() {}
+    virtual ~SwigPyIterator() {}
 
     // Access iterator method, required by Python
     virtual PyObject *value() const = 0;
 
     // Forward iterator method, required by Python
-    virtual PySwigIterator *incr(size_t n = 1) = 0;
+    virtual SwigPyIterator *incr(size_t n = 1) = 0;
     
     // Backward iterator method, very common in C++, but not required in Python
-    virtual PySwigIterator *decr(size_t n = 1)
+    virtual SwigPyIterator *decr(size_t /*n*/ = 1)
     {
       throw stop_iteration();
     }
 
     // Random access iterator methods, but not required in Python
-    virtual ptrdiff_t distance(const PySwigIterator &x) const
+    virtual ptrdiff_t distance(const SwigPyIterator &/*x*/) const
     {
       throw std::invalid_argument("operation not supported");
     }
 
-    virtual bool equal (const PySwigIterator &x) const
+    virtual bool equal (const SwigPyIterator &/*x*/) const
     {
       throw std::invalid_argument("operation not supported");
     }
     
     // C++ common/needed methods
-    virtual PySwigIterator *copy() const = 0;
+    virtual SwigPyIterator *copy() const = 0;
 
-    PyObject *next()
+    PyObject *next()     
     {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       PyObject *obj = value();
-      incr();
-      return obj;
+      incr();       
+      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
+      return obj;     
+    }
+
+    /* Make an alias for Python 3.x */
+    PyObject *__next__()
+    {
+      return next();
     }
 
     PyObject *previous()
     {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       decr();
-      return value();
+      PyObject *obj = value();
+      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads       
+      return obj;
     }
 
-    PySwigIterator *advance(ptrdiff_t n)
+    SwigPyIterator *advance(ptrdiff_t n)
     {
       return  (n > 0) ?  incr(n) : decr(-n);
     }
       
-    bool operator == (const PySwigIterator& x)  const
+    bool operator == (const SwigPyIterator& x)  const
     {
       return equal(x);
     }
       
-    bool operator != (const PySwigIterator& x) const
+    bool operator != (const SwigPyIterator& x) const
     {
       return ! operator==(x);
     }
       
-    PySwigIterator& operator += (ptrdiff_t n)
+    SwigPyIterator& operator += (ptrdiff_t n)
     {
       return *advance(n);
     }
 
-    PySwigIterator& operator -= (ptrdiff_t n)
+    SwigPyIterator& operator -= (ptrdiff_t n)
     {
       return *advance(-n);
     }
       
-    PySwigIterator* operator + (ptrdiff_t n) const
+    SwigPyIterator* operator + (ptrdiff_t n) const
     {
       return copy()->advance(n);
     }
 
-    PySwigIterator* operator - (ptrdiff_t n) const
+    SwigPyIterator* operator - (ptrdiff_t n) const
     {
       return copy()->advance(-n);
     }
       
-    ptrdiff_t operator - (const PySwigIterator& x) const
+    ptrdiff_t operator - (const SwigPyIterator& x) const
     {
       return x.distance(*this);
     }
@@ -3379,7 +3605,7 @@ namespace swig {
       static int init = 0;
       static swig_type_info* desc = 0;
       if (!init) {
-       desc = SWIG_TypeQuery("swig::PySwigIterator *");
+       desc = SWIG_TypeQuery("swig::SwigPyIterator *");
        init = 1;
       }        
       return desc;
@@ -3579,7 +3805,7 @@ namespace swig {
   struct traits_asptr {   
     static int asptr(PyObject *obj, Type **val) {
       Type *p;
-      int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0;
+      int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
       if (SWIG_IsOK(res)) {
        if (val) *val = p;
       }
@@ -3644,7 +3870,7 @@ namespace swig {
       int res = asval(obj, &v);
       if (!obj || !SWIG_IsOK(res)) {
        if (!PyErr_Occurred()) {
-         SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
+         ::SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
        }
        if (throw_error) throw std::invalid_argument("bad type");
       }
@@ -3734,27 +3960,38 @@ namespace std {
     { 
       bool res;
       SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      res = PyObject_Compare(v, w) < 0;
+      res = PyObject_RichCompareBool(v, w, Py_LT) ? true : false;
+      /* This may fall into a case of inconsistent
+               eg. ObjA > ObjX > ObjB
+               but ObjA < ObjB
+      */
+      if( PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_TypeError) )
+      {
+        /* Objects can't be compared, this mostly occured in Python 3.0 */
+        /* Compare their ptr directly for a workaround */
+        res = (v < w);
+        PyErr_Clear();
+      }
       SWIG_PYTHON_THREAD_END_BLOCK;
       return res;
     }
   };
 
   template <>
-  struct less <swig::PyObject_ptr>: public binary_function<swig::PyObject_ptr, swig::PyObject_ptr, bool>
+  struct less <swig::SwigPtr_PyObject>: public binary_function<swig::SwigPtr_PyObject, swig::SwigPtr_PyObject, bool>
   {
     bool
-    operator()(const swig::PyObject_ptr& v, const swig::PyObject_ptr& w) const
+    operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const
     {
       return std::less<PyObject *>()(v, w);
     }
   };
 
   template <>
-  struct less <swig::PyObject_var>: public binary_function<swig::PyObject_var, swig::PyObject_var, bool>
+  struct less <swig::SwigVar_PyObject>: public binary_function<swig::SwigVar_PyObject, swig::SwigVar_PyObject, bool>
   {
     bool
-    operator()(const swig::PyObject_var& v, const swig::PyObject_var& w) const
+    operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const
     {
       return std::less<PyObject *>()(v, w);
     }
@@ -3896,23 +4133,27 @@ namespace swig {
 }
 
 
+#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
+#  if !defined(SWIG_NO_STD_NOITERATOR_TRAITS_STL)
+#    define SWIG_STD_NOITERATOR_TRAITS_STL
+#  endif
+#endif
+
 #if !defined(SWIG_STD_NOITERATOR_TRAITS_STL)
 #include <iterator>
 #else
-namespace std  {
+namespace std {
   template <class Iterator>
   struct iterator_traits {
     typedef ptrdiff_t difference_type;
     typedef typename Iterator::value_type value_type;
   };
 
-#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
   template <class Iterator, class Category,class T, class Reference, class Pointer, class Distance>
   struct iterator_traits<__reverse_bi_iterator<Iterator,Category,T,Reference,Pointer,Distance> > {
     typedef Distance difference_type;
     typedef T value_type;
   };
-#endif  
 
   template <class T>
   struct iterator_traits<T*> {
@@ -3930,22 +4171,21 @@ namespace std  {
     }
     return __n;
   }
-
-} 
+}
 #endif
 
 
 namespace swig {
   template<typename OutIterator>
-  class PySwigIterator_T :  public PySwigIterator
+  class SwigPyIterator_T :  public SwigPyIterator
   {
   public:
     typedef OutIterator out_iterator;
     typedef typename std::iterator_traits<out_iterator>::value_type value_type;    
-    typedef PySwigIterator_T<out_iterator> self_type;
+    typedef SwigPyIterator_T<out_iterator> self_type;
 
-    PySwigIterator_T(out_iterator curr, PyObject *seq)
-      : PySwigIterator(seq), current(curr)
+    SwigPyIterator_T(out_iterator curr, PyObject *seq)
+      : SwigPyIterator(seq), current(curr)
     {
     }
 
@@ -3955,7 +4195,7 @@ namespace swig {
     }
 
     
-    bool equal (const PySwigIterator &iter) const
+    bool equal (const SwigPyIterator &iter) const
     {
       const self_type *iters = dynamic_cast<const self_type *>(&iter);
       if (iters) {
@@ -3965,7 +4205,7 @@ namespace swig {
       }
     }
     
-    ptrdiff_t distance(const PySwigIterator &iter) const
+    ptrdiff_t distance(const SwigPyIterator &iter) const
     {
       const self_type *iters = dynamic_cast<const self_type *>(&iter);
       if (iters) {
@@ -3993,17 +4233,17 @@ namespace swig {
   template<typename OutIterator, 
           typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
           typename FromOper = from_oper<ValueType> >
-  class PySwigIteratorOpen_T :  public PySwigIterator_T<OutIterator>
+  class SwigPyIteratorOpen_T :  public SwigPyIterator_T<OutIterator>
   {
   public:
     FromOper from;
     typedef OutIterator out_iterator;
     typedef ValueType value_type;
-    typedef PySwigIterator_T<out_iterator>  base;
-    typedef PySwigIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
+    typedef SwigPyIterator_T<out_iterator>  base;
+    typedef SwigPyIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
     
-    PySwigIteratorOpen_T(out_iterator curr, PyObject *seq)
-      : PySwigIterator_T<OutIterator>(curr, seq)
+    SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq)
+      : SwigPyIterator_T<OutIterator>(curr, seq)
     {
     }
     
@@ -4011,12 +4251,12 @@ namespace swig {
       return from(static_cast<const value_type&>(*(base::current)));
     }
     
-    PySwigIterator *copy() const
+    SwigPyIterator *copy() const
     {
       return new self_type(*this);
     }
 
-    PySwigIterator *incr(size_t n = 1)
+    SwigPyIterator *incr(size_t n = 1)
     {
       while (n--) {
        ++base::current;
@@ -4024,7 +4264,7 @@ namespace swig {
       return this;
     }
 
-    PySwigIterator *decr(size_t n = 1)
+    SwigPyIterator *decr(size_t n = 1)
     {
       while (n--) {
        --base::current;
@@ -4036,17 +4276,17 @@ namespace swig {
   template<typename OutIterator, 
           typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
           typename FromOper = from_oper<ValueType> >
-  class PySwigIteratorClosed_T :  public PySwigIterator_T<OutIterator>
+  class SwigPyIteratorClosed_T :  public SwigPyIterator_T<OutIterator>
   {
   public:
     FromOper from;
     typedef OutIterator out_iterator;
     typedef ValueType value_type;
-    typedef PySwigIterator_T<out_iterator>  base;    
-    typedef PySwigIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
+    typedef SwigPyIterator_T<out_iterator>  base;    
+    typedef SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
     
-    PySwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
-      : PySwigIterator_T<OutIterator>(curr, seq), begin(first), end(last)
+    SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
+      : SwigPyIterator_T<OutIterator>(curr, seq), begin(first), end(last)
     {
     }
     
@@ -4058,12 +4298,12 @@ namespace swig {
       }
     }
     
-    PySwigIterator *copy() const
+    SwigPyIterator *copy() const
     {
       return new self_type(*this);
     }
 
-    PySwigIterator *incr(size_t n = 1)
+    SwigPyIterator *incr(size_t n = 1)
     {
       while (n--) {
        if (base::current == end) {
@@ -4075,7 +4315,7 @@ namespace swig {
       return this;
     }
 
-    PySwigIterator *decr(size_t n = 1)
+    SwigPyIterator *decr(size_t n = 1)
     {
       while (n--) {
        if (base::current == begin) {
@@ -4093,17 +4333,17 @@ namespace swig {
   };
 
   template<typename OutIter>
-  inline PySwigIterator*
+  inline SwigPyIterator*
   make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
   {
-    return new PySwigIteratorClosed_T<OutIter>(current, begin, end, seq);
+    return new SwigPyIteratorClosed_T<OutIter>(current, begin, end, seq);
   }
 
   template<typename OutIter>
-  inline PySwigIterator*
+  inline SwigPyIterator*
   make_output_iterator(const OutIter& current, PyObject *seq = 0)
   {
-    return new PySwigIteratorOpen_T<OutIter>(current, seq);
+    return new SwigPyIteratorOpen_T<OutIter>(current, seq);
   }
 }
 
@@ -4111,23 +4351,23 @@ namespace swig {
 namespace swig
 {
   template <class T>
-  struct PySequence_Ref
+  struct SwigPySequence_Ref
   {
-    PySequence_Ref(PyObject* seq, int index)
+    SwigPySequence_Ref(PyObject* seq, int index)
       : _seq(seq), _index(index)
     {
     }
     
     operator T () const
     {
-      swig::PyObject_var item = PySequence_GetItem(_seq, _index);
+      swig::SwigVar_PyObject item = PySequence_GetItem(_seq, _index);
       try {
        return swig::as<T>(item, true);
       } catch (std::exception& e) {
        char msg[1024];
        sprintf(msg, "in sequence element %d ", _index);
        if (!PyErr_Occurred()) {
-         SWIG_Error(SWIG_TypeError,  swig::type_name<T>());
+         ::SWIG_Error(SWIG_TypeError,  swig::type_name<T>());
        }
        SWIG_Python_AddErrorMsg(msg);
        SWIG_Python_AddErrorMsg(e.what());
@@ -4135,7 +4375,7 @@ namespace swig
       }
     }
 
-    PySequence_Ref& operator=(const T& v)
+    SwigPySequence_Ref& operator=(const T& v)
     {
       PySequence_SetItem(_seq, _index, swig::from<T>(v));
       return *this;
@@ -4147,18 +4387,18 @@ namespace swig
   };
 
   template <class T>
-  struct PySequence_ArrowProxy
+  struct SwigPySequence_ArrowProxy
   {
-    PySequence_ArrowProxy(const T& x): m_value(x) {}
+    SwigPySequence_ArrowProxy(const T& x): m_value(x) {}
     const T* operator->() const { return &m_value; }
     operator const T*() const { return &m_value; }
     T m_value;
   };
 
   template <class T, class Reference >
-  struct PySequence_InputIterator
+  struct SwigPySequence_InputIterator
   {
-    typedef PySequence_InputIterator<T, Reference > self;
+    typedef SwigPySequence_InputIterator<T, Reference > self;
 
     typedef std::random_access_iterator_tag iterator_category;
     typedef Reference reference;
@@ -4166,11 +4406,11 @@ namespace swig
     typedef T* pointer;
     typedef int difference_type;
 
-    PySequence_InputIterator()
+    SwigPySequence_InputIterator()
     {
     }
 
-    PySequence_InputIterator(PyObject* seq, int index)
+    SwigPySequence_InputIterator(PyObject* seq, int index)
       : _seq(seq), _index(index)
     {
     }
@@ -4180,9 +4420,9 @@ namespace swig
       return reference(_seq, _index);
     }
 
-    PySequence_ArrowProxy<T>
+    SwigPySequence_ArrowProxy<T>
     operator->() const {
-      return PySequence_ArrowProxy<T>(operator*());
+      return SwigPySequence_ArrowProxy<T>(operator*());
     }
 
     bool operator==(const self& ri) const
@@ -4251,19 +4491,19 @@ namespace swig
   };
 
   template <class T>
-  struct PySequence_Cont
+  struct SwigPySequence_Cont
   {
-    typedef PySequence_Ref<T> reference;
-    typedef const PySequence_Ref<T> const_reference;
+    typedef SwigPySequence_Ref<T> reference;
+    typedef const SwigPySequence_Ref<T> const_reference;
     typedef T value_type;
     typedef T* pointer;
     typedef int difference_type;
     typedef int size_type;
     typedef const pointer const_pointer;
-    typedef PySequence_InputIterator<T, reference> iterator;
-    typedef PySequence_InputIterator<T, const_reference> const_iterator;
+    typedef SwigPySequence_InputIterator<T, reference> iterator;
+    typedef SwigPySequence_InputIterator<T, const_reference> const_iterator;
 
-    PySequence_Cont(PyObject* seq) : _seq(0)
+    SwigPySequence_Cont(PyObject* seq) : _seq(0)
     {
       if (!PySequence_Check(seq)) {
        throw std::invalid_argument("a sequence is expected");
@@ -4272,14 +4512,14 @@ namespace swig
       Py_INCREF(_seq);
     }
 
-    ~PySequence_Cont()
+    ~SwigPySequence_Cont()
     {
-      if (_seq) Py_DECREF(_seq);
+      Py_XDECREF(_seq);
     }
 
     size_type size() const
     {
-      return PySequence_Size(_seq);
+      return static_cast<size_type>(PySequence_Size(_seq));
     }
 
     bool empty() const
@@ -4321,7 +4561,7 @@ namespace swig
     {
       int s = size();
       for (int i = 0; i < s; ++i) {
-       swig::PyObject_var item = PySequence_GetItem(_seq, i);
+       swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i);
        if (!swig::check<value_type>(item)) {
          if (set_err) {
            char msg[1024];
@@ -4388,18 +4628,15 @@ namespace swig {
 
 
 namespace swig {
-  template <class PySeq, class Seq>
+  template <class SwigPySeq, class Seq>
   inline void
-  assign(const PySeq& pyseq, Seq* seq) {
-#ifdef SWIG_STD_NOASSIGN_STL
-    typedef typename PySeq::value_type value_type;
-    typename PySeq::const_iterator it = pyseq.begin();
-    for (;it != pyseq.end(); ++it) {
+  assign(const SwigPySeq& swigpyseq, Seq* seq) {
+    // seq->assign(swigpyseq.begin(), swigpyseq.end()); // not used as not always implemented
+    typedef typename SwigPySeq::value_type value_type;
+    typename SwigPySeq::const_iterator it = swigpyseq.begin();
+    for (;it != swigpyseq.end(); ++it) {
       seq->insert(seq->end(),(value_type)(*it));
     }
-#else
-    seq->assign(pyseq.begin(), pyseq.end());
-#endif
   }
 
   template <class Seq, class T = typename Seq::value_type >
@@ -4408,16 +4645,23 @@ namespace swig {
     typedef T value_type;
 
     static int asptr(PyObject *obj, sequence **seq) {
-      if (PySequence_Check(obj)) {
+      if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
+       sequence *p;
+       if (::SWIG_ConvertPtr(obj,(void**)&p,
+                             swig::type_info<sequence>(),0) == SWIG_OK) {
+         if (seq) *seq = p;
+         return SWIG_OLDOBJ;
+       }
+      } else if (PySequence_Check(obj)) {
        try {
-         PySequence_Cont<value_type> pyseq(obj);
+         SwigPySequence_Cont<value_type> swigpyseq(obj);
          if (seq) {
            sequence *pseq = new sequence();
-           assign(pyseq, pseq);
+           assign(swigpyseq, pseq);
            *seq = pseq;
            return SWIG_NEWOBJ;
          } else {
-           return pyseq.check() ? SWIG_OK : SWIG_ERROR;
+           return swigpyseq.check() ? SWIG_OK : SWIG_ERROR;
          }
        } catch (std::exception& e) {
          if (seq) {
@@ -4427,13 +4671,6 @@ namespace swig {
          }
          return SWIG_ERROR;
        }
-      } else {
-       sequence *p;
-       if (SWIG_ConvertPtr(obj,(void**)&p,
-                           swig::type_info<sequence>(),0) == SWIG_OK) {
-         if (seq) *seq = p;
-         return SWIG_OLDOBJ;
-       }
       }
       return SWIG_ERROR;
     }
@@ -4447,12 +4684,12 @@ namespace swig {
     typedef typename sequence::const_iterator const_iterator;
 
     static PyObject *from(const sequence& seq) {
-
-
-
-
-
-
+#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS
+      swig_type_info *desc = swig::type_info<sequence>();
+      if (desc && desc->clientdata) {
+       return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
+      }
+#endif
       size_type size = seq.size();
       if (size <= (size_type)INT_MAX) {
        PyObject *obj = PyTuple_New((int)size);
@@ -4489,21 +4726,24 @@ namespace swig {
 
 
       namespace swig {
-       template <>  struct traits<std::vector<float, std::allocator<float > > > {
+       template <>  struct traits<std::vector<float, std::allocator< float > > > {
          typedef pointer_category category;
          static const char* type_name() {
-           return "std::vector<" "float" "," "std::allocator<float >" " >";
+           return "std::vector<" "float" "," "std::allocator< float >" " >";
          }
        };
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_float_Sg__iterator(std::vector<float > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::SwigPyIterator *std_vector_Sl_float_Sg__iterator(std::vector< float > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_float_Sg____nonzero__(std::vector<float > const *self){
+SWIGINTERN bool std_vector_Sl_float_Sg____nonzero__(std::vector< float > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN bool std_vector_Sl_float_Sg____bool__(std::vector< float > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<float >::size_type std_vector_Sl_float_Sg____len__(std::vector<float > const *self){
+SWIGINTERN std::vector< float >::size_type std_vector_Sl_float_Sg____len__(std::vector< float > const *self){
       return self->size();
     }
 
@@ -4521,32 +4761,59 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
-SWIGINTERN std::vector<float >::value_type std_vector_Sl_float_Sg__pop(std::vector<float > *self){
+SWIGINTERN std::vector< float >::value_type std_vector_Sl_float_Sg__pop(std::vector< float > *self){
       if (self->size() == 0)
        throw std::out_of_range("pop from empty container");
-      std::vector<float,std::allocator<float > >::value_type x = self->back();
+      std::vector<float,std::allocator< float > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<float,std::allocator<float > > *std_vector_Sl_float_Sg____getslice__(std::vector<float > *self,std::vector<float >::difference_type i,std::vector<float >::difference_type j){
+SWIGINTERN std::vector< float,std::allocator< float > > *std_vector_Sl_float_Sg____getslice__(std::vector< float > *self,std::vector< float >::difference_type i,std::vector< float >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_float_Sg____setslice__(std::vector<float > *self,std::vector<float >::difference_type i,std::vector<float >::difference_type j,std::vector<float,std::allocator<float > > const &v){
+SWIGINTERN void std_vector_Sl_float_Sg____setslice__(std::vector< float > *self,std::vector< float >::difference_type i,std::vector< float >::difference_type j,std::vector< float,std::allocator< float > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_float_Sg____delslice__(std::vector<float > *self,std::vector<float >::difference_type i,std::vector<float >::difference_type j){
+SWIGINTERN void std_vector_Sl_float_Sg____delslice__(std::vector< float > *self,std::vector< float >::difference_type i,std::vector< float >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_float_Sg____delitem__(std::vector<float > *self,std::vector<float >::difference_type i){
+SWIGINTERN void std_vector_Sl_float_Sg____delitem____SWIG_0(std::vector< float > *self,std::vector< float >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<float >::value_type const &std_vector_Sl_float_Sg____getitem__(std::vector<float > const *self,std::vector<float >::difference_type i){
+SWIGINTERN std::vector< float,std::allocator< float > > *std_vector_Sl_float_Sg____getitem____SWIG_0(std::vector< float > *self,PySliceObject *slice){
+      Py_ssize_t i, j, step;
+      if( !PySlice_Check(slice) ) {
+        SWIG_Error(SWIG_TypeError, "Slice object expected.");
+        return NULL;
+      }
+      PySlice_GetIndices(slice, self->size(), &i, &j, &step);
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_float_Sg____setitem____SWIG_0(std::vector< float > *self,PySliceObject *slice,std::vector< float,std::allocator< float > > const &v){
+      Py_ssize_t i, j, step;
+      if( !PySlice_Check(slice) ) {
+        SWIG_Error(SWIG_TypeError, "Slice object expected.");
+        return;
+      }
+      PySlice_GetIndices(slice, self->size(), &i, &j, &step);
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_float_Sg____delitem____SWIG_1(std::vector< float > *self,PySliceObject *slice){
+      Py_ssize_t i, j, step;
+      if( !PySlice_Check(slice) ) {
+        SWIG_Error(SWIG_TypeError, "Slice object expected.");
+        return;
+      }
+      PySlice_GetIndices(slice, self->size(), &i, &j, &step);
+      swig::delslice(self, i,j);
+    }
+SWIGINTERN std::vector< float >::value_type const &std_vector_Sl_float_Sg____getitem____SWIG_1(std::vector< float > const *self,std::vector< float >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_float_Sg____setitem__(std::vector<float > *self,std::vector<float >::difference_type i,std::vector<float >::value_type const &x){
+SWIGINTERN void std_vector_Sl_float_Sg____setitem____SWIG_1(std::vector< float > *self,std::vector< float >::difference_type i,std::vector< float >::value_type const &x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_float_Sg__append(std::vector<float > *self,std::vector<float >::value_type const &x){
+SWIGINTERN void std_vector_Sl_float_Sg__append(std::vector< float > *self,std::vector< float >::value_type const &x){
       self->push_back(x);
     }
 
@@ -4559,49 +4826,79 @@ SWIGINTERN void std_vector_Sl_float_Sg__append(std::vector<float > *self,std::ve
 
 
       namespace swig {
-       template <>  struct traits<std::vector<CvPoint, std::allocator<CvPoint > > > {
+       template <>  struct traits<std::vector<CvPoint, std::allocator< CvPoint > > > {
          typedef pointer_category category;
          static const char* type_name() {
-           return "std::vector<" "CvPoint" "," "std::allocator<CvPoint >" " >";
+           return "std::vector<" "CvPoint" "," "std::allocator< CvPoint >" " >";
          }
        };
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_CvPoint_Sg__iterator(std::vector<CvPoint > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::SwigPyIterator *std_vector_Sl_CvPoint_Sg__iterator(std::vector< CvPoint > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_CvPoint_Sg____nonzero__(std::vector<CvPoint > const *self){
+SWIGINTERN bool std_vector_Sl_CvPoint_Sg____nonzero__(std::vector< CvPoint > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<CvPoint >::size_type std_vector_Sl_CvPoint_Sg____len__(std::vector<CvPoint > const *self){
+SWIGINTERN bool std_vector_Sl_CvPoint_Sg____bool__(std::vector< CvPoint > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN std::vector< CvPoint >::size_type std_vector_Sl_CvPoint_Sg____len__(std::vector< CvPoint > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<CvPoint >::value_type std_vector_Sl_CvPoint_Sg__pop(std::vector<CvPoint > *self){
+SWIGINTERN std::vector< CvPoint >::value_type std_vector_Sl_CvPoint_Sg__pop(std::vector< CvPoint > *self){
       if (self->size() == 0)
        throw std::out_of_range("pop from empty container");
-      std::vector<CvPoint,std::allocator<CvPoint > >::value_type x = self->back();
+      std::vector<CvPoint,std::allocator< CvPoint > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<CvPoint,std::allocator<CvPoint > > *std_vector_Sl_CvPoint_Sg____getslice__(std::vector<CvPoint > *self,std::vector<CvPoint >::difference_type i,std::vector<CvPoint >::difference_type j){
+SWIGINTERN std::vector< CvPoint,std::allocator< CvPoint > > *std_vector_Sl_CvPoint_Sg____getslice__(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i,std::vector< CvPoint >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_CvPoint_Sg____setslice__(std::vector<CvPoint > *self,std::vector<CvPoint >::difference_type i,std::vector<CvPoint >::difference_type j,std::vector<CvPoint,std::allocator<CvPoint > > const &v){
+SWIGINTERN void std_vector_Sl_CvPoint_Sg____setslice__(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i,std::vector< CvPoint >::difference_type j,std::vector< CvPoint,std::allocator< CvPoint > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_CvPoint_Sg____delslice__(std::vector<CvPoint > *self,std::vector<CvPoint >::difference_type i,std::vector<CvPoint >::difference_type j){
+SWIGINTERN void std_vector_Sl_CvPoint_Sg____delslice__(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i,std::vector< CvPoint >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_CvPoint_Sg____delitem__(std::vector<CvPoint > *self,std::vector<CvPoint >::difference_type i){
+SWIGINTERN void std_vector_Sl_CvPoint_Sg____delitem____SWIG_0(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<CvPoint >::value_type const &std_vector_Sl_CvPoint_Sg____getitem__(std::vector<CvPoint > const *self,std::vector<CvPoint >::difference_type i){
+SWIGINTERN std::vector< CvPoint,std::allocator< CvPoint > > *std_vector_Sl_CvPoint_Sg____getitem____SWIG_0(std::vector< CvPoint > *self,PySliceObject *slice){
+      Py_ssize_t i, j, step;
+      if( !PySlice_Check(slice) ) {
+        SWIG_Error(SWIG_TypeError, "Slice object expected.");
+        return NULL;
+      }
+      PySlice_GetIndices(slice, self->size(), &i, &j, &step);
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_CvPoint_Sg____setitem____SWIG_0(std::vector< CvPoint > *self,PySliceObject *slice,std::vector< CvPoint,std::allocator< CvPoint > > const &v){
+      Py_ssize_t i, j, step;
+      if( !PySlice_Check(slice) ) {
+        SWIG_Error(SWIG_TypeError, "Slice object expected.");
+        return;
+      }
+      PySlice_GetIndices(slice, self->size(), &i, &j, &step);
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_CvPoint_Sg____delitem____SWIG_1(std::vector< CvPoint > *self,PySliceObject *slice){
+      Py_ssize_t i, j, step;
+      if( !PySlice_Check(slice) ) {
+        SWIG_Error(SWIG_TypeError, "Slice object expected.");
+        return;
+      }
+      PySlice_GetIndices(slice, self->size(), &i, &j, &step);
+      swig::delslice(self, i,j);
+    }
+SWIGINTERN std::vector< CvPoint >::value_type const &std_vector_Sl_CvPoint_Sg____getitem____SWIG_1(std::vector< CvPoint > const *self,std::vector< CvPoint >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_CvPoint_Sg____setitem__(std::vector<CvPoint > *self,std::vector<CvPoint >::difference_type i,std::vector<CvPoint >::value_type const &x){
+SWIGINTERN void std_vector_Sl_CvPoint_Sg____setitem____SWIG_1(std::vector< CvPoint > *self,std::vector< CvPoint >::difference_type i,std::vector< CvPoint >::value_type const &x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_CvPoint_Sg__append(std::vector<CvPoint > *self,std::vector<CvPoint >::value_type const &x){
+SWIGINTERN void std_vector_Sl_CvPoint_Sg__append(std::vector< CvPoint > *self,std::vector< CvPoint >::value_type const &x){
       self->push_back(x);
     }
 
@@ -4682,7 +4979,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
       return pchar_descriptor ? 
        SWIG_NewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
     } else {
+#if PY_VERSION_HEX >= 0x03000000
+      return PyUnicode_FromStringAndSize(carray, static_cast< int >(size));
+#else
       return PyString_FromStringAndSize(carray, static_cast< int >(size));
+#endif
     }
   } else {
     return SWIG_Py_Void();
@@ -5119,7 +5420,7 @@ SWIGINTERN PyObject *IplImage___getitem__(IplImage *self,PyObject *object){
                            *s = cvGet2D( self, subrect.y, subrect.x );
                                return SWIG_NewPointerObj( s, SWIGTYPE_p_CvScalar, 1 );
                        }
-                       switch(CV_MAT_DEPTH(type)){
+                       switch(((type) & ((1 << 3) - 1))){
                        case 0:
                                return PyLong_FromUnsignedLong( CV_IMAGE_ELEM(self, uchar, subrect.y, subrect.x ) );
                        case 1:
@@ -5465,7 +5766,7 @@ SWIGINTERN char *CvMat___str__(CvMat *self){
 SWIGINTERN void CvMat___setitem____SWIG_0(CvMat *self,PyObject *object,double val){
                CvMat tmp;
                CvRect subrect = PySlice_to_CvRect( self, object );
-               /*@SWIG:CHECK_SLICE_BOUNDS@*/
+               /*@SWIG:./cvarr.i,231,CHECK_SLICE_BOUNDS@*/
     if(CheckSliceBounds(&subrect,self->cols,self->rows)==-1){ return ; } else{}
 /*@SWIG@*/;
                cvGetSubRect(self, &tmp, subrect);
@@ -5474,7 +5775,7 @@ SWIGINTERN void CvMat___setitem____SWIG_0(CvMat *self,PyObject *object,double va
 SWIGINTERN void CvMat___setitem____SWIG_1(CvMat *self,PyObject *object,CvPoint val){
                CvMat tmp;
                CvRect subrect = PySlice_to_CvRect( self, object );
-               /*@SWIG:CHECK_SLICE_BOUNDS@*/
+               /*@SWIG:./cvarr.i,231,CHECK_SLICE_BOUNDS@*/
     if(CheckSliceBounds(&subrect,self->cols,self->rows)==-1){ return ; } else{}
 /*@SWIG@*/;
                cvGetSubRect(self, &tmp, subrect);
@@ -5484,7 +5785,7 @@ SWIGINTERN void CvMat___setitem____SWIG_2(CvMat *self,PyObject *object,CvPoint2D
                CvMat tmp;
                CvRect subrect = PySlice_to_CvRect( self, object );
                cvGetSubRect(self, &tmp, subrect);
-               /*@SWIG:CHECK_SLICE_BOUNDS@*/
+               /*@SWIG:./cvarr.i,231,CHECK_SLICE_BOUNDS@*/
     if(CheckSliceBounds(&subrect,self->cols,self->rows)==-1){ return ; } else{}
 /*@SWIG@*/;
                cvSet(&tmp, cvScalar(val.x, val.y));
@@ -5493,7 +5794,7 @@ SWIGINTERN void CvMat___setitem____SWIG_3(CvMat *self,PyObject *object,CvScalar
                CvMat tmp;
                CvRect subrect = PySlice_to_CvRect( self, object );
                cvGetSubRect(self, &tmp, subrect);
-               /*@SWIG:CHECK_SLICE_BOUNDS@*/
+               /*@SWIG:./cvarr.i,231,CHECK_SLICE_BOUNDS@*/
     if(CheckSliceBounds(&subrect,self->cols,self->rows)==-1){ return ; } else{}
 /*@SWIG@*/;
                cvSet(&tmp, val);
@@ -5501,7 +5802,7 @@ SWIGINTERN void CvMat___setitem____SWIG_3(CvMat *self,PyObject *object,CvScalar
 SWIGINTERN void CvMat___setitem____SWIG_4(CvMat *self,PyObject *object,CvArr *arr){
                CvMat tmp, src_stub, *src;
                CvRect subrect = PySlice_to_CvRect( self, object );
-               /*@SWIG:CHECK_SLICE_BOUNDS@*/
+               /*@SWIG:./cvarr.i,231,CHECK_SLICE_BOUNDS@*/
     if(CheckSliceBounds(&subrect,self->cols,self->rows)==-1){ return ; } else{}
 /*@SWIG@*/;
                cvGetSubRect(self, &tmp, subrect);
@@ -5517,7 +5818,7 @@ SWIGINTERN void CvMat___setitem____SWIG_4(CvMat *self,PyObject *object,CvArr *ar
 SWIGINTERN PyObject *CvMat___getitem__(CvMat *self,PyObject *object){
                CvMat * mat;
                CvRect subrect = PySlice_to_CvRect( self, object );
-               /*@SWIG:CHECK_SLICE_BOUNDS@*/
+               /*@SWIG:./cvarr.i,231,CHECK_SLICE_BOUNDS@*/
     if(CheckSliceBounds(&subrect,self->cols,self->rows)==-1){ return NULL; } else{}
 /*@SWIG@*/;
                if(subrect.width==1 && subrect.height==1){
@@ -5528,7 +5829,7 @@ SWIGINTERN PyObject *CvMat___getitem__(CvMat *self,PyObject *object){
                 *s = cvGet2D( self, subrect.y, subrect.x );
                 return SWIG_NewPointerObj( s, SWIGTYPE_p_CvScalar, 1 );
             }
-            switch(CV_MAT_DEPTH(type)){
+            switch(((type) & ((1 << 3) - 1))){
             case 0:
                 return PyLong_FromUnsignedLong( CV_MAT_ELEM(*self, uchar, subrect.y, subrect.x ) );
             case 1:
@@ -5661,10 +5962,28 @@ SWIGINTERN void delete_CvMemStorage(CvMemStorage *self){ CvMemStorage   * dummy
 SWIGINTERN int
 SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 {
-  if (PyString_Check(obj)) {
+#if PY_VERSION_HEX>=0x03000000
+  if (PyUnicode_Check(obj))
+#else  
+  if (PyString_Check(obj))
+#endif
+  {
     char *cstr; Py_ssize_t len;
+#if PY_VERSION_HEX>=0x03000000
+    if (!alloc && cptr) {
+        /* We can't allow converting without allocation, since the internal
+           representation of string in Python 3 is UCS-2/UCS-4 but we require
+           a UTF-8 representation.
+           TODO(bhy) More detailed explanation */
+        return SWIG_RuntimeError;
+    }
+    obj = PyUnicode_AsUTF8String(obj);
+    PyBytes_AsStringAndSize(obj, &cstr, &len);
+    if(alloc) *alloc = SWIG_NEWOBJ;
+#else
     PyString_AsStringAndSize(obj, &cstr, &len);
-    if (cptr)  {
+#endif
+    if (cptr) {
       if (alloc) {
        /* 
           In python the user should not be able to modify the inner
@@ -5689,10 +6008,16 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
          *alloc = SWIG_OLDOBJ;
        }
       } else {
-       *cptr = PyString_AsString(obj);
+        #if PY_VERSION_HEX>=0x03000000
+        assert(0); /* Should never reach here in Python 3 */
+        #endif
+       *cptr = SWIG_Python_str_AsChar(obj);
       }
     }
     if (psize) *psize = len + 1;
+#if PY_VERSION_HEX>=0x03000000
+    Py_XDECREF(obj);
+#endif
     return SWIG_OK;
   } else {
     swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
@@ -5727,18 +6052,11 @@ SWIGINTERN void delete_CvGraphScanner(CvGraphScanner *self){ CvGraphScanner * du
 SWIGINTERN int
 SWIG_AsVal_bool (PyObject *obj, bool *val)
 {
-  if (obj == Py_True) {
-    if (val) *val = true;
-    return SWIG_OK;
-  } else if (obj == Py_False) {
-    if (val) *val = false;
-    return SWIG_OK;
-  } else {
-    long v = 0;
-    int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
-    if (SWIG_IsOK(res) && val) *val = v ? true : false;
-    return res;
-  }
+  int r = PyObject_IsTrue(obj);
+  if (r == -1)
+    return SWIG_ERROR;
+  if (val) *val = r ? true : false;
+  return SWIG_OK;
 }
 
 
@@ -5791,10 +6109,10 @@ SWIG_From_char  (char c)
   return SWIG_FromCharPtrAndSize(&c,1);
 }
 
-SWIGINTERN CvTypedSeq<CvQuadEdge2D > *CvSubdiv2D_typed_edges_get(CvSubdiv2D *self){
+SWIGINTERN CvTypedSeq< CvQuadEdge2D > *CvSubdiv2D_typed_edges_get(CvSubdiv2D *self){
                return (CvTypedSeq<CvQuadEdge2D> *) self->edges;
        }
-SWIGINTERN void CvSubdiv2D_typed_edges_set(CvSubdiv2D *self,CvTypedSeq<CvQuadEdge2D > *){
+SWIGINTERN void CvSubdiv2D_typed_edges_set(CvSubdiv2D *self,CvTypedSeq< CvQuadEdge2D > *){
        }
 SWIGINTERN void delete_CvConDensation(CvConDensation *self){ CvConDensation * dummy = self; cvReleaseConDensation       (& dummy); }
 SWIGINTERN void delete_CvKalman(CvKalman *self){ CvKalman       * dummy = self; cvReleaseKalman             (& dummy); }
@@ -5833,7 +6151,7 @@ void CvMat_height_set(CvMat * m, int height){
     m->rows = height;
 }
 int CvMat_depth_get(CvMat * m){
-       return cvCvToIplDepth(m->type);
+       return cvIplDepth(m->type);
 }
 void CvMat_depth_set(CvMat *m, int depth){
     cvError(CV_StsNotImplemented, "CvMat_depth_set", "Not Implemented", __FILE__, __LINE__);
@@ -5998,11 +6316,11 @@ extern "C" {
 SWIGINTERN PyObject *_wrap_new_CvRNG_Wrapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG *arg1 = 0 ;
-  CvRNG_Wrapper *result = 0 ;
   CvRNG temp1 ;
   unsigned long long val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG_Wrapper *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvRNG_Wrapper",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_long_SS_long(obj0, &val1);
@@ -6022,10 +6340,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
-  CvRNG *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRNG_Wrapper_ptr",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -6044,10 +6362,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
-  CvRNG *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRNG_Wrapper_ref",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -6055,10 +6373,7 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper_ref" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = reinterpret_cast< CvRNG_Wrapper * >(argp1);
-  {
-    CvRNG &_result_ref = (arg1)->ref();
-    result = (CvRNG *) &_result_ref;
-  }
+  result = (CvRNG *) &(arg1)->ref();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_long_long, 0 |  0 );
   return resultobj;
 fail:
@@ -6070,13 +6385,13 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper___eq__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRNG_Wrapper___eq__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -6104,13 +6419,13 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper___ne__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRNG_Wrapper___ne__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -6149,7 +6464,7 @@ SWIGINTERN PyObject *_wrap_delete_CvRNG_Wrapper(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvRNG_Wrapper * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -6165,7 +6480,7 @@ fail:
 
 SWIGINTERN PyObject *CvRNG_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvRNG_Wrapper, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6173,11 +6488,11 @@ SWIGINTERN PyObject *CvRNG_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self),
 SWIGINTERN PyObject *_wrap_new_CvSubdiv2DEdge_Wrapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge *arg1 = 0 ;
-  CvSubdiv2DEdge_Wrapper *result = 0 ;
   CvSubdiv2DEdge temp1 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge_Wrapper *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvSubdiv2DEdge_Wrapper",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
@@ -6197,10 +6512,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
-  CvSubdiv2DEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DEdge_Wrapper_ptr",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -6219,10 +6534,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
-  CvSubdiv2DEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DEdge_Wrapper_ref",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -6230,10 +6545,7 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ref(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper_ref" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = reinterpret_cast< CvSubdiv2DEdge_Wrapper * >(argp1);
-  {
-    CvSubdiv2DEdge &_result_ref = (arg1)->ref();
-    result = (CvSubdiv2DEdge *) &_result_ref;
-  }
+  result = (CvSubdiv2DEdge *) &(arg1)->ref();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_size_t, 0 |  0 );
   return resultobj;
 fail:
@@ -6245,13 +6557,13 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper___eq__(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSubdiv2DEdge_Wrapper___eq__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -6279,13 +6591,13 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper___ne__(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSubdiv2DEdge_Wrapper___ne__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -6324,7 +6636,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSubdiv2DEdge_Wrapper(PyObject *SWIGUNUSEDPAR
   arg1 = reinterpret_cast< CvSubdiv2DEdge_Wrapper * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -6340,26 +6652,25 @@ fail:
 
 SWIGINTERN PyObject *CvSubdiv2DEdge_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_delete_PySwigIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_SwigPyIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_PySwigIterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_SwigPyIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PySwigIterator" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SwigPyIterator" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   delete arg1;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -6367,22 +6678,22 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_value(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_value(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  PyObject *result = 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_value",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_value",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_value" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_value" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
-    result = (PyObject *)((swig::PySwigIterator const *)arg1)->value();
+    result = (PyObject *)((swig::SwigPyIterator const *)arg1)->value();
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -6399,31 +6710,31 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   size_t arg2 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_incr",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_incr",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_incr" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_incr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator_incr" "', argument " "2"" of type '" "size_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_incr" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   try {
-    result = (swig::PySwigIterator *)(arg1)->incr(arg2);
+    result = (swig::SwigPyIterator *)(arg1)->incr(arg2);
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -6433,29 +6744,29 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  swig::PySwigIterator *result = 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_incr",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_incr",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_incr" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_incr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
-    result = (swig::PySwigIterator *)(arg1)->incr();
+    result = (swig::SwigPyIterator *)(arg1)->incr();
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -6465,36 +6776,36 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[3];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_PySwigIterator_incr__SWIG_1(self, args);
+      return _wrap_SwigPyIterator_incr__SWIG_1(self, args);
     }
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -6502,42 +6813,45 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_PySwigIterator_incr__SWIG_0(self, args);
+        return _wrap_SwigPyIterator_incr__SWIG_0(self, args);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_incr'.\n  Possible C/C++ prototypes are:\n    incr(size_t)\n    incr()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SwigPyIterator_incr'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    incr(swig::SwigPyIterator *,size_t)\n"
+    "    incr(swig::SwigPyIterator *)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   size_t arg2 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_decr",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_decr",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_decr" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_decr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator_decr" "', argument " "2"" of type '" "size_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_decr" "', argument " "2"" of type '" "size_t""'");
   } 
   arg2 = static_cast< size_t >(val2);
   try {
-    result = (swig::PySwigIterator *)(arg1)->decr(arg2);
+    result = (swig::SwigPyIterator *)(arg1)->decr(arg2);
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -6547,29 +6861,29 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  swig::PySwigIterator *result = 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_decr",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_decr",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_decr" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_decr" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
-    result = (swig::PySwigIterator *)(arg1)->decr();
+    result = (swig::SwigPyIterator *)(arg1)->decr();
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -6579,36 +6893,36 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[3];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_PySwigIterator_decr__SWIG_1(self, args);
+      return _wrap_SwigPyIterator_decr__SWIG_1(self, args);
     }
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -6616,45 +6930,48 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_PySwigIterator_decr__SWIG_0(self, args);
+        return _wrap_SwigPyIterator_decr__SWIG_0(self, args);
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_decr'.\n  Possible C/C++ prototypes are:\n    decr(size_t)\n    decr()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SwigPyIterator_decr'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    decr(swig::SwigPyIterator *,size_t)\n"
+    "    decr(swig::SwigPyIterator *)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  swig::PySwigIterator *arg2 = 0 ;
-  ptrdiff_t result;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
+  swig::SwigPyIterator *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  ptrdiff_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_distance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_distance",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_distance" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_distance" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator_distance" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator_distance" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator_distance" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator_distance" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
-  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
+  arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
   try {
-    result = ((swig::PySwigIterator const *)arg1)->distance((swig::PySwigIterator const &)*arg2);
+    result = ((swig::SwigPyIterator const *)arg1)->distance((swig::SwigPyIterator const &)*arg2);
   }
   catch(std::invalid_argument &_e) {
     SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail;
@@ -6667,34 +6984,34 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_equal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  swig::PySwigIterator *arg2 = 0 ;
-  bool result;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
+  swig::SwigPyIterator *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_equal",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_equal",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_equal" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_equal" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator_equal" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator_equal" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator_equal" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator_equal" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
-  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
+  arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
   try {
-    result = (bool)((swig::PySwigIterator const *)arg1)->equal((swig::PySwigIterator const &)*arg2);
+    result = (bool)((swig::SwigPyIterator const *)arg1)->equal((swig::SwigPyIterator const &)*arg2);
   }
   catch(std::invalid_argument &_e) {
     SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail;
@@ -6707,42 +7024,42 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  swig::PySwigIterator *result = 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_copy",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_copy",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_copy" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_copy" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
-  result = (swig::PySwigIterator *)((swig::PySwigIterator const *)arg1)->copy();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
+  result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->copy();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_next(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_next(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  PyObject *result = 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_next",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_next",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_next" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_next" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)(arg1)->next();
   }
@@ -6761,20 +7078,52 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_previous(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___next__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
   PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator___next__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___next__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
+  try {
+    result = (PyObject *)(arg1)->__next__();
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SwigPyIterator_previous(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_previous",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:SwigPyIterator_previous",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_previous" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_previous" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   try {
     result = (PyObject *)(arg1)->previous();
   }
@@ -6793,31 +7142,31 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator_advance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_advance",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator_advance",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_advance" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator_advance" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator_advance" "', argument " "2"" of type '" "ptrdiff_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator_advance" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
-    result = (swig::PySwigIterator *)(arg1)->advance(arg2);
+    result = (swig::SwigPyIterator *)(arg1)->advance(arg2);
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -6827,40 +7176,40 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_advance(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  swig::PySwigIterator *arg2 = 0 ;
-  bool result;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
+  swig::SwigPyIterator *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___eq__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___eq__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator___eq__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___eq__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator___eq__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator___eq__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
-  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
-  result = (bool)((swig::PySwigIterator const *)arg1)->operator ==((swig::PySwigIterator const &)*arg2);
+  arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
+  result = (bool)((swig::SwigPyIterator const *)arg1)->operator ==((swig::SwigPyIterator const &)*arg2);
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -6868,33 +7217,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  swig::PySwigIterator *arg2 = 0 ;
-  bool result;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
+  swig::SwigPyIterator *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___ne__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___ne__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator___ne__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___ne__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator___ne__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator___ne__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
-  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
-  result = (bool)((swig::PySwigIterator const *)arg1)->operator !=((swig::PySwigIterator const &)*arg2);
+  arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
+  result = (bool)((swig::SwigPyIterator const *)arg1)->operator !=((swig::SwigPyIterator const &)*arg2);
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -6902,34 +7251,31 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator___iadd__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___iadd__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___iadd__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___iadd__" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___iadd__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator___iadd__" "', argument " "2"" of type '" "ptrdiff_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___iadd__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
-    {
-      swig::PySwigIterator &_result_ref = (arg1)->operator +=(arg2);
-      result = (swig::PySwigIterator *) &_result_ref;
-    }
+    result = (swig::SwigPyIterator *) &(arg1)->operator +=(arg2);
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -6939,41 +7285,38 @@ SWIGINTERN PyObject *_wrap_PySwigIterator___iadd__(PyObject *SWIGUNUSEDPARM(self
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator___isub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___isub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___isub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___isub__" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___isub__" "', argument " "1"" of type '" "swig::SwigPyIterator *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator___isub__" "', argument " "2"" of type '" "ptrdiff_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___isub__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
-    {
-      swig::PySwigIterator &_result_ref = (arg1)->operator -=(arg2);
-      result = (swig::PySwigIterator *) &_result_ref;
-    }
+    result = (swig::SwigPyIterator *) &(arg1)->operator -=(arg2);
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -6983,38 +7326,38 @@ SWIGINTERN PyObject *_wrap_PySwigIterator___isub__(PyObject *SWIGUNUSEDPARM(self
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___add__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___add__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator___add__" "', argument " "2"" of type '" "ptrdiff_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___add__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
-    result = (swig::PySwigIterator *)((swig::PySwigIterator const *)arg1)->operator +(arg2);
+    result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator +(arg2);
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -7024,38 +7367,38 @@ SWIGINTERN PyObject *_wrap_PySwigIterator___add__(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
   ptrdiff_t arg2 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___sub__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___sub__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator___sub__" "', argument " "2"" of type '" "ptrdiff_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "ptrdiff_t""'");
   } 
   arg2 = static_cast< ptrdiff_t >(val2);
   try {
-    result = (swig::PySwigIterator *)((swig::PySwigIterator const *)arg1)->operator -(arg2);
+    result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator -(arg2);
   }
   catch(swig::stop_iteration &_e) {
     {
@@ -7065,40 +7408,40 @@ SWIGINTERN PyObject *_wrap_PySwigIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPA
     }
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
-  swig::PySwigIterator *arg2 = 0 ;
-  ptrdiff_t result;
+  swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ;
+  swig::SwigPyIterator *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  ptrdiff_t result;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"OO:SwigPyIterator___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__SwigPyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___sub__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SwigPyIterator___sub__" "', argument " "1"" of type '" "swig::SwigPyIterator const *""'"); 
   }
-  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__SwigPyIterator,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator___sub__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator___sub__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); 
   }
-  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
-  result = ((swig::PySwigIterator const *)arg1)->operator -((swig::PySwigIterator const &)*arg2);
+  arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2);
+  result = ((swig::SwigPyIterator const *)arg1)->operator -((swig::SwigPyIterator const &)*arg2);
   resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result));
   return resultobj;
 fail:
@@ -7106,33 +7449,33 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_PySwigIterator___sub__(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[3];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_swig__PySwigIterator, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_swig__SwigPyIterator, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_PySwigIterator___sub____SWIG_1(self, args);
+        return _wrap_SwigPyIterator___sub____SWIG_1(self, args);
       }
     }
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -7140,7 +7483,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator___sub__(PyObject *self, PyObject *args
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_PySwigIterator___sub____SWIG_0(self, args);
+        return _wrap_SwigPyIterator___sub____SWIG_0(self, args);
       }
     }
   }
@@ -7151,31 +7494,31 @@ fail:
 }
 
 
-SWIGINTERN PyObject *PySwigIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_swig__PySwigIterator, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_swig__SwigPyIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_FloatVector_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_iterator" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_iterator" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = (swig::PySwigIterator *)std_vector_Sl_float_Sg__iterator(arg1,arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = (swig::SwigPyIterator *)std_vector_Sl_float_Sg__iterator(arg1,arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -7184,19 +7527,41 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  bool result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___nonzero__" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___nonzero__" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = (bool)std_vector_Sl_float_Sg____nonzero__((std::vector<float > const *)arg1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = (bool)std_vector_Sl_float_Sg____nonzero__((std::vector< float > const *)arg1);
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FloatVector___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FloatVector___bool__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___bool__" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = (bool)std_vector_Sl_float_Sg____bool__((std::vector< float > const *)arg1);
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -7206,19 +7571,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::size_type result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::size_type result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___len__" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___len__" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = std_vector_Sl_float_Sg____len__((std::vector<float > const *)arg1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = std_vector_Sl_float_Sg____len__((std::vector< float > const *)arg1);
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -7228,20 +7593,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::value_type result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::value_type result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_pop" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_pop" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   try {
-    result = (std::vector<float >::value_type)std_vector_Sl_float_Sg__pop(arg1);
+    result = (std::vector< float >::value_type)std_vector_Sl_float_Sg__pop(arg1);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -7256,10 +7621,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::difference_type arg2 ;
-  std::vector<float >::difference_type arg3 ;
-  std::vector<float,std::allocator<float > > *result = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::difference_type arg2 ;
+  std::vector< float >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -7269,31 +7633,32 @@ SWIGINTERN PyObject *_wrap_FloatVector___getslice__(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  std::vector< float,std::allocator< float > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FloatVector___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___getslice__" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___getslice__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___getslice__" "', argument " "2"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___getslice__" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::difference_type >(val2);
+  arg2 = static_cast< std::vector< float >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___getslice__" "', argument " "3"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___getslice__" "', argument " "3"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<float >::difference_type >(val3);
+  arg3 = static_cast< std::vector< float >::difference_type >(val3);
   try {
-    result = (std::vector<float,std::allocator<float > > *)std_vector_Sl_float_Sg____getslice__(arg1,arg2,arg3);
+    result = (std::vector< float,std::allocator< float > > *)std_vector_Sl_float_Sg____getslice__(arg1,arg2,arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -7302,10 +7667,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::difference_type arg2 ;
-  std::vector<float >::difference_type arg3 ;
-  std::vector<float,std::allocator<float > > *arg4 = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::difference_type arg2 ;
+  std::vector< float >::difference_type arg3 ;
+  std::vector< float,std::allocator< float > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -7319,34 +7684,34 @@ SWIGINTERN PyObject *_wrap_FloatVector___setslice__(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:FloatVector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___setslice__" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___setslice__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___setslice__" "', argument " "2"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___setslice__" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::difference_type >(val2);
+  arg2 = static_cast< std::vector< float >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___setslice__" "', argument " "3"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___setslice__" "', argument " "3"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<float >::difference_type >(val3);
+  arg3 = static_cast< std::vector< float >::difference_type >(val3);
   {
-    std::vector<float,std::allocator<float > > *ptr = (std::vector<float,std::allocator<float > > *)0;
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FloatVector___setslice__" "', argument " "4"" of type '" "std::vector<float,std::allocator<float > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FloatVector___setslice__" "', argument " "4"" of type '" "std::vector< float,std::allocator< float > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FloatVector___setslice__" "', argument " "4"" of type '" "std::vector<float,std::allocator<float > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FloatVector___setslice__" "', argument " "4"" of type '" "std::vector< float,std::allocator< float > > const &""'"); 
     }
     arg4 = ptr;
   }
   try {
-    std_vector_Sl_float_Sg____setslice__(arg1,arg2,arg3,(std::vector<float,std::allocator<float > > const &)*arg4);
+    std_vector_Sl_float_Sg____setslice__(arg1,arg2,arg3,(std::vector< float,std::allocator< float > > const &)*arg4);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -7366,9 +7731,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::difference_type arg2 ;
-  std::vector<float >::difference_type arg3 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::difference_type arg2 ;
+  std::vector< float >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -7380,21 +7745,21 @@ SWIGINTERN PyObject *_wrap_FloatVector___delslice__(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FloatVector___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___delslice__" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___delslice__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___delslice__" "', argument " "2"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___delslice__" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::difference_type >(val2);
+  arg2 = static_cast< std::vector< float >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___delslice__" "', argument " "3"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___delslice__" "', argument " "3"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<float >::difference_type >(val3);
+  arg3 = static_cast< std::vector< float >::difference_type >(val3);
   try {
     std_vector_Sl_float_Sg____delslice__(arg1,arg2,arg3);
   }
@@ -7409,10 +7774,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FloatVector___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FloatVector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::difference_type arg2 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -7421,18 +7786,18 @@ SWIGINTERN PyObject *_wrap_FloatVector___delitem__(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___delitem__" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___delitem__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___delitem__" "', argument " "2"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___delitem__" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::difference_type >(val2);
+  arg2 = static_cast< std::vector< float >::difference_type >(val2);
   try {
-    std_vector_Sl_float_Sg____delitem__(arg1,arg2);
+    std_vector_Sl_float_Sg____delitem____SWIG_0(arg1,arg2);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -7445,34 +7810,194 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FloatVector___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FloatVector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::difference_type arg2 ;
-  std::vector<float >::value_type *result = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  PySliceObject *arg2 = (PySliceObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  std::vector< float,std::allocator< float > > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___getitem__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  {
+    arg2 = (PySliceObject *) obj1;
+  }
+  try {
+    result = (std::vector< float,std::allocator< float > > *)std_vector_Sl_float_Sg____getitem____SWIG_0(arg1,arg2);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FloatVector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  PySliceObject *arg2 = (PySliceObject *) 0 ;
+  std::vector< float,std::allocator< float > > *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res3 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FloatVector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___setitem__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  {
+    arg2 = (PySliceObject *) obj1;
+  }
+  {
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
+    res3 = swig::asptr(obj2, &ptr);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FloatVector___setitem__" "', argument " "3"" of type '" "std::vector< float,std::allocator< float > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FloatVector___setitem__" "', argument " "3"" of type '" "std::vector< float,std::allocator< float > > const &""'"); 
+    }
+    arg3 = ptr;
+  }
+  try {
+    std_vector_Sl_float_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< float,std::allocator< float > > const &)*arg3);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  catch(std::invalid_argument &_e) {
+    SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res3)) delete arg3;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res3)) delete arg3;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FloatVector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  PySliceObject *arg2 = (PySliceObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___delitem__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  {
+    arg2 = (PySliceObject *) obj1;
+  }
+  try {
+    std_vector_Sl_float_Sg____delitem____SWIG_1(arg1,arg2);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FloatVector___delitem__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        _v = PySlice_Check(argv[1]);
+      }
+      if (_v) {
+        return _wrap_FloatVector___delitem____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_ptrdiff_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_FloatVector___delitem____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector___delitem__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    __delitem__(std::vector< float > *,std::vector< float >::difference_type)\n"
+    "    __delitem__(std::vector< float > *,PySliceObject *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FloatVector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  std::vector< float >::value_type *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___getitem__" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___getitem__" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___getitem__" "', argument " "2"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___getitem__" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::difference_type >(val2);
+  arg2 = static_cast< std::vector< float >::difference_type >(val2);
   try {
-    {
-      std::vector<float >::value_type const &_result_ref = std_vector_Sl_float_Sg____getitem__((std::vector<float > const *)arg1,arg2);
-      result = (std::vector<float >::value_type *) &_result_ref;
-    }
+    result = (std::vector< float >::value_type *) &std_vector_Sl_float_Sg____getitem____SWIG_1((std::vector< float > const *)arg1,arg2);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -7485,16 +8010,63 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FloatVector___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FloatVector___getitem__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        _v = PySlice_Check(argv[1]);
+      }
+      if (_v) {
+        return _wrap_FloatVector___getitem____SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_ptrdiff_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_FloatVector___getitem____SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector___getitem__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    __getitem__(std::vector< float > *,PySliceObject *)\n"
+    "    __getitem__(std::vector< float > const *,std::vector< float >::difference_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FloatVector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::difference_type arg2 ;
-  std::vector<float >::value_type *arg3 = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::difference_type arg2 ;
+  std::vector< float >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  std::vector<float >::value_type temp3 ;
+  std::vector< float >::value_type temp3 ;
   float val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -7502,24 +8074,24 @@ SWIGINTERN PyObject *_wrap_FloatVector___setitem__(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FloatVector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___setitem__" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector___setitem__" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___setitem__" "', argument " "2"" of type '" "std::vector<float >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector___setitem__" "', argument " "2"" of type '" "std::vector< float >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::difference_type >(val2);
+  arg2 = static_cast< std::vector< float >::difference_type >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___setitem__" "', argument " "3"" of type '" "std::vector<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector___setitem__" "', argument " "3"" of type '" "std::vector< float >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<float >::value_type >(val3);
+  temp3 = static_cast< std::vector< float >::value_type >(val3);
   arg3 = &temp3;
   try {
-    std_vector_Sl_float_Sg____setitem__(arg1,arg2,(float const &)*arg3);
+    std_vector_Sl_float_Sg____setitem____SWIG_1(arg1,arg2,(float const &)*arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -7532,29 +8104,86 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_FloatVector___setitem__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        _v = PySlice_Check(argv[1]);
+      }
+      if (_v) {
+        int res = swig::asptr(argv[2], (std::vector<float,std::allocator< float > >**)(0));
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_FloatVector___setitem____SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_ptrdiff_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_FloatVector___setitem____SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector___setitem__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    __setitem__(std::vector< float > *,PySliceObject *,std::vector< float,std::allocator< float > > const &)\n"
+    "    __setitem__(std::vector< float > *,std::vector< float >::difference_type,std::vector< float >::value_type const &)\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_FloatVector_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::value_type *arg2 = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  std::vector<float >::value_type temp2 ;
+  std::vector< float >::value_type temp2 ;
   float val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_append" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_append" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_append" "', argument " "2"" of type '" "std::vector<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_append" "', argument " "2"" of type '" "std::vector< float >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<float >::value_type >(val2);
+  temp2 = static_cast< std::vector< float >::value_type >(val2);
   arg2 = &temp2;
   std_vector_Sl_float_Sg__append(arg1,(float const &)*arg2);
   resultobj = SWIG_Py_Void();
@@ -7566,11 +8195,11 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_FloatVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *result = 0 ;
+  std::vector< float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_FloatVector")) SWIG_fail;
-  result = (std::vector<float > *)new std::vector<float >();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< float > *)new std::vector< float >();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -7579,25 +8208,25 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_FloatVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = 0 ;
-  std::vector<float > *result = 0 ;
+  std::vector< float > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
+  std::vector< float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_FloatVector",&obj0)) SWIG_fail;
   {
-    std::vector<float,std::allocator<float > > *ptr = (std::vector<float,std::allocator<float > > *)0;
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FloatVector" "', argument " "1"" of type '" "std::vector<float > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FloatVector" "', argument " "1"" of type '" "std::vector< float > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FloatVector" "', argument " "1"" of type '" "std::vector<float > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FloatVector" "', argument " "1"" of type '" "std::vector< float > const &""'"); 
     }
     arg1 = ptr;
   }
-  result = (std::vector<float > *)new std::vector<float >((std::vector<float > const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< float > *)new std::vector< float >((std::vector< float > const &)*arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -7608,19 +8237,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  bool result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_empty" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_empty" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = (bool)((std::vector<float > const *)arg1)->empty();
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = (bool)((std::vector< float > const *)arg1)->empty();
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -7630,19 +8259,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::size_type result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::size_type result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_size" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_size" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = ((std::vector<float > const *)arg1)->size();
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = ((std::vector< float > const *)arg1)->size();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -7652,17 +8281,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_clear" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_clear" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   (arg1)->clear();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -7673,8 +8302,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float > *arg2 = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -7683,19 +8312,19 @@ SWIGINTERN PyObject *_wrap_FloatVector_swap(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_swap" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_swap" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FloatVector_swap" "', argument " "2"" of type '" "std::vector<float > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FloatVector_swap" "', argument " "2"" of type '" "std::vector< float > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FloatVector_swap" "', argument " "2"" of type '" "std::vector<float > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FloatVector_swap" "', argument " "2"" of type '" "std::vector< float > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<float > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< float > * >(argp2);
   (arg1)->swap(*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -7706,358 +8335,134 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  SwigValueWrapper<std::allocator<float > > result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  SwigValueWrapper< std::allocator< float > > result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_get_allocator" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_get_allocator" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = ((std::vector<float > const *)arg1)->get_allocator();
-  resultobj = SWIG_NewPointerObj((new std::vector<float >::allocator_type(static_cast< const std::vector<float >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = ((std::vector< float > const *)arg1)->get_allocator();
+  resultobj = SWIG_NewPointerObj((new std::vector< float >::allocator_type(static_cast< const std::vector< float >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FloatVector_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FloatVector_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::iterator result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::const_iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_begin" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_begin" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = (arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = ((std::vector< float > const *)arg1)->begin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::const_iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FloatVector_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FloatVector_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_begin" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = ((std::vector<float > const *)arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FloatVector_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FloatVector_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FloatVector_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FloatVector_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::iterator result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::const_iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_end" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_end" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = (arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = ((std::vector< float > const *)arg1)->end();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::const_iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FloatVector_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FloatVector_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_end" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = ((std::vector<float > const *)arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FloatVector_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FloatVector_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FloatVector_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FloatVector_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::reverse_iterator result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::const_reverse_iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_rbegin" "', argument " "1"" of type '" "std::vector<float > *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = (arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FloatVector_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_rbegin" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = ((std::vector<float > const *)arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FloatVector_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FloatVector_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FloatVector_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FloatVector_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_rend" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_rbegin" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = (arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = ((std::vector< float > const *)arg1)->rbegin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::const_reverse_iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FloatVector_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FloatVector_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::const_reverse_iterator result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::const_reverse_iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_rend" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_rend" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = ((std::vector<float > const *)arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = ((std::vector< float > const *)arg1)->rend();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::const_reverse_iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FloatVector_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FloatVector_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FloatVector_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_FloatVector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float >::size_type arg1 ;
-  std::vector<float > *result = 0 ;
+  std::vector< float >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_FloatVector",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FloatVector" "', argument " "1"" of type '" "std::vector<float >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FloatVector" "', argument " "1"" of type '" "std::vector< float >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<float >::size_type >(val1);
-  result = (std::vector<float > *)new std::vector<float >(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, SWIG_POINTER_NEW |  0 );
+  arg1 = static_cast< std::vector< float >::size_type >(val1);
+  result = (std::vector< float > *)new std::vector< float >(arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -8066,17 +8471,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_pop_back" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_pop_back" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   (arg1)->pop_back();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -8087,8 +8492,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::size_type arg2 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -8097,16 +8502,16 @@ SWIGINTERN PyObject *_wrap_FloatVector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_resize" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_resize" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_resize" "', argument " "2"" of type '" "std::vector<float >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_resize" "', argument " "2"" of type '" "std::vector< float >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::size_type >(val2);
+  arg2 = static_cast< std::vector< float >::size_type >(val2);
   (arg1)->resize(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -8117,36 +8522,36 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::iterator arg2 ;
-  std::vector<float >::iterator result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::iterator arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  swig::PySwigIterator *iter2 = 0 ;
+  swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  std::vector< float >::iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_erase" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_erase" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "2"" of type '" "std::vector<float >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "2"" of type '" "std::vector< float >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<float >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter2);
+    swig::SwigPyIterator_T<std::vector< float >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "2"" of type '" "std::vector<float >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "2"" of type '" "std::vector< float >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
@@ -8155,51 +8560,51 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::iterator arg2 ;
-  std::vector<float >::iterator arg3 ;
-  std::vector<float >::iterator result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::iterator arg2 ;
+  std::vector< float >::iterator arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  swig::PySwigIterator *iter2 = 0 ;
+  swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  swig::PySwigIterator *iter3 = 0 ;
+  swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  std::vector< float >::iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FloatVector_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_erase" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_erase" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "2"" of type '" "std::vector<float >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "2"" of type '" "std::vector< float >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<float >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter2);
+    swig::SwigPyIterator_T<std::vector< float >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "2"" of type '" "std::vector<float >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "2"" of type '" "std::vector< float >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "3"" of type '" "std::vector<float >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "3"" of type '" "std::vector< float >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<float >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter3);
+    swig::SwigPyIterator_T<std::vector< float >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "3"" of type '" "std::vector<float >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_erase" "', argument " "3"" of type '" "std::vector< float >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2,arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
@@ -8212,18 +8617,18 @@ SWIGINTERN PyObject *_wrap_FloatVector_erase(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      swig::PySwigIterator *iter = 0;
-      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter) != 0));
+      swig::SwigPyIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_FloatVector_erase__SWIG_0(self, args);
       }
@@ -8231,16 +8636,16 @@ SWIGINTERN PyObject *_wrap_FloatVector_erase(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      swig::PySwigIterator *iter = 0;
-      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter) != 0));
+      swig::SwigPyIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter) != 0));
       if (_v) {
-        swig::PySwigIterator *iter = 0;
-        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter) != 0));
+        swig::SwigPyIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_FloatVector_erase__SWIG_1(self, args);
         }
@@ -8249,38 +8654,41 @@ SWIGINTERN PyObject *_wrap_FloatVector_erase(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<float >::iterator)\n    erase(std::vector<float >::iterator,std::vector<float >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< float > *,std::vector< float >::iterator)\n"
+    "    erase(std::vector< float > *,std::vector< float >::iterator,std::vector< float >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_FloatVector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float >::size_type arg1 ;
-  std::vector<float >::value_type *arg2 = 0 ;
-  std::vector<float > *result = 0 ;
+  std::vector< float >::size_type arg1 ;
+  std::vector< float >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  std::vector<float >::value_type temp2 ;
+  std::vector< float >::value_type temp2 ;
   float val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  std::vector< float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_FloatVector",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FloatVector" "', argument " "1"" of type '" "std::vector<float >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FloatVector" "', argument " "1"" of type '" "std::vector< float >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<float >::size_type >(val1);
+  arg1 = static_cast< std::vector< float >::size_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FloatVector" "', argument " "2"" of type '" "std::vector<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FloatVector" "', argument " "2"" of type '" "std::vector< float >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<float >::value_type >(val2);
+  temp2 = static_cast< std::vector< float >::value_type >(val2);
   arg2 = &temp2;
-  result = (std::vector<float > *)new std::vector<float >(arg1,(std::vector<float >::value_type const &)*arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< float > *)new std::vector< float >(arg1,(std::vector< float >::value_type const &)*arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -8293,7 +8701,7 @@ SWIGINTERN PyObject *_wrap_new_FloatVector(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8312,7 +8720,7 @@ SWIGINTERN PyObject *_wrap_new_FloatVector(PyObject *self, PyObject *args) {
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_FloatVector__SWIG_1(self, args);
@@ -8336,36 +8744,41 @@ SWIGINTERN PyObject *_wrap_new_FloatVector(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FloatVector'.\n  Possible C/C++ prototypes are:\n    std::vector<(float)>()\n    std::vector<(float)>(std::vector<float > const &)\n    std::vector<(float)>(std::vector<float >::size_type)\n    std::vector<(float)>(std::vector<float >::size_type,std::vector<float >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FloatVector'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< float >()\n"
+    "    std::vector< float >(std::vector< float > const &)\n"
+    "    std::vector< float >(std::vector< float >::size_type)\n"
+    "    std::vector< float >(std::vector< float >::size_type,std::vector< float >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FloatVector_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::value_type *arg2 = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  std::vector<float >::value_type temp2 ;
+  std::vector< float >::value_type temp2 ;
   float val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_push_back" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_push_back" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_push_back" "', argument " "2"" of type '" "std::vector<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_push_back" "', argument " "2"" of type '" "std::vector< float >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<float >::value_type >(val2);
+  temp2 = static_cast< std::vector< float >::value_type >(val2);
   arg2 = &temp2;
-  (arg1)->push_back((std::vector<float >::value_type const &)*arg2);
+  (arg1)->push_back((std::vector< float >::value_type const &)*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8375,22 +8788,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::value_type *result = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::value_type *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_front" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  {
-    std::vector<float >::value_type const &_result_ref = ((std::vector<float > const *)arg1)->front();
-    result = (std::vector<float >::value_type *) &_result_ref;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_front" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = (std::vector< float >::value_type *) &((std::vector< float > const *)arg1)->front();
   resultobj = SWIG_From_float(static_cast< float >(*result));
   return resultobj;
 fail:
@@ -8400,22 +8810,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::value_type *result = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::value_type *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_back" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  {
-    std::vector<float >::value_type const &_result_ref = ((std::vector<float > const *)arg1)->back();
-    result = (std::vector<float >::value_type *) &_result_ref;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_back" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = (std::vector< float >::value_type *) &((std::vector< float > const *)arg1)->back();
   resultobj = SWIG_From_float(static_cast< float >(*result));
   return resultobj;
 fail:
@@ -8425,14 +8832,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::size_type arg2 ;
-  std::vector<float >::value_type *arg3 = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::size_type arg2 ;
+  std::vector< float >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  std::vector<float >::value_type temp3 ;
+  std::vector< float >::value_type temp3 ;
   float val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -8440,23 +8847,23 @@ SWIGINTERN PyObject *_wrap_FloatVector_assign(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FloatVector_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_assign" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_assign" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_assign" "', argument " "2"" of type '" "std::vector<float >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_assign" "', argument " "2"" of type '" "std::vector< float >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::size_type >(val2);
+  arg2 = static_cast< std::vector< float >::size_type >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector_assign" "', argument " "3"" of type '" "std::vector<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector_assign" "', argument " "3"" of type '" "std::vector< float >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<float >::value_type >(val3);
+  temp3 = static_cast< std::vector< float >::value_type >(val3);
   arg3 = &temp3;
-  (arg1)->assign(arg2,(std::vector<float >::value_type const &)*arg3);
+  (arg1)->assign(arg2,(std::vector< float >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8466,14 +8873,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::size_type arg2 ;
-  std::vector<float >::value_type *arg3 = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::size_type arg2 ;
+  std::vector< float >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  std::vector<float >::value_type temp3 ;
+  std::vector< float >::value_type temp3 ;
   float val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -8481,23 +8888,23 @@ SWIGINTERN PyObject *_wrap_FloatVector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FloatVector_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_resize" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_resize" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_resize" "', argument " "2"" of type '" "std::vector<float >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_resize" "', argument " "2"" of type '" "std::vector< float >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::size_type >(val2);
+  arg2 = static_cast< std::vector< float >::size_type >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector_resize" "', argument " "3"" of type '" "std::vector<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector_resize" "', argument " "3"" of type '" "std::vector< float >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<float >::value_type >(val3);
+  temp3 = static_cast< std::vector< float >::value_type >(val3);
   arg3 = &temp3;
-  (arg1)->resize(arg2,(std::vector<float >::value_type const &)*arg3);
+  (arg1)->resize(arg2,(std::vector< float >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8511,13 +8918,13 @@ SWIGINTERN PyObject *_wrap_FloatVector_resize(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -8531,7 +8938,7 @@ SWIGINTERN PyObject *_wrap_FloatVector_resize(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -8551,54 +8958,57 @@ SWIGINTERN PyObject *_wrap_FloatVector_resize(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<float >::size_type)\n    resize(std::vector<float >::size_type,std::vector<float >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< float > *,std::vector< float >::size_type)\n"
+    "    resize(std::vector< float > *,std::vector< float >::size_type,std::vector< float >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FloatVector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::iterator arg2 ;
-  std::vector<float >::value_type *arg3 = 0 ;
-  std::vector<float >::iterator result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::iterator arg2 ;
+  std::vector< float >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  swig::PySwigIterator *iter2 = 0 ;
+  swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  std::vector<float >::value_type temp3 ;
+  std::vector< float >::value_type temp3 ;
   float val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  std::vector< float >::iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FloatVector_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_insert" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_insert" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_insert" "', argument " "2"" of type '" "std::vector<float >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_insert" "', argument " "2"" of type '" "std::vector< float >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<float >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter2);
+    swig::SwigPyIterator_T<std::vector< float >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_insert" "', argument " "2"" of type '" "std::vector<float >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_insert" "', argument " "2"" of type '" "std::vector< float >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector_insert" "', argument " "3"" of type '" "std::vector<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector_insert" "', argument " "3"" of type '" "std::vector< float >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<float >::value_type >(val3);
+  temp3 = static_cast< std::vector< float >::value_type >(val3);
   arg3 = &temp3;
-  result = (arg1)->insert(arg2,(std::vector<float >::value_type const &)*arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<float >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  result = (arg1)->insert(arg2,(std::vector< float >::value_type const &)*arg3);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
@@ -8607,17 +9017,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::iterator arg2 ;
-  std::vector<float >::size_type arg3 ;
-  std::vector<float >::value_type *arg4 = 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::iterator arg2 ;
+  std::vector< float >::size_type arg3 ;
+  std::vector< float >::value_type *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  swig::PySwigIterator *iter2 = 0 ;
+  swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  std::vector<float >::value_type temp4 ;
+  std::vector< float >::value_type temp4 ;
   float val4 ;
   int ecode4 = 0 ;
   PyObject * obj0 = 0 ;
@@ -8626,34 +9036,34 @@ SWIGINTERN PyObject *_wrap_FloatVector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:FloatVector_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_insert" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_insert" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_insert" "', argument " "2"" of type '" "std::vector<float >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_insert" "', argument " "2"" of type '" "std::vector< float >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<float >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter2);
+    swig::SwigPyIterator_T<std::vector< float >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_insert" "', argument " "2"" of type '" "std::vector<float >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FloatVector_insert" "', argument " "2"" of type '" "std::vector< float >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector_insert" "', argument " "3"" of type '" "std::vector<float >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FloatVector_insert" "', argument " "3"" of type '" "std::vector< float >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<float >::size_type >(val3);
+  arg3 = static_cast< std::vector< float >::size_type >(val3);
   ecode4 = SWIG_AsVal_float(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FloatVector_insert" "', argument " "4"" of type '" "std::vector<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FloatVector_insert" "', argument " "4"" of type '" "std::vector< float >::value_type""'");
   } 
-  temp4 = static_cast< std::vector<float >::value_type >(val4);
+  temp4 = static_cast< std::vector< float >::value_type >(val4);
   arg4 = &temp4;
-  (arg1)->insert(arg2,arg3,(std::vector<float >::value_type const &)*arg4);
+  (arg1)->insert(arg2,arg3,(std::vector< float >::value_type const &)*arg4);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8667,18 +9077,18 @@ SWIGINTERN PyObject *_wrap_FloatVector_insert(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      swig::PySwigIterator *iter = 0;
-      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter) != 0));
+      swig::SwigPyIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_float(argv[2], NULL);
@@ -8692,12 +9102,12 @@ SWIGINTERN PyObject *_wrap_FloatVector_insert(PyObject *self, PyObject *args) {
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<float,std::allocator<float > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<float,std::allocator< float > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      swig::PySwigIterator *iter = 0;
-      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<float >::iterator > *>(iter) != 0));
+      swig::SwigPyIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< float >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -8717,15 +9127,18 @@ SWIGINTERN PyObject *_wrap_FloatVector_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<float >::iterator,std::vector<float >::value_type const &)\n    insert(std::vector<float >::iterator,std::vector<float >::size_type,std::vector<float >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FloatVector_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< float > *,std::vector< float >::iterator,std::vector< float >::value_type const &)\n"
+    "    insert(std::vector< float > *,std::vector< float >::iterator,std::vector< float >::size_type,std::vector< float >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FloatVector_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::size_type arg2 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
+  std::vector< float >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -8734,16 +9147,16 @@ SWIGINTERN PyObject *_wrap_FloatVector_reserve(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FloatVector_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_reserve" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_reserve" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_reserve" "', argument " "2"" of type '" "std::vector<float >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FloatVector_reserve" "', argument " "2"" of type '" "std::vector< float >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<float >::size_type >(val2);
+  arg2 = static_cast< std::vector< float >::size_type >(val2);
   (arg1)->reserve(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -8754,19 +9167,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FloatVector_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
-  std::vector<float >::size_type result;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< float >::size_type result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FloatVector_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_capacity" "', argument " "1"" of type '" "std::vector<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FloatVector_capacity" "', argument " "1"" of type '" "std::vector< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
-  result = ((std::vector<float > const *)arg1)->capacity();
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
+  result = ((std::vector< float > const *)arg1)->capacity();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -8776,20 +9189,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_FloatVector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<float > *arg1 = (std::vector<float > *) 0 ;
+  std::vector< float > *arg1 = (std::vector< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_FloatVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FloatVector" "', argument " "1"" of type '" "std::vector<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FloatVector" "', argument " "1"" of type '" "std::vector< float > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<float > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< float > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -8805,29 +9218,29 @@ fail:
 
 SWIGINTERN PyObject *FloatVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTfloat_std__allocatorTfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvPointVector_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
-  swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  swig::SwigPyIterator *result = 0 ;
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_iterator" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_iterator" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = (swig::PySwigIterator *)std_vector_Sl_CvPoint_Sg__iterator(arg1,arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = (swig::SwigPyIterator *)std_vector_Sl_CvPoint_Sg__iterator(arg1,arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -8836,19 +9249,41 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  bool result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___nonzero__" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = (bool)std_vector_Sl_CvPoint_Sg____nonzero__((std::vector< CvPoint > const *)arg1);
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvPointVector___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector___bool__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___nonzero__" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___bool__" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = (bool)std_vector_Sl_CvPoint_Sg____nonzero__((std::vector<CvPoint > const *)arg1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = (bool)std_vector_Sl_CvPoint_Sg____bool__((std::vector< CvPoint > const *)arg1);
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -8858,19 +9293,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::size_type result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::size_type result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___len__" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___len__" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = std_vector_Sl_CvPoint_Sg____len__((std::vector<CvPoint > const *)arg1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = std_vector_Sl_CvPoint_Sg____len__((std::vector< CvPoint > const *)arg1);
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -8880,18 +9315,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::value_type result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::value_type result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_pop" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_pop" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   try {
     result = std_vector_Sl_CvPoint_Sg__pop(arg1);
   }
@@ -8899,7 +9334,7 @@ SWIGINTERN PyObject *_wrap_CvPointVector_pop(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
   
-  resultobj = SWIG_NewPointerObj((new std::vector<CvPoint >::value_type(static_cast< const std::vector<CvPoint >::value_type& >(result))), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< CvPoint >::value_type(static_cast< const std::vector< CvPoint >::value_type& >(result))), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -8908,10 +9343,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::difference_type arg2 ;
-  std::vector<CvPoint >::difference_type arg3 ;
-  std::vector<CvPoint,std::allocator<CvPoint > > *result = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::difference_type arg2 ;
+  std::vector< CvPoint >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -8921,31 +9355,32 @@ SWIGINTERN PyObject *_wrap_CvPointVector___getslice__(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  std::vector< CvPoint,std::allocator< CvPoint > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvPointVector___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___getslice__" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___getslice__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___getslice__" "', argument " "2"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___getslice__" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::difference_type >(val2);
+  arg2 = static_cast< std::vector< CvPoint >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvPointVector___getslice__" "', argument " "3"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvPointVector___getslice__" "', argument " "3"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<CvPoint >::difference_type >(val3);
+  arg3 = static_cast< std::vector< CvPoint >::difference_type >(val3);
   try {
-    result = (std::vector<CvPoint,std::allocator<CvPoint > > *)std_vector_Sl_CvPoint_Sg____getslice__(arg1,arg2,arg3);
+    result = (std::vector< CvPoint,std::allocator< CvPoint > > *)std_vector_Sl_CvPoint_Sg____getslice__(arg1,arg2,arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -8954,10 +9389,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::difference_type arg2 ;
-  std::vector<CvPoint >::difference_type arg3 ;
-  std::vector<CvPoint,std::allocator<CvPoint > > *arg4 = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::difference_type arg2 ;
+  std::vector< CvPoint >::difference_type arg3 ;
+  std::vector< CvPoint,std::allocator< CvPoint > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -8971,34 +9406,34 @@ SWIGINTERN PyObject *_wrap_CvPointVector___setslice__(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvPointVector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___setslice__" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___setslice__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___setslice__" "', argument " "2"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___setslice__" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::difference_type >(val2);
+  arg2 = static_cast< std::vector< CvPoint >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvPointVector___setslice__" "', argument " "3"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvPointVector___setslice__" "', argument " "3"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<CvPoint >::difference_type >(val3);
+  arg3 = static_cast< std::vector< CvPoint >::difference_type >(val3);
   {
-    std::vector<CvPoint,std::allocator<CvPoint > > *ptr = (std::vector<CvPoint,std::allocator<CvPoint > > *)0;
+    std::vector<CvPoint,std::allocator< CvPoint > > *ptr = (std::vector<CvPoint,std::allocator< CvPoint > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvPointVector___setslice__" "', argument " "4"" of type '" "std::vector<CvPoint,std::allocator<CvPoint > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvPointVector___setslice__" "', argument " "4"" of type '" "std::vector< CvPoint,std::allocator< CvPoint > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector___setslice__" "', argument " "4"" of type '" "std::vector<CvPoint,std::allocator<CvPoint > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector___setslice__" "', argument " "4"" of type '" "std::vector< CvPoint,std::allocator< CvPoint > > const &""'"); 
     }
     arg4 = ptr;
   }
   try {
-    std_vector_Sl_CvPoint_Sg____setslice__(arg1,arg2,arg3,(std::vector<CvPoint,std::allocator<CvPoint > > const &)*arg4);
+    std_vector_Sl_CvPoint_Sg____setslice__(arg1,arg2,arg3,(std::vector< CvPoint,std::allocator< CvPoint > > const &)*arg4);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -9018,9 +9453,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::difference_type arg2 ;
-  std::vector<CvPoint >::difference_type arg3 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::difference_type arg2 ;
+  std::vector< CvPoint >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9032,21 +9467,21 @@ SWIGINTERN PyObject *_wrap_CvPointVector___delslice__(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvPointVector___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___delslice__" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___delslice__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___delslice__" "', argument " "2"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___delslice__" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::difference_type >(val2);
+  arg2 = static_cast< std::vector< CvPoint >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvPointVector___delslice__" "', argument " "3"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvPointVector___delslice__" "', argument " "3"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<CvPoint >::difference_type >(val3);
+  arg3 = static_cast< std::vector< CvPoint >::difference_type >(val3);
   try {
     std_vector_Sl_CvPoint_Sg____delslice__(arg1,arg2,arg3);
   }
@@ -9061,10 +9496,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CvPointVector___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CvPointVector___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::difference_type arg2 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9073,18 +9508,134 @@ SWIGINTERN PyObject *_wrap_CvPointVector___delitem__(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___delitem__" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___delitem__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___delitem__" "', argument " "2"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___delitem__" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::difference_type >(val2);
+  arg2 = static_cast< std::vector< CvPoint >::difference_type >(val2);
+  try {
+    std_vector_Sl_CvPoint_Sg____delitem____SWIG_0(arg1,arg2);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvPointVector___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  PySliceObject *arg2 = (PySliceObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  std::vector< CvPoint,std::allocator< CvPoint > > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___getitem__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  {
+    arg2 = (PySliceObject *) obj1;
+  }
+  try {
+    result = (std::vector< CvPoint,std::allocator< CvPoint > > *)std_vector_Sl_CvPoint_Sg____getitem____SWIG_0(arg1,arg2);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvPointVector___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  PySliceObject *arg2 = (PySliceObject *) 0 ;
+  std::vector< CvPoint,std::allocator< CvPoint > > *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res3 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:CvPointVector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___setitem__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  {
+    arg2 = (PySliceObject *) obj1;
+  }
+  {
+    std::vector<CvPoint,std::allocator< CvPoint > > *ptr = (std::vector<CvPoint,std::allocator< CvPoint > > *)0;
+    res3 = swig::asptr(obj2, &ptr);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector___setitem__" "', argument " "3"" of type '" "std::vector< CvPoint,std::allocator< CvPoint > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector___setitem__" "', argument " "3"" of type '" "std::vector< CvPoint,std::allocator< CvPoint > > const &""'"); 
+    }
+    arg3 = ptr;
+  }
+  try {
+    std_vector_Sl_CvPoint_Sg____setitem____SWIG_0(arg1,arg2,(std::vector< CvPoint,std::allocator< CvPoint > > const &)*arg3);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  catch(std::invalid_argument &_e) {
+    SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res3)) delete arg3;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res3)) delete arg3;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvPointVector___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  PySliceObject *arg2 = (PySliceObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___delitem__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  {
+    arg2 = (PySliceObject *) obj1;
+  }
   try {
-    std_vector_Sl_CvPoint_Sg____delitem__(arg1,arg2);
+    std_vector_Sl_CvPoint_Sg____delitem____SWIG_1(arg1,arg2);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -9097,51 +9648,142 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CvPointVector___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CvPointVector___delitem__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        _v = PySlice_Check(argv[1]);
+      }
+      if (_v) {
+        return _wrap_CvPointVector___delitem____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_ptrdiff_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_CvPointVector___delitem____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector___delitem__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    __delitem__(std::vector< CvPoint > *,std::vector< CvPoint >::difference_type)\n"
+    "    __delitem__(std::vector< CvPoint > *,PySliceObject *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvPointVector___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::difference_type arg2 ;
-  std::vector<CvPoint >::value_type *result = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  std::vector< CvPoint >::value_type *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___getitem__" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___getitem__" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___getitem__" "', argument " "2"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___getitem__" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::difference_type >(val2);
+  arg2 = static_cast< std::vector< CvPoint >::difference_type >(val2);
   try {
-    {
-      std::vector<CvPoint >::value_type const &_result_ref = std_vector_Sl_CvPoint_Sg____getitem__((std::vector<CvPoint > const *)arg1,arg2);
-      result = (std::vector<CvPoint >::value_type *) &_result_ref;
-    }
+    result = (std::vector< CvPoint >::value_type *) &std_vector_Sl_CvPoint_Sg____getitem____SWIG_1((std::vector< CvPoint > const *)arg1,arg2);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_CvPointVector___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CvPointVector___getitem__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        _v = PySlice_Check(argv[1]);
+      }
+      if (_v) {
+        return _wrap_CvPointVector___getitem____SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_ptrdiff_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_CvPointVector___getitem____SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector___getitem__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    __getitem__(std::vector< CvPoint > *,PySliceObject *)\n"
+    "    __getitem__(std::vector< CvPoint > const *,std::vector< CvPoint >::difference_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvPointVector___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::difference_type arg2 ;
-  std::vector<CvPoint >::value_type *arg3 = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::difference_type arg2 ;
+  std::vector< CvPoint >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9153,26 +9795,26 @@ SWIGINTERN PyObject *_wrap_CvPointVector___setitem__(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvPointVector___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___setitem__" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector___setitem__" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___setitem__" "', argument " "2"" of type '" "std::vector<CvPoint >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector___setitem__" "', argument " "2"" of type '" "std::vector< CvPoint >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,  0  | 0);
+  arg2 = static_cast< std::vector< CvPoint >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector___setitem__" "', argument " "3"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector___setitem__" "', argument " "3"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector___setitem__" "', argument " "3"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector___setitem__" "', argument " "3"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<CvPoint >::value_type * >(argp3);
+  arg3 = reinterpret_cast< std::vector< CvPoint >::value_type * >(argp3);
   try {
-    std_vector_Sl_CvPoint_Sg____setitem__(arg1,arg2,(CvPoint const &)*arg3);
+    std_vector_Sl_CvPoint_Sg____setitem____SWIG_1(arg1,arg2,(CvPoint const &)*arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -9185,10 +9827,65 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_CvPointVector___setitem__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        _v = PySlice_Check(argv[1]);
+      }
+      if (_v) {
+        int res = swig::asptr(argv[2], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvPointVector___setitem____SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_ptrdiff_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_CvPointVector___setitem____SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector___setitem__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    __setitem__(std::vector< CvPoint > *,PySliceObject *,std::vector< CvPoint,std::allocator< CvPoint > > const &)\n"
+    "    __setitem__(std::vector< CvPoint > *,std::vector< CvPoint >::difference_type,std::vector< CvPoint >::value_type const &)\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_CvPointVector_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::value_type *arg2 = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9197,19 +9894,19 @@ SWIGINTERN PyObject *_wrap_CvPointVector_append(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_append" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_append" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,  0  | 0);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPointVector_append" "', argument " "2"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPointVector_append" "', argument " "2"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_append" "', argument " "2"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_append" "', argument " "2"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<CvPoint >::value_type * >(argp2);
+  arg2 = reinterpret_cast< std::vector< CvPoint >::value_type * >(argp2);
   std_vector_Sl_CvPoint_Sg__append(arg1,(CvPoint const &)*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9220,11 +9917,11 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvPointVector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *result = 0 ;
+  std::vector< CvPoint > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvPointVector")) SWIG_fail;
-  result = (std::vector<CvPoint > *)new std::vector<CvPoint >();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< CvPoint > *)new std::vector< CvPoint >();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9233,25 +9930,25 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvPointVector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = 0 ;
-  std::vector<CvPoint > *result = 0 ;
+  std::vector< CvPoint > *arg1 = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvPointVector",&obj0)) SWIG_fail;
   {
-    std::vector<CvPoint,std::allocator<CvPoint > > *ptr = (std::vector<CvPoint,std::allocator<CvPoint > > *)0;
+    std::vector<CvPoint,std::allocator< CvPoint > > *ptr = (std::vector<CvPoint,std::allocator< CvPoint > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvPointVector" "', argument " "1"" of type '" "std::vector<CvPoint > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CvPointVector" "', argument " "1"" of type '" "std::vector< CvPoint > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvPointVector" "', argument " "1"" of type '" "std::vector<CvPoint > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvPointVector" "', argument " "1"" of type '" "std::vector< CvPoint > const &""'"); 
     }
     arg1 = ptr;
   }
-  result = (std::vector<CvPoint > *)new std::vector<CvPoint >((std::vector<CvPoint > const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< CvPoint > *)new std::vector< CvPoint >((std::vector< CvPoint > const &)*arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -9262,19 +9959,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  bool result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_empty" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_empty" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = (bool)((std::vector<CvPoint > const *)arg1)->empty();
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = (bool)((std::vector< CvPoint > const *)arg1)->empty();
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -9284,19 +9981,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::size_type result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::size_type result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_size" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_size" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = ((std::vector<CvPoint > const *)arg1)->size();
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = ((std::vector< CvPoint > const *)arg1)->size();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -9306,17 +10003,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_clear" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_clear" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   (arg1)->clear();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9327,8 +10024,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint > *arg2 = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9337,19 +10034,19 @@ SWIGINTERN PyObject *_wrap_CvPointVector_swap(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_swap" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_swap" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPointVector_swap" "', argument " "2"" of type '" "std::vector<CvPoint > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPointVector_swap" "', argument " "2"" of type '" "std::vector< CvPoint > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_swap" "', argument " "2"" of type '" "std::vector<CvPoint > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_swap" "', argument " "2"" of type '" "std::vector< CvPoint > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<CvPoint > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< CvPoint > * >(argp2);
   (arg1)->swap(*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9360,358 +10057,134 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  SwigValueWrapper<std::allocator<CvPoint > > result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  SwigValueWrapper< std::allocator< CvPoint > > result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_get_allocator" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_get_allocator" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = ((std::vector<CvPoint > const *)arg1)->get_allocator();
-  resultobj = SWIG_NewPointerObj((new std::vector<CvPoint >::allocator_type(static_cast< const std::vector<CvPoint >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = ((std::vector< CvPoint > const *)arg1)->get_allocator();
+  resultobj = SWIG_NewPointerObj((new std::vector< CvPoint >::allocator_type(static_cast< const std::vector< CvPoint >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_CvPointVector_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CvPointVector_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::iterator result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::const_iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_begin" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_begin" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = (arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = ((std::vector< CvPoint > const *)arg1)->begin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< CvPoint >::const_iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_CvPointVector_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CvPointVector_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_begin" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = ((std::vector<CvPoint > const *)arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_CvPointVector_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvPointVector_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvPointVector_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_CvPointVector_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::iterator result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::const_iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_end" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_end" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = (arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = ((std::vector< CvPoint > const *)arg1)->end();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< CvPoint >::const_iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_CvPointVector_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CvPointVector_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_end" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = ((std::vector<CvPoint > const *)arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_CvPointVector_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvPointVector_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvPointVector_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_CvPointVector_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::reverse_iterator result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::const_reverse_iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_rbegin" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_rbegin" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = (arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = ((std::vector< CvPoint > const *)arg1)->rbegin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< CvPoint >::const_reverse_iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_CvPointVector_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CvPointVector_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_rbegin" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = ((std::vector<CvPoint > const *)arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_CvPointVector_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvPointVector_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvPointVector_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_CvPointVector_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_rend" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = (arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_CvPointVector_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::const_reverse_iterator result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::const_reverse_iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_rend" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_rend" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = ((std::vector<CvPoint > const *)arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = ((std::vector< CvPoint > const *)arg1)->rend();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< CvPoint >::const_reverse_iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_CvPointVector_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvPointVector_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_CvPointVector_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_CvPointVector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint >::size_type arg1 ;
-  std::vector<CvPoint > *result = 0 ;
+  std::vector< CvPoint >::size_type arg1 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvPointVector",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvPointVector" "', argument " "1"" of type '" "std::vector<CvPoint >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvPointVector" "', argument " "1"" of type '" "std::vector< CvPoint >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<CvPoint >::size_type >(val1);
-  result = (std::vector<CvPoint > *)new std::vector<CvPoint >(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, SWIG_POINTER_NEW |  0 );
+  arg1 = static_cast< std::vector< CvPoint >::size_type >(val1);
+  result = (std::vector< CvPoint > *)new std::vector< CvPoint >(arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9720,17 +10193,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_pop_back" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_pop_back" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   (arg1)->pop_back();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9741,8 +10214,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::size_type arg2 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -9751,16 +10224,16 @@ SWIGINTERN PyObject *_wrap_CvPointVector_resize__SWIG_0(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_resize" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_resize" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector_resize" "', argument " "2"" of type '" "std::vector<CvPoint >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector_resize" "', argument " "2"" of type '" "std::vector< CvPoint >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::size_type >(val2);
+  arg2 = static_cast< std::vector< CvPoint >::size_type >(val2);
   (arg1)->resize(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9771,36 +10244,36 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::iterator arg2 ;
-  std::vector<CvPoint >::iterator result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::iterator arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  swig::PySwigIterator *iter2 = 0 ;
+  swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  std::vector< CvPoint >::iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_erase" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_erase" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "2"" of type '" "std::vector<CvPoint >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "2"" of type '" "std::vector< CvPoint >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter2);
+    swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "2"" of type '" "std::vector<CvPoint >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "2"" of type '" "std::vector< CvPoint >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< CvPoint >::iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
@@ -9809,51 +10282,51 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::iterator arg2 ;
-  std::vector<CvPoint >::iterator arg3 ;
-  std::vector<CvPoint >::iterator result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::iterator arg2 ;
+  std::vector< CvPoint >::iterator arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  swig::PySwigIterator *iter2 = 0 ;
+  swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  swig::PySwigIterator *iter3 = 0 ;
+  swig::SwigPyIterator *iter3 = 0 ;
   int res3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  std::vector< CvPoint >::iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvPointVector_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_erase" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_erase" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "2"" of type '" "std::vector<CvPoint >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "2"" of type '" "std::vector< CvPoint >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter2);
+    swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "2"" of type '" "std::vector<CvPoint >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "2"" of type '" "std::vector< CvPoint >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "3"" of type '" "std::vector<CvPoint >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "3"" of type '" "std::vector< CvPoint >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter3);
+    swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "3"" of type '" "std::vector<CvPoint >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_erase" "', argument " "3"" of type '" "std::vector< CvPoint >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2,arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< CvPoint >::iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
@@ -9866,18 +10339,18 @@ SWIGINTERN PyObject *_wrap_CvPointVector_erase(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      swig::PySwigIterator *iter = 0;
-      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter) != 0));
+      swig::SwigPyIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_CvPointVector_erase__SWIG_0(self, args);
       }
@@ -9885,16 +10358,16 @@ SWIGINTERN PyObject *_wrap_CvPointVector_erase(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      swig::PySwigIterator *iter = 0;
-      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter) != 0));
+      swig::SwigPyIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter) != 0));
       if (_v) {
-        swig::PySwigIterator *iter = 0;
-        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter) != 0));
+        swig::SwigPyIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_CvPointVector_erase__SWIG_1(self, args);
         }
@@ -9903,39 +10376,42 @@ SWIGINTERN PyObject *_wrap_CvPointVector_erase(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<CvPoint >::iterator)\n    erase(std::vector<CvPoint >::iterator,std::vector<CvPoint >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< CvPoint > *,std::vector< CvPoint >::iterator)\n"
+    "    erase(std::vector< CvPoint > *,std::vector< CvPoint >::iterator,std::vector< CvPoint >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_CvPointVector__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint >::size_type arg1 ;
-  std::vector<CvPoint >::value_type *arg2 = 0 ;
-  std::vector<CvPoint > *result = 0 ;
+  std::vector< CvPoint >::size_type arg1 ;
+  std::vector< CvPoint >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  std::vector< CvPoint > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvPointVector",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvPointVector" "', argument " "1"" of type '" "std::vector<CvPoint >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CvPointVector" "', argument " "1"" of type '" "std::vector< CvPoint >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<CvPoint >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,  0  | 0);
+  arg1 = static_cast< std::vector< CvPoint >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_CvPointVector" "', argument " "2"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_CvPointVector" "', argument " "2"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvPointVector" "', argument " "2"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CvPointVector" "', argument " "2"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<CvPoint >::value_type * >(argp2);
-  result = (std::vector<CvPoint > *)new std::vector<CvPoint >(arg1,(std::vector<CvPoint >::value_type const &)*arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, SWIG_POINTER_NEW |  0 );
+  arg2 = reinterpret_cast< std::vector< CvPoint >::value_type * >(argp2);
+  result = (std::vector< CvPoint > *)new std::vector< CvPoint >(arg1,(std::vector< CvPoint >::value_type const &)*arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9948,7 +10424,7 @@ SWIGINTERN PyObject *_wrap_new_CvPointVector(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -9967,7 +10443,7 @@ SWIGINTERN PyObject *_wrap_new_CvPointVector(PyObject *self, PyObject *args) {
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_CvPointVector__SWIG_1(self, args);
@@ -9980,7 +10456,7 @@ SWIGINTERN PyObject *_wrap_new_CvPointVector(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_CvPointVector__SWIG_3(self, args);
@@ -9989,15 +10465,20 @@ SWIGINTERN PyObject *_wrap_new_CvPointVector(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvPointVector'.\n  Possible C/C++ prototypes are:\n    std::vector<(CvPoint)>()\n    std::vector<(CvPoint)>(std::vector<CvPoint > const &)\n    std::vector<(CvPoint)>(std::vector<CvPoint >::size_type)\n    std::vector<(CvPoint)>(std::vector<CvPoint >::size_type,std::vector<CvPoint >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvPointVector'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< CvPoint >()\n"
+    "    std::vector< CvPoint >(std::vector< CvPoint > const &)\n"
+    "    std::vector< CvPoint >(std::vector< CvPoint >::size_type)\n"
+    "    std::vector< CvPoint >(std::vector< CvPoint >::size_type,std::vector< CvPoint >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_CvPointVector_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::value_type *arg2 = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -10006,20 +10487,20 @@ SWIGINTERN PyObject *_wrap_CvPointVector_push_back(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_push_back" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_push_back" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,  0  | 0);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPointVector_push_back" "', argument " "2"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPointVector_push_back" "', argument " "2"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_push_back" "', argument " "2"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_push_back" "', argument " "2"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<CvPoint >::value_type * >(argp2);
-  (arg1)->push_back((std::vector<CvPoint >::value_type const &)*arg2);
+  arg2 = reinterpret_cast< std::vector< CvPoint >::value_type * >(argp2);
+  (arg1)->push_back((std::vector< CvPoint >::value_type const &)*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10029,23 +10510,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::value_type *result = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::value_type *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_front" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  {
-    std::vector<CvPoint >::value_type const &_result_ref = ((std::vector<CvPoint > const *)arg1)->front();
-    result = (std::vector<CvPoint >::value_type *) &_result_ref;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_front" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = (std::vector< CvPoint >::value_type *) &((std::vector< CvPoint > const *)arg1)->front();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -10054,23 +10532,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::value_type *result = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::value_type *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_back" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  {
-    std::vector<CvPoint >::value_type const &_result_ref = ((std::vector<CvPoint > const *)arg1)->back();
-    result = (std::vector<CvPoint >::value_type *) &_result_ref;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_back" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = (std::vector< CvPoint >::value_type *) &((std::vector< CvPoint > const *)arg1)->back();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -10079,9 +10554,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::size_type arg2 ;
-  std::vector<CvPoint >::value_type *arg3 = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::size_type arg2 ;
+  std::vector< CvPoint >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -10093,25 +10568,25 @@ SWIGINTERN PyObject *_wrap_CvPointVector_assign(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvPointVector_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_assign" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_assign" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector_assign" "', argument " "2"" of type '" "std::vector<CvPoint >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector_assign" "', argument " "2"" of type '" "std::vector< CvPoint >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,  0  | 0);
+  arg2 = static_cast< std::vector< CvPoint >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector_assign" "', argument " "3"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector_assign" "', argument " "3"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_assign" "', argument " "3"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_assign" "', argument " "3"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<CvPoint >::value_type * >(argp3);
-  (arg1)->assign(arg2,(std::vector<CvPoint >::value_type const &)*arg3);
+  arg3 = reinterpret_cast< std::vector< CvPoint >::value_type * >(argp3);
+  (arg1)->assign(arg2,(std::vector< CvPoint >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10121,9 +10596,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::size_type arg2 ;
-  std::vector<CvPoint >::value_type *arg3 = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::size_type arg2 ;
+  std::vector< CvPoint >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -10135,25 +10610,25 @@ SWIGINTERN PyObject *_wrap_CvPointVector_resize__SWIG_1(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvPointVector_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_resize" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_resize" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector_resize" "', argument " "2"" of type '" "std::vector<CvPoint >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector_resize" "', argument " "2"" of type '" "std::vector< CvPoint >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,  0  | 0);
+  arg2 = static_cast< std::vector< CvPoint >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector_resize" "', argument " "3"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector_resize" "', argument " "3"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_resize" "', argument " "3"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_resize" "', argument " "3"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<CvPoint >::value_type * >(argp3);
-  (arg1)->resize(arg2,(std::vector<CvPoint >::value_type const &)*arg3);
+  arg3 = reinterpret_cast< std::vector< CvPoint >::value_type * >(argp3);
+  (arg1)->resize(arg2,(std::vector< CvPoint >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10167,13 +10642,13 @@ SWIGINTERN PyObject *_wrap_CvPointVector_resize(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -10187,7 +10662,7 @@ SWIGINTERN PyObject *_wrap_CvPointVector_resize(PyObject *self, PyObject *args)
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -10195,7 +10670,7 @@ SWIGINTERN PyObject *_wrap_CvPointVector_resize(PyObject *self, PyObject *args)
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_CvPointVector_resize__SWIG_1(self, args);
@@ -10205,55 +10680,58 @@ SWIGINTERN PyObject *_wrap_CvPointVector_resize(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<CvPoint >::size_type)\n    resize(std::vector<CvPoint >::size_type,std::vector<CvPoint >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< CvPoint > *,std::vector< CvPoint >::size_type)\n"
+    "    resize(std::vector< CvPoint > *,std::vector< CvPoint >::size_type,std::vector< CvPoint >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_CvPointVector_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::iterator arg2 ;
-  std::vector<CvPoint >::value_type *arg3 = 0 ;
-  std::vector<CvPoint >::iterator result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::iterator arg2 ;
+  std::vector< CvPoint >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  swig::PySwigIterator *iter2 = 0 ;
+  swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  std::vector< CvPoint >::iterator result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvPointVector_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_insert" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_insert" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_insert" "', argument " "2"" of type '" "std::vector<CvPoint >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_insert" "', argument " "2"" of type '" "std::vector< CvPoint >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter2);
+    swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_insert" "', argument " "2"" of type '" "std::vector<CvPoint >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_insert" "', argument " "2"" of type '" "std::vector< CvPoint >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector_insert" "', argument " "3"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvPointVector_insert" "', argument " "3"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_insert" "', argument " "3"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_insert" "', argument " "3"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<CvPoint >::value_type * >(argp3);
-  result = (arg1)->insert(arg2,(std::vector<CvPoint >::value_type const &)*arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<CvPoint >::iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  arg3 = reinterpret_cast< std::vector< CvPoint >::value_type * >(argp3);
+  result = (arg1)->insert(arg2,(std::vector< CvPoint >::value_type const &)*arg3);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< CvPoint >::iterator & >(result)),
+    swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
   return NULL;
@@ -10262,13 +10740,13 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::iterator arg2 ;
-  std::vector<CvPoint >::size_type arg3 ;
-  std::vector<CvPoint >::value_type *arg4 = 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::iterator arg2 ;
+  std::vector< CvPoint >::size_type arg3 ;
+  std::vector< CvPoint >::value_type *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  swig::PySwigIterator *iter2 = 0 ;
+  swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
   size_t val3 ;
   int ecode3 = 0 ;
@@ -10280,36 +10758,36 @@ SWIGINTERN PyObject *_wrap_CvPointVector_insert__SWIG_1(PyObject *SWIGUNUSEDPARM
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvPointVector_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_insert" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_insert" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::SwigPyIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_insert" "', argument " "2"" of type '" "std::vector<CvPoint >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_insert" "', argument " "2"" of type '" "std::vector< CvPoint >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter2);
+    swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *iter_t = dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_insert" "', argument " "2"" of type '" "std::vector<CvPoint >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "CvPointVector_insert" "', argument " "2"" of type '" "std::vector< CvPoint >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvPointVector_insert" "', argument " "3"" of type '" "std::vector<CvPoint >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvPointVector_insert" "', argument " "3"" of type '" "std::vector< CvPoint >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<CvPoint >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,  0  | 0);
+  arg3 = static_cast< std::vector< CvPoint >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,  0  | 0);
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvPointVector_insert" "', argument " "4"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvPointVector_insert" "', argument " "4"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
   if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_insert" "', argument " "4"" of type '" "std::vector<CvPoint >::value_type const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CvPointVector_insert" "', argument " "4"" of type '" "std::vector< CvPoint >::value_type const &""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<CvPoint >::value_type * >(argp4);
-  (arg1)->insert(arg2,arg3,(std::vector<CvPoint >::value_type const &)*arg4);
+  arg4 = reinterpret_cast< std::vector< CvPoint >::value_type * >(argp4);
+  (arg1)->insert(arg2,arg3,(std::vector< CvPoint >::value_type const &)*arg4);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10323,20 +10801,20 @@ SWIGINTERN PyObject *_wrap_CvPointVector_insert(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      swig::PySwigIterator *iter = 0;
-      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter) != 0));
+      swig::SwigPyIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter) != 0));
       if (_v) {
-        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_CvPointVector_insert__SWIG_0(self, args);
@@ -10346,19 +10824,19 @@ SWIGINTERN PyObject *_wrap_CvPointVector_insert(PyObject *self, PyObject *args)
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
-      swig::PySwigIterator *iter = 0;
-      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<CvPoint >::iterator > *>(iter) != 0));
+      swig::SwigPyIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< CvPoint >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_CvPointVector_insert__SWIG_1(self, args);
@@ -10369,15 +10847,18 @@ SWIGINTERN PyObject *_wrap_CvPointVector_insert(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<CvPoint >::iterator,std::vector<CvPoint >::value_type const &)\n    insert(std::vector<CvPoint >::iterator,std::vector<CvPoint >::size_type,std::vector<CvPoint >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvPointVector_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< CvPoint > *,std::vector< CvPoint >::iterator,std::vector< CvPoint >::value_type const &)\n"
+    "    insert(std::vector< CvPoint > *,std::vector< CvPoint >::iterator,std::vector< CvPoint >::size_type,std::vector< CvPoint >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_CvPointVector_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::size_type arg2 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
+  std::vector< CvPoint >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -10386,16 +10867,16 @@ SWIGINTERN PyObject *_wrap_CvPointVector_reserve(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvPointVector_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_reserve" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_reserve" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector_reserve" "', argument " "2"" of type '" "std::vector<CvPoint >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvPointVector_reserve" "', argument " "2"" of type '" "std::vector< CvPoint >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<CvPoint >::size_type >(val2);
+  arg2 = static_cast< std::vector< CvPoint >::size_type >(val2);
   (arg1)->reserve(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -10406,19 +10887,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvPointVector_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
-  std::vector<CvPoint >::size_type result;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  std::vector< CvPoint >::size_type result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPointVector_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_capacity" "', argument " "1"" of type '" "std::vector<CvPoint > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvPointVector_capacity" "', argument " "1"" of type '" "std::vector< CvPoint > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
-  result = ((std::vector<CvPoint > const *)arg1)->capacity();
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
+  result = ((std::vector< CvPoint > const *)arg1)->capacity();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -10428,20 +10909,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvPointVector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<CvPoint > *arg1 = (std::vector<CvPoint > *) 0 ;
+  std::vector< CvPoint > *arg1 = (std::vector< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvPointVector",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvPointVector" "', argument " "1"" of type '" "std::vector<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvPointVector" "', argument " "1"" of type '" "std::vector< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< CvPoint > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -10457,8 +10938,8 @@ fail:
 
 SWIGINTERN PyObject *CvPointVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -10467,13 +10948,13 @@ SWIGINTERN PyObject *_wrap_cvCvtSeqToArray__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   CvSeq *arg1 = (CvSeq *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   CvSlice arg3 ;
-  CvArr *result = 0 ;
   void *ptr1 ;
   bool freearg2 = false ;
   CvSlice temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvArr *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvCvtSeqToArray",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -10540,11 +11021,11 @@ SWIGINTERN PyObject *_wrap_cvCvtSeqToArray__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvArr *result = 0 ;
   void *ptr1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvArr *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvCvtSeqToArray",&obj0,&obj1)) SWIG_fail;
   {
@@ -10592,7 +11073,7 @@ SWIGINTERN PyObject *_wrap_cvCvtSeqToArray(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -10630,7 +11111,10 @@ SWIGINTERN PyObject *_wrap_cvCvtSeqToArray(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvCvtSeqToArray'.\n  Possible C/C++ prototypes are:\n    cvCvtSeqToArray_Shadow(CvSeq const *,CvArr *,CvSlice)\n    cvCvtSeqToArray_Shadow(CvSeq const *,CvArr *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvCvtSeqToArray'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvCvtSeqToArray_Shadow(CvSeq const *,CvArr *,CvSlice)\n"
+    "    cvCvtSeqToArray_Shadow(CvSeq const *,CvArr *)\n");
   return NULL;
 }
 
@@ -10644,7 +11128,6 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_0(PyObject *SWIGUNUSEDPARM(
   int arg5 ;
   int arg6 ;
   CvSize arg7 ;
-  CvTypedSeq<CvRect > *result = 0 ;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -10664,6 +11147,7 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_0(PyObject *SWIGUNUSEDPARM(
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvTypedSeq< CvRect > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:cvHaarDetectObjects",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
@@ -10715,8 +11199,8 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_0(PyObject *SWIGUNUSEDPARM(
       arg7 = *ptr;
     }
   }
-  result = (CvTypedSeq<CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  result = (CvTypedSeq< CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   {
     if(arg1!=NULL && freearg1)
     {
@@ -10745,7 +11229,6 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_1(PyObject *SWIGUNUSEDPARM(
   double arg4 ;
   int arg5 ;
   int arg6 ;
-  CvTypedSeq<CvRect > *result = 0 ;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -10763,6 +11246,7 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_1(PyObject *SWIGUNUSEDPARM(
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvTypedSeq< CvRect > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:cvHaarDetectObjects",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -10793,8 +11277,8 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_1(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvHaarDetectObjects" "', argument " "6"" of type '" "int""'");
   } 
   arg6 = static_cast< int >(val6);
-  result = (CvTypedSeq<CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3,arg4,arg5,arg6);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  result = (CvTypedSeq< CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3,arg4,arg5,arg6);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   {
     if(arg1!=NULL && freearg1)
     {
@@ -10822,7 +11306,6 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_2(PyObject *SWIGUNUSEDPARM(
   CvMemStorage *arg3 = (CvMemStorage *) 0 ;
   double arg4 ;
   int arg5 ;
-  CvTypedSeq<CvRect > *result = 0 ;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -10837,6 +11320,7 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_2(PyObject *SWIGUNUSEDPARM(
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvTypedSeq< CvRect > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvHaarDetectObjects",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -10862,8 +11346,8 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_2(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvHaarDetectObjects" "', argument " "5"" of type '" "int""'");
   } 
   arg5 = static_cast< int >(val5);
-  result = (CvTypedSeq<CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3,arg4,arg5);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  result = (CvTypedSeq< CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3,arg4,arg5);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   {
     if(arg1!=NULL && freearg1)
     {
@@ -10890,7 +11374,6 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_3(PyObject *SWIGUNUSEDPARM(
   CvHaarClassifierCascade *arg2 = (CvHaarClassifierCascade *) 0 ;
   CvMemStorage *arg3 = (CvMemStorage *) 0 ;
   double arg4 ;
-  CvTypedSeq<CvRect > *result = 0 ;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -10902,6 +11385,7 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_3(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvTypedSeq< CvRect > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvHaarDetectObjects",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -10922,8 +11406,8 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_3(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvHaarDetectObjects" "', argument " "4"" of type '" "double""'");
   } 
   arg4 = static_cast< double >(val4);
-  result = (CvTypedSeq<CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3,arg4);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  result = (CvTypedSeq< CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3,arg4);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   {
     if(arg1!=NULL && freearg1)
     {
@@ -10949,7 +11433,6 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_4(PyObject *SWIGUNUSEDPARM(
   CvArr *arg1 = (CvArr *) 0 ;
   CvHaarClassifierCascade *arg2 = (CvHaarClassifierCascade *) 0 ;
   CvMemStorage *arg3 = (CvMemStorage *) 0 ;
-  CvTypedSeq<CvRect > *result = 0 ;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -10958,6 +11441,7 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_4(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvTypedSeq< CvRect > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvHaarDetectObjects",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -10973,8 +11457,8 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects__SWIG_4(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvHaarDetectObjects" "', argument " "3"" of type '" "CvMemStorage *""'"); 
   }
   arg3 = reinterpret_cast< CvMemStorage * >(argp3);
-  result = (CvTypedSeq<CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  result = (CvTypedSeq< CvRect > *)cvHaarDetectObjects_Shadow((void const *)arg1,arg2,arg3);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   {
     if(arg1!=NULL && freearg1)
     {
@@ -11001,7 +11485,7 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 7); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -11160,7 +11644,13 @@ SWIGINTERN PyObject *_wrap_cvHaarDetectObjects(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvHaarDetectObjects'.\n  Possible C/C++ prototypes are:\n    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *,double,int,int,CvSize)\n    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *,double,int,int)\n    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *,double,int)\n    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *,double)\n    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvHaarDetectObjects'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *,double,int,int,CvSize)\n"
+    "    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *,double,int,int)\n"
+    "    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *,double,int)\n"
+    "    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *,double)\n"
+    "    cvHaarDetectObjects_Shadow(CvArr const *,CvHaarClassifierCascade *,CvMemStorage *)\n");
   return NULL;
 }
 
@@ -11172,7 +11662,6 @@ SWIGINTERN PyObject *_wrap_cvSegmentMotion(PyObject *SWIGUNUSEDPARM(self), PyObj
   CvMemStorage *arg3 = (CvMemStorage *) 0 ;
   double arg4 ;
   double arg5 ;
-  CvTypedSeq<CvConnectedComp > *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   void *argp3 = 0 ;
@@ -11186,6 +11675,7 @@ SWIGINTERN PyObject *_wrap_cvSegmentMotion(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvTypedSeq< CvConnectedComp > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvSegmentMotion",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -11209,8 +11699,8 @@ SWIGINTERN PyObject *_wrap_cvSegmentMotion(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvSegmentMotion" "', argument " "5"" of type '" "double""'");
   } 
   arg5 = static_cast< double >(val5);
-  result = (CvTypedSeq<CvConnectedComp > *)cvSegmentMotion_Shadow((void const *)arg1,arg2,arg3,arg4,arg5);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, 0 |  0 );
+  result = (CvTypedSeq< CvConnectedComp > *)cvSegmentMotion_Shadow((void const *)arg1,arg2,arg3,arg4,arg5);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, 0 |  0 );
   {
     if(arg1!=NULL && freearg1)
     {
@@ -11253,7 +11743,6 @@ SWIGINTERN PyObject *_wrap_cvApproxPoly__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   int arg4 ;
   double arg5 ;
   int arg6 ;
-  CvTypedSeq<CvPoint > *result = 0 ;
   int res1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -11271,6 +11760,7 @@ SWIGINTERN PyObject *_wrap_cvApproxPoly__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvTypedSeq< CvPoint > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:cvApproxPoly",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -11302,8 +11792,8 @@ SWIGINTERN PyObject *_wrap_cvApproxPoly__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "cvApproxPoly" "', argument " "6"" of type '" "int""'");
   } 
   arg6 = static_cast< int >(val6);
-  result = (CvTypedSeq<CvPoint > *)cvApproxPoly_Shadow((void const *)arg1,arg2,arg3,arg4,arg5,arg6);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvPoint_t, 0 |  0 );
+  result = (CvTypedSeq< CvPoint > *)cvApproxPoly_Shadow((void const *)arg1,arg2,arg3,arg4,arg5,arg6);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvPoint_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11317,7 +11807,6 @@ SWIGINTERN PyObject *_wrap_cvApproxPoly__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   CvMemStorage *arg3 = (CvMemStorage *) 0 ;
   int arg4 ;
   double arg5 ;
-  CvTypedSeq<CvPoint > *result = 0 ;
   int res1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -11332,6 +11821,7 @@ SWIGINTERN PyObject *_wrap_cvApproxPoly__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvTypedSeq< CvPoint > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvApproxPoly",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -11358,8 +11848,8 @@ SWIGINTERN PyObject *_wrap_cvApproxPoly__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "cvApproxPoly" "', argument " "5"" of type '" "double""'");
   } 
   arg5 = static_cast< double >(val5);
-  result = (CvTypedSeq<CvPoint > *)cvApproxPoly_Shadow((void const *)arg1,arg2,arg3,arg4,arg5);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvPoint_t, 0 |  0 );
+  result = (CvTypedSeq< CvPoint > *)cvApproxPoly_Shadow((void const *)arg1,arg2,arg3,arg4,arg5);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvPoint_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11372,7 +11862,7 @@ SWIGINTERN PyObject *_wrap_cvApproxPoly(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -11448,7 +11938,10 @@ SWIGINTERN PyObject *_wrap_cvApproxPoly(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvApproxPoly'.\n  Possible C/C++ prototypes are:\n    cvApproxPoly_Shadow(void const *,int,CvMemStorage *,int,double,int)\n    cvApproxPoly_Shadow(void const *,int,CvMemStorage *,int,double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvApproxPoly'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvApproxPoly_Shadow(void const *,int,CvMemStorage *,int,double,int)\n"
+    "    cvApproxPoly_Shadow(void const *,int,CvMemStorage *,int,double)\n");
   return NULL;
 }
 
@@ -11458,7 +11951,6 @@ SWIGINTERN PyObject *_wrap_cvConvexHull2__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 ;
   int arg3 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -11467,6 +11959,7 @@ SWIGINTERN PyObject *_wrap_cvConvexHull2__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvConvexHull2",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -11508,12 +12001,12 @@ SWIGINTERN PyObject *_wrap_cvConvexHull2__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvConvexHull2",&obj0,&obj1)) SWIG_fail;
   {
@@ -11549,9 +12042,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvConvexHull2__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvConvexHull2",&obj0)) SWIG_fail;
   {
@@ -11585,7 +12078,7 @@ SWIGINTERN PyObject *_wrap_cvConvexHull2(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -11636,7 +12129,11 @@ SWIGINTERN PyObject *_wrap_cvConvexHull2(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvConvexHull2'.\n  Possible C/C++ prototypes are:\n    cvConvexHull2_Shadow(CvArr const *,int,int)\n    cvConvexHull2_Shadow(CvArr const *,int)\n    cvConvexHull2_Shadow(CvArr const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvConvexHull2'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvConvexHull2_Shadow(CvArr const *,int,int)\n"
+    "    cvConvexHull2_Shadow(CvArr const *,int)\n"
+    "    cvConvexHull2_Shadow(CvArr const *)\n");
   return NULL;
 }
 
@@ -11644,14 +12141,13 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSnakeImage__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  std::vector<CvPoint,std::allocator<CvPoint > > arg2 ;
-  std::vector<float,std::allocator<float > > arg3 ;
-  std::vector<float,std::allocator<float > > arg4 ;
-  std::vector<float,std::allocator<float > > arg5 ;
+  std::vector< CvPoint,std::allocator< CvPoint > > arg2 ;
+  std::vector< float,std::allocator< float > > arg3 ;
+  std::vector< float,std::allocator< float > > arg4 ;
+  std::vector< float,std::allocator< float > > arg5 ;
   CvSize arg6 ;
   CvTermCriteria arg7 ;
   int arg8 ;
-  std::vector<CvPoint,std::allocator<CvPoint > > result;
   bool freearg1 = false ;
   CvSize temp6 ;
   CvTermCriteria temp7 ;
@@ -11665,43 +12161,44 @@ SWIGINTERN PyObject *_wrap_cvSnakeImage__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  std::vector< CvPoint,std::allocator< CvPoint > > result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:cvSnakeImage",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     arg1 = (CvMat*)PyObject_to_CvArr(obj0, &freearg1);
   }
   {
-    std::vector<CvPoint,std::allocator<CvPoint > > *ptr = (std::vector<CvPoint,std::allocator<CvPoint > > *)0;
+    std::vector<CvPoint,std::allocator< CvPoint > > *ptr = (std::vector<CvPoint,std::allocator< CvPoint > > *)0;
     int res = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "2"" of type '" "std::vector<CvPoint,std::allocator<CvPoint > >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "2"" of type '" "std::vector< CvPoint,std::allocator< CvPoint > >""'"); 
     }
     arg2 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
   }
   {
-    std::vector<float,std::allocator<float > > *ptr = (std::vector<float,std::allocator<float > > *)0;
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
     int res = swig::asptr(obj2, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "3"" of type '" "std::vector<float,std::allocator<float > >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "3"" of type '" "std::vector< float,std::allocator< float > >""'"); 
     }
     arg3 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
   }
   {
-    std::vector<float,std::allocator<float > > *ptr = (std::vector<float,std::allocator<float > > *)0;
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
     int res = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "4"" of type '" "std::vector<float,std::allocator<float > >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "4"" of type '" "std::vector< float,std::allocator< float > >""'"); 
     }
     arg4 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
   }
   {
-    std::vector<float,std::allocator<float > > *ptr = (std::vector<float,std::allocator<float > > *)0;
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
     int res = swig::asptr(obj4, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "5"" of type '" "std::vector<float,std::allocator<float > >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "5"" of type '" "std::vector< float,std::allocator< float > >""'"); 
     }
     arg5 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
@@ -11754,7 +12251,7 @@ SWIGINTERN PyObject *_wrap_cvSnakeImage__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg8 = static_cast< int >(val8);
   result = cvSnakeImage_Shadow((CvMat const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-  resultobj = swig::from(static_cast< std::vector<CvPoint,std::allocator<CvPoint > > >(result));
+  resultobj = swig::from(static_cast< std::vector<CvPoint,std::allocator< CvPoint > > >(result));
   {
     if(arg1!=NULL && freearg1){
       cvReleaseData( arg1 );
@@ -11776,13 +12273,12 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSnakeImage__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  std::vector<CvPoint,std::allocator<CvPoint > > arg2 ;
-  std::vector<float,std::allocator<float > > arg3 ;
-  std::vector<float,std::allocator<float > > arg4 ;
-  std::vector<float,std::allocator<float > > arg5 ;
+  std::vector< CvPoint,std::allocator< CvPoint > > arg2 ;
+  std::vector< float,std::allocator< float > > arg3 ;
+  std::vector< float,std::allocator< float > > arg4 ;
+  std::vector< float,std::allocator< float > > arg5 ;
   CvSize arg6 ;
   CvTermCriteria arg7 ;
-  std::vector<CvPoint,std::allocator<CvPoint > > result;
   bool freearg1 = false ;
   CvSize temp6 ;
   CvTermCriteria temp7 ;
@@ -11793,43 +12289,44 @@ SWIGINTERN PyObject *_wrap_cvSnakeImage__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  std::vector< CvPoint,std::allocator< CvPoint > > result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:cvSnakeImage",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (CvMat*)PyObject_to_CvArr(obj0, &freearg1);
   }
   {
-    std::vector<CvPoint,std::allocator<CvPoint > > *ptr = (std::vector<CvPoint,std::allocator<CvPoint > > *)0;
+    std::vector<CvPoint,std::allocator< CvPoint > > *ptr = (std::vector<CvPoint,std::allocator< CvPoint > > *)0;
     int res = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "2"" of type '" "std::vector<CvPoint,std::allocator<CvPoint > >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "2"" of type '" "std::vector< CvPoint,std::allocator< CvPoint > >""'"); 
     }
     arg2 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
   }
   {
-    std::vector<float,std::allocator<float > > *ptr = (std::vector<float,std::allocator<float > > *)0;
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
     int res = swig::asptr(obj2, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "3"" of type '" "std::vector<float,std::allocator<float > >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "3"" of type '" "std::vector< float,std::allocator< float > >""'"); 
     }
     arg3 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
   }
   {
-    std::vector<float,std::allocator<float > > *ptr = (std::vector<float,std::allocator<float > > *)0;
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
     int res = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "4"" of type '" "std::vector<float,std::allocator<float > >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "4"" of type '" "std::vector< float,std::allocator< float > >""'"); 
     }
     arg4 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
   }
   {
-    std::vector<float,std::allocator<float > > *ptr = (std::vector<float,std::allocator<float > > *)0;
+    std::vector<float,std::allocator< float > > *ptr = (std::vector<float,std::allocator< float > > *)0;
     int res = swig::asptr(obj4, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "5"" of type '" "std::vector<float,std::allocator<float > >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "cvSnakeImage" "', argument " "5"" of type '" "std::vector< float,std::allocator< float > >""'"); 
     }
     arg5 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
@@ -11877,7 +12374,7 @@ SWIGINTERN PyObject *_wrap_cvSnakeImage__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   result = cvSnakeImage_Shadow((CvMat const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-  resultobj = swig::from(static_cast< std::vector<CvPoint,std::allocator<CvPoint > > >(result));
+  resultobj = swig::from(static_cast< std::vector<CvPoint,std::allocator< CvPoint > > >(result));
   {
     if(arg1!=NULL && freearg1){
       cvReleaseData( arg1 );
@@ -11902,7 +12399,7 @@ SWIGINTERN PyObject *_wrap_cvSnakeImage(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 8); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -11912,16 +12409,16 @@ SWIGINTERN PyObject *_wrap_cvSnakeImage(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = swig::asptr(argv[1], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+      int res = swig::asptr(argv[1], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = swig::asptr(argv[2], (std::vector<float,std::allocator<float > >**)(0));
+        int res = swig::asptr(argv[2], (std::vector<float,std::allocator< float > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          int res = swig::asptr(argv[3], (std::vector<float,std::allocator<float > >**)(0));
+          int res = swig::asptr(argv[3], (std::vector<float,std::allocator< float > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            int res = swig::asptr(argv[4], (std::vector<float,std::allocator<float > >**)(0));
+            int res = swig::asptr(argv[4], (std::vector<float,std::allocator< float > >**)(0));
             _v = SWIG_CheckState(res);
             if (_v) {
               int res = SWIG_ConvertPtr(argv[5], 0, SWIGTYPE_p_CvSize, 0);
@@ -11945,16 +12442,16 @@ SWIGINTERN PyObject *_wrap_cvSnakeImage(PyObject *self, PyObject *args) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvMat, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = swig::asptr(argv[1], (std::vector<CvPoint,std::allocator<CvPoint > >**)(0));
+      int res = swig::asptr(argv[1], (std::vector<CvPoint,std::allocator< CvPoint > >**)(0));
       _v = SWIG_CheckState(res);
       if (_v) {
-        int res = swig::asptr(argv[2], (std::vector<float,std::allocator<float > >**)(0));
+        int res = swig::asptr(argv[2], (std::vector<float,std::allocator< float > >**)(0));
         _v = SWIG_CheckState(res);
         if (_v) {
-          int res = swig::asptr(argv[3], (std::vector<float,std::allocator<float > >**)(0));
+          int res = swig::asptr(argv[3], (std::vector<float,std::allocator< float > >**)(0));
           _v = SWIG_CheckState(res);
           if (_v) {
-            int res = swig::asptr(argv[4], (std::vector<float,std::allocator<float > >**)(0));
+            int res = swig::asptr(argv[4], (std::vector<float,std::allocator< float > >**)(0));
             _v = SWIG_CheckState(res);
             if (_v) {
               int res = SWIG_ConvertPtr(argv[5], 0, SWIGTYPE_p_CvSize, 0);
@@ -11980,7 +12477,10 @@ SWIGINTERN PyObject *_wrap_cvSnakeImage(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvSnakeImage'.\n  Possible C/C++ prototypes are:\n    cvSnakeImage_Shadow(CvMat const *,std::vector<CvPoint,std::allocator<CvPoint > >,std::vector<float,std::allocator<float > >,std::vector<float,std::allocator<float > >,std::vector<float,std::allocator<float > >,CvSize,CvTermCriteria,int)\n    cvSnakeImage_Shadow(CvMat const *,std::vector<CvPoint,std::allocator<CvPoint > >,std::vector<float,std::allocator<float > >,std::vector<float,std::allocator<float > >,std::vector<float,std::allocator<float > >,CvSize,CvTermCriteria)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvSnakeImage'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvSnakeImage_Shadow(CvMat const *,std::vector< CvPoint,std::allocator< CvPoint > >,std::vector< float,std::allocator< float > >,std::vector< float,std::allocator< float > >,std::vector< float,std::allocator< float > >,CvSize,CvTermCriteria,int)\n"
+    "    cvSnakeImage_Shadow(CvMat const *,std::vector< CvPoint,std::allocator< CvPoint > >,std::vector< float,std::allocator< float > >,std::vector< float,std::allocator< float > >,std::vector< float,std::allocator< float > >,CvSize,CvTermCriteria)\n");
   return NULL;
 }
 
@@ -12064,7 +12564,6 @@ SWIGINTERN PyObject *_wrap_CV_MAT_ELEM_PTR(PyObject *SWIGUNUSEDPARM(self), PyObj
   CvMat arg1 ;
   int arg2 ;
   int arg3 ;
-  void *result = 0 ;
   void *argp1 ;
   int res1 = 0 ;
   int val2 ;
@@ -12074,6 +12573,7 @@ SWIGINTERN PyObject *_wrap_CV_MAT_ELEM_PTR(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CV_MAT_ELEM_PTR",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -12113,7 +12613,6 @@ SWIGINTERN PyObject *_wrap_CV_MAT_ELEM_PTR_FAST(PyObject *SWIGUNUSEDPARM(self),
   int arg2 ;
   int arg3 ;
   int arg4 ;
-  void *result = 0 ;
   void *argp1 ;
   int res1 = 0 ;
   int val2 ;
@@ -12126,6 +12625,7 @@ SWIGINTERN PyObject *_wrap_CV_MAT_ELEM_PTR_FAST(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CV_MAT_ELEM_PTR_FAST",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -12168,13 +12668,13 @@ SWIGINTERN PyObject *_wrap_CV_NODE_VAL(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
   CvSparseNode *arg2 = (CvSparseNode *) 0 ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_NODE_VAL",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -12199,13 +12699,13 @@ SWIGINTERN PyObject *_wrap_CV_NODE_IDX(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
   CvSparseNode *arg2 = (CvSparseNode *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_NODE_IDX",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -12229,11 +12729,11 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_SUBDIV2D_NEXT_EDGE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge arg1 ;
-  CvQuadEdge2D *result = 0 ;
   CvSubdiv2DEdge_Wrapper *wrapper1 ;
   CvQuadEdge2D *qedge1 ;
   void *vptr1 ;
   PyObject * obj0 = 0 ;
+  CvQuadEdge2D *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_SUBDIV2D_NEXT_EDGE",&obj0)) SWIG_fail;
   {
@@ -12301,13 +12801,13 @@ SWIGINTERN PyObject *_wrap_CV_IMIN(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_IMIN",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12332,13 +12832,13 @@ SWIGINTERN PyObject *_wrap_CV_IMAX(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_IMAX",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12362,10 +12862,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IABS(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IABS",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12477,9 +12977,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_IMAGE_HDR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_IMAGE_HDR",&obj0)) SWIG_fail;
   {
@@ -12510,9 +13010,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_IMAGE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_IMAGE",&obj0)) SWIG_fail;
   {
@@ -12540,17 +13040,39 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_CV_MAT_DEPTH(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CV_MAT_DEPTH",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "CV_MAT_DEPTH" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  result = (int)CV_MAT_DEPTH(arg1);
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_CV_MAKETYPE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_MAKETYPE",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12574,10 +13096,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_8UC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_8UC",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12596,10 +13118,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_8SC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_8SC",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12618,10 +13140,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_16UC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_16UC",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12640,10 +13162,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_16SC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_16SC",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12662,10 +13184,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_32SC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_32SC",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12684,10 +13206,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_32FC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_32FC",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12706,10 +13228,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_64FC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_64FC",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12728,10 +13250,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_MAT_CN(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_MAT_CN",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12747,35 +13269,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CV_MAT_DEPTH(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  int arg1 ;
-  int result;
-  int val1 ;
-  int ecode1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:CV_MAT_DEPTH",&obj0)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(obj0, &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "CV_MAT_DEPTH" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = static_cast< int >(val1);
-  result = (int)CV_MAT_DEPTH(arg1);
-  resultobj = SWIG_From_int(static_cast< int >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_CV_MAT_TYPE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_MAT_TYPE",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12794,10 +13294,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_MAT_CONT(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_MAT_CONT",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12816,10 +13316,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_TEMP_MAT(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_TEMP_MAT",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -12838,9 +13338,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_MAT_HDR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_MAT_HDR",&obj0)) SWIG_fail;
   {
@@ -12869,9 +13369,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_MAT(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_MAT",&obj0)) SWIG_fail;
   {
@@ -12900,9 +13400,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_MASK_ARR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_MASK_ARR",&obj0)) SWIG_fail;
   {
@@ -12932,11 +13432,11 @@ SWIGINTERN PyObject *_wrap_CV_ARE_TYPES_EQ(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_ARE_TYPES_EQ",&obj0,&obj1)) SWIG_fail;
   {
@@ -12981,11 +13481,11 @@ SWIGINTERN PyObject *_wrap_CV_ARE_CNS_EQ(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_ARE_CNS_EQ",&obj0,&obj1)) SWIG_fail;
   {
@@ -13030,11 +13530,11 @@ SWIGINTERN PyObject *_wrap_CV_ARE_DEPTHS_EQ(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_ARE_DEPTHS_EQ",&obj0,&obj1)) SWIG_fail;
   {
@@ -13079,11 +13579,11 @@ SWIGINTERN PyObject *_wrap_CV_ARE_SIZES_EQ(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_ARE_SIZES_EQ",&obj0,&obj1)) SWIG_fail;
   {
@@ -13127,9 +13627,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_MAT_CONST(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_MAT_CONST",&obj0)) SWIG_fail;
   {
@@ -13158,10 +13658,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_ELEM_SIZE1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_ELEM_SIZE1",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -13180,10 +13680,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_ELEM_SIZE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_ELEM_SIZE",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -13202,9 +13702,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_MATND_HDR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_MATND_HDR",&obj0)) SWIG_fail;
   {
@@ -13233,9 +13733,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_MATND(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_MATND",&obj0)) SWIG_fail;
   {
@@ -13264,9 +13764,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SPARSE_MAT_HDR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SPARSE_MAT_HDR",&obj0)) SWIG_fail;
   {
@@ -13295,9 +13795,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SPARSE_MAT(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SPARSE_MAT",&obj0)) SWIG_fail;
   {
@@ -13326,10 +13826,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_HIST(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_HIST",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -13348,10 +13848,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_UNIFORM_HIST(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_UNIFORM_HIST",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -13370,10 +13870,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SPARSE_HIST(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SPARSE_HIST",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -13392,10 +13892,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_HIST_HAS_RANGES(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_HIST_HAS_RANGES",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -13414,10 +13914,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_STORAGE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_STORAGE",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -13436,9 +13936,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SET_ELEM(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   void *arg1 = (void *) 0 ;
-  int result;
   int res1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SET_ELEM",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -13456,9 +13956,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ",&obj0)) SWIG_fail;
   {
@@ -13486,9 +13986,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SET(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SET",&obj0)) SWIG_fail;
   {
@@ -13512,9 +14012,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_SEQ_ELTYPE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_SEQ_ELTYPE",&obj0)) SWIG_fail;
   {
@@ -13542,9 +14042,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_SEQ_KIND(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_SEQ_KIND",&obj0)) SWIG_fail;
   {
@@ -13572,9 +14072,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_INDEX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_INDEX",&obj0)) SWIG_fail;
   {
@@ -13602,9 +14102,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_CURVE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_CURVE",&obj0)) SWIG_fail;
   {
@@ -13632,9 +14132,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_CLOSED(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_CLOSED",&obj0)) SWIG_fail;
   {
@@ -13662,9 +14162,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_CONVEX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_CONVEX",&obj0)) SWIG_fail;
   {
@@ -13692,9 +14192,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_HOLE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_HOLE",&obj0)) SWIG_fail;
   {
@@ -13722,9 +14222,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_SIMPLE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_SIMPLE",&obj0)) SWIG_fail;
   {
@@ -13752,9 +14252,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_POINT_SET(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_POINT_SET",&obj0)) SWIG_fail;
   {
@@ -13782,9 +14282,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_POINT_SUBSET(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_POINT_SUBSET",&obj0)) SWIG_fail;
   {
@@ -13812,9 +14312,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_POLYLINE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_POLYLINE",&obj0)) SWIG_fail;
   {
@@ -13842,9 +14342,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_POLYGON(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_POLYGON",&obj0)) SWIG_fail;
   {
@@ -13872,9 +14372,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_CHAIN(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_CHAIN",&obj0)) SWIG_fail;
   {
@@ -13902,9 +14402,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_CONTOUR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_CONTOUR",&obj0)) SWIG_fail;
   {
@@ -13932,9 +14432,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_CHAIN_CONTOUR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_CHAIN_CONTOUR",&obj0)) SWIG_fail;
   {
@@ -13962,9 +14462,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SEQ_POLYGON_TREE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SEQ_POLYGON_TREE",&obj0)) SWIG_fail;
   {
@@ -13992,9 +14492,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_GRAPH(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_GRAPH",&obj0)) SWIG_fail;
   {
@@ -14022,9 +14522,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_GRAPH_ORIENTED(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_GRAPH_ORIENTED",&obj0)) SWIG_fail;
   {
@@ -14052,9 +14552,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_SUBDIV2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_SUBDIV2D",&obj0)) SWIG_fail;
   {
@@ -14353,10 +14853,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_CURRENT_POINT(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader arg1 ;
-  CvPoint result;
   void *argp1 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_CURRENT_POINT",&obj0)) SWIG_fail;
   {
@@ -14383,10 +14883,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_PREV_POINT(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader arg1 ;
-  CvPoint result;
   void *argp1 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_PREV_POINT",&obj0)) SWIG_fail;
   {
@@ -14491,13 +14991,13 @@ SWIGINTERN PyObject *_wrap_CV_NEXT_GRAPH_EDGE(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   CvGraphEdge *arg1 = (CvGraphEdge *) 0 ;
   CvGraphVtx *arg2 = (CvGraphVtx *) 0 ;
-  CvGraphEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvGraphEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CV_NEXT_GRAPH_EDGE",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphEdge, 0 |  0 );
@@ -14521,10 +15021,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_TYPE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_TYPE",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14543,10 +15043,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_INT(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_INT",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14565,10 +15065,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_REAL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_REAL",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14587,10 +15087,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_STRING(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_STRING",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14609,10 +15109,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_SEQ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_SEQ",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14631,10 +15131,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_MAP(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_MAP",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14653,10 +15153,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_COLLECTION(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_COLLECTION",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14675,10 +15175,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_FLOW(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_FLOW",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14697,10 +15197,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_EMPTY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_EMPTY",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14719,10 +15219,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_IS_USER(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_IS_USER",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14741,10 +15241,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_HAS_NAME(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_HAS_NAME",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -14763,9 +15263,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_NODE_SEQ_IS_SIMPLE(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_NODE_SEQ_IS_SIMPLE",&obj0)) SWIG_fail;
   {
@@ -15254,12 +15754,12 @@ SWIGINTERN PyObject *_wrap_cvGraphVtxIdx(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
   CvGraphVtx *arg2 = (CvGraphVtx *) 0 ;
-  int result;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGraphVtxIdx",&obj0,&obj1)) SWIG_fail;
   {
@@ -15288,12 +15788,12 @@ SWIGINTERN PyObject *_wrap_cvGraphEdgeIdx(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
   CvGraphEdge *arg2 = (CvGraphEdge *) 0 ;
-  int result;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGraphEdgeIdx",&obj0,&obj1)) SWIG_fail;
   {
@@ -15321,9 +15821,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGraphGetVtxCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGraphGetVtxCount",&obj0)) SWIG_fail;
   {
@@ -15346,9 +15846,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGraphGetEdgeCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGraphGetEdgeCount",&obj0)) SWIG_fail;
   {
@@ -15371,10 +15871,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_GRAPH_VERTEX_VISITED(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphVtx *arg1 = (CvGraphVtx *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_GRAPH_VERTEX_VISITED",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphVtx, 0 |  0 );
@@ -15393,10 +15893,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_GRAPH_EDGE_VISITED(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphEdge *arg1 = (CvGraphEdge *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_GRAPH_EDGE_VISITED",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphEdge, 0 |  0 );
@@ -15417,7 +15917,6 @@ SWIGINTERN PyObject *_wrap_CV_RGB(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   double arg1 ;
   double arg2 ;
   int arg3 ;
-  CvScalar result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -15427,6 +15926,7 @@ SWIGINTERN PyObject *_wrap_CV_RGB(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CV_RGB",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -15523,9 +16023,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CV_IS_HAAR_CLASSIFIER(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   void *arg1 = (void *) 0 ;
-  int result;
   int res1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CV_IS_HAAR_CLASSIFIER",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -15543,9 +16043,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvContourPerimeter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  double result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvContourPerimeter",&obj0)) SWIG_fail;
   {
@@ -15717,7 +16217,6 @@ SWIGINTERN PyObject *_wrap_cvCreateImage(PyObject *SWIGUNUSEDPARM(self), PyObjec
   CvSize arg1 ;
   int arg2 ;
   int arg3 ;
-  CvMat *result = 0 ;
   CvSize temp1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -15726,6 +16225,7 @@ SWIGINTERN PyObject *_wrap_cvCreateImage(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvCreateImage",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -15778,9 +16278,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCloneImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCloneImage",&obj0)) SWIG_fail;
   {
@@ -15837,7 +16337,6 @@ SWIGINTERN PyObject *_wrap_Cv32suf_i_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->i = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15848,10 +16347,10 @@ fail:
 SWIGINTERN PyObject *_wrap_Cv32suf_i_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Cv32suf *arg1 = (Cv32suf *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Cv32suf_i_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Cv32suf, 0 |  0 );
@@ -15890,7 +16389,6 @@ SWIGINTERN PyObject *_wrap_Cv32suf_u_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< unsigned int >(val2);
   if (arg1) (arg1)->u = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15901,10 +16399,10 @@ fail:
 SWIGINTERN PyObject *_wrap_Cv32suf_u_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Cv32suf *arg1 = (Cv32suf *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  unsigned int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Cv32suf_u_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Cv32suf, 0 |  0 );
@@ -15943,7 +16441,6 @@ SWIGINTERN PyObject *_wrap_Cv32suf_f_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->f = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -15954,10 +16451,10 @@ fail:
 SWIGINTERN PyObject *_wrap_Cv32suf_f_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Cv32suf *arg1 = (Cv32suf *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Cv32suf_f_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Cv32suf, 0 |  0 );
@@ -16009,7 +16506,7 @@ SWIGINTERN PyObject *_wrap_delete_Cv32suf(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< Cv32suf * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -16025,7 +16522,7 @@ fail:
 
 SWIGINTERN PyObject *Cv32suf_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Cv32suf, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -16053,7 +16550,6 @@ SWIGINTERN PyObject *_wrap_Cv64suf_i_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< int64 >(val2);
   if (arg1) (arg1)->i = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16064,10 +16560,10 @@ fail:
 SWIGINTERN PyObject *_wrap_Cv64suf_i_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Cv64suf *arg1 = (Cv64suf *) 0 ;
-  int64 result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int64 result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Cv64suf_i_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Cv64suf, 0 |  0 );
@@ -16106,7 +16602,6 @@ SWIGINTERN PyObject *_wrap_Cv64suf_u_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< uint64 >(val2);
   if (arg1) (arg1)->u = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16117,10 +16612,10 @@ fail:
 SWIGINTERN PyObject *_wrap_Cv64suf_u_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Cv64suf *arg1 = (Cv64suf *) 0 ;
-  uint64 result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uint64 result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Cv64suf_u_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Cv64suf, 0 |  0 );
@@ -16159,7 +16654,6 @@ SWIGINTERN PyObject *_wrap_Cv64suf_f_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->f = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16170,10 +16664,10 @@ fail:
 SWIGINTERN PyObject *_wrap_Cv64suf_f_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Cv64suf *arg1 = (Cv64suf *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Cv64suf_f_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Cv64suf, 0 |  0 );
@@ -16225,7 +16719,7 @@ SWIGINTERN PyObject *_wrap_delete_Cv64suf(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< Cv64suf * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -16241,7 +16735,7 @@ fail:
 
 SWIGINTERN PyObject *Cv64suf_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Cv64suf, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -16249,10 +16743,10 @@ SWIGINTERN PyObject *Cv64suf_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObje
 SWIGINTERN PyObject *_wrap_cvRound(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
-  int result;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvRound",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -16279,10 +16773,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvFloor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
-  int result;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvFloor",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -16309,10 +16803,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCeil(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
-  int result;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCeil",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -16339,10 +16833,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvIsNaN(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
-  int result;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvIsNaN",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -16369,10 +16863,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvIsInf(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
-  int result;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvIsInf",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -16399,10 +16893,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvRNG__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int64 arg1 ;
-  CvRNG result;
   long long val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvRNG",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_long_SS_long(obj0, &val1);
@@ -16459,7 +16953,7 @@ SWIGINTERN PyObject *_wrap_cvRNG(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -16478,7 +16972,10 @@ SWIGINTERN PyObject *_wrap_cvRNG(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvRNG'.\n  Possible C/C++ prototypes are:\n    cvRNG(int64)\n    cvRNG()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvRNG'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvRNG(int64)\n"
+    "    cvRNG()\n");
   return NULL;
 }
 
@@ -16486,10 +16983,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvRandInt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG *arg1 = (CvRNG *) 0 ;
-  unsigned int result;
   void *vptr1 ;
   CvRNG_Wrapper *wrapper1 ;
   PyObject * obj0 = 0 ;
+  unsigned int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvRandInt",&obj0)) SWIG_fail;
   {
@@ -16519,10 +17016,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvRandReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG *arg1 = (CvRNG *) 0 ;
-  double result;
   void *vptr1 ;
   CvRNG_Wrapper *wrapper1 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvRandReal",&obj0)) SWIG_fail;
   {
@@ -16575,7 +17072,6 @@ SWIGINTERN PyObject *_wrap_IplImage_ID_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->ID = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16586,9 +17082,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_ID_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_ID_get",&obj0)) SWIG_fail;
   {
@@ -16634,7 +17130,6 @@ SWIGINTERN PyObject *_wrap_IplImage_nChannels_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nChannels = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16645,9 +17140,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_nChannels_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_nChannels_get",&obj0)) SWIG_fail;
   {
@@ -16693,7 +17188,6 @@ SWIGINTERN PyObject *_wrap_IplImage_depth_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->depth = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16704,9 +17198,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_depth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_depth_get",&obj0)) SWIG_fail;
   {
@@ -16752,7 +17246,6 @@ SWIGINTERN PyObject *_wrap_IplImage_dataOrder_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->dataOrder = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16763,9 +17256,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_dataOrder_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_dataOrder_get",&obj0)) SWIG_fail;
   {
@@ -16811,7 +17304,6 @@ SWIGINTERN PyObject *_wrap_IplImage_origin_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->origin = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16822,9 +17314,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_origin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_origin_get",&obj0)) SWIG_fail;
   {
@@ -16870,7 +17362,6 @@ SWIGINTERN PyObject *_wrap_IplImage_align_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->align = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16881,9 +17372,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_align_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_align_get",&obj0)) SWIG_fail;
   {
@@ -16929,7 +17420,6 @@ SWIGINTERN PyObject *_wrap_IplImage_width_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->width = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16940,9 +17430,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_width_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_width_get",&obj0)) SWIG_fail;
   {
@@ -16988,7 +17478,6 @@ SWIGINTERN PyObject *_wrap_IplImage_height_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->height = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -16999,9 +17488,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_height_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_height_get",&obj0)) SWIG_fail;
   {
@@ -17047,7 +17536,6 @@ SWIGINTERN PyObject *_wrap_IplImage_roi_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg2 = reinterpret_cast< _IplROI * >(argp2);
   if (arg1) (arg1)->roi = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17058,9 +17546,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_roi_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  _IplROI *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  _IplROI *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_roi_get",&obj0)) SWIG_fail;
   {
@@ -17106,7 +17594,6 @@ SWIGINTERN PyObject *_wrap_IplImage_imageSize_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->imageSize = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17117,9 +17604,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_imageSize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_imageSize_get",&obj0)) SWIG_fail;
   {
@@ -17165,7 +17652,6 @@ SWIGINTERN PyObject *_wrap_IplImage_widthStep_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->widthStep = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17176,9 +17662,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage_widthStep_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  int result;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage_widthStep_get",&obj0)) SWIG_fail;
   {
@@ -17216,7 +17702,7 @@ SWIGINTERN PyObject *_wrap_delete_IplImage(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   {
     try {
-      delete_IplImage(arg1);
+      delete_IplImage(arg1); 
     } 
     catch (...) 
     {
@@ -17234,11 +17720,11 @@ SWIGINTERN PyObject *_wrap_IplImage___and____SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___and__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17290,11 +17776,11 @@ SWIGINTERN PyObject *_wrap_IplImage___iand____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___iand__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17346,11 +17832,11 @@ SWIGINTERN PyObject *_wrap_IplImage___add____SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___add__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17402,11 +17888,11 @@ SWIGINTERN PyObject *_wrap_IplImage___iadd____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___iadd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17458,11 +17944,11 @@ SWIGINTERN PyObject *_wrap_IplImage___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___mul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17514,11 +18000,11 @@ SWIGINTERN PyObject *_wrap_IplImage___imul____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___imul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17570,11 +18056,11 @@ SWIGINTERN PyObject *_wrap_IplImage___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___sub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17626,11 +18112,11 @@ SWIGINTERN PyObject *_wrap_IplImage___isub____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___isub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17682,11 +18168,11 @@ SWIGINTERN PyObject *_wrap_IplImage___div____SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___div__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17738,11 +18224,11 @@ SWIGINTERN PyObject *_wrap_IplImage___idiv____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___idiv__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17794,11 +18280,11 @@ SWIGINTERN PyObject *_wrap_IplImage___or____SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___or__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17850,11 +18336,11 @@ SWIGINTERN PyObject *_wrap_IplImage___ior____SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ior__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17906,11 +18392,11 @@ SWIGINTERN PyObject *_wrap_IplImage___xor____SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___xor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -17962,11 +18448,11 @@ SWIGINTERN PyObject *_wrap_IplImage___ixor____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ixor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18018,10 +18504,10 @@ SWIGINTERN PyObject *_wrap_IplImage___add____SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___add__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18061,7 +18547,7 @@ SWIGINTERN PyObject *_wrap_IplImage___add__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18104,10 +18590,10 @@ SWIGINTERN PyObject *_wrap_IplImage___iadd____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___iadd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18147,7 +18633,7 @@ SWIGINTERN PyObject *_wrap_IplImage___iadd__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18181,7 +18667,10 @@ SWIGINTERN PyObject *_wrap_IplImage___iadd__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___iadd__'.\n  Possible C/C++ prototypes are:\n    operator +=(CvArr *)\n    operator +=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___iadd__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator +=(IplImage *,CvArr *)\n"
+    "    operator +=(IplImage *,CvScalar)\n");
   return NULL;
 }
 
@@ -18190,10 +18679,10 @@ SWIGINTERN PyObject *_wrap_IplImage___xor____SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___xor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18233,7 +18722,7 @@ SWIGINTERN PyObject *_wrap_IplImage___xor__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18276,10 +18765,10 @@ SWIGINTERN PyObject *_wrap_IplImage___ixor____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ixor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18319,7 +18808,7 @@ SWIGINTERN PyObject *_wrap_IplImage___ixor__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18353,7 +18842,10 @@ SWIGINTERN PyObject *_wrap_IplImage___ixor__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___ixor__'.\n  Possible C/C++ prototypes are:\n    operator ^=(CvArr *)\n    operator ^=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___ixor__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator ^=(IplImage *,CvArr *)\n"
+    "    operator ^=(IplImage *,CvScalar)\n");
   return NULL;
 }
 
@@ -18362,10 +18854,10 @@ SWIGINTERN PyObject *_wrap_IplImage___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___sub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18405,7 +18897,7 @@ SWIGINTERN PyObject *_wrap_IplImage___sub__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18448,10 +18940,10 @@ SWIGINTERN PyObject *_wrap_IplImage___isub____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___isub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18491,7 +18983,7 @@ SWIGINTERN PyObject *_wrap_IplImage___isub__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18525,7 +19017,10 @@ SWIGINTERN PyObject *_wrap_IplImage___isub__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___isub__'.\n  Possible C/C++ prototypes are:\n    operator -=(CvArr *)\n    operator -=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___isub__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator -=(IplImage *,CvArr *)\n"
+    "    operator -=(IplImage *,CvScalar)\n");
   return NULL;
 }
 
@@ -18534,10 +19029,10 @@ SWIGINTERN PyObject *_wrap_IplImage___or____SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___or__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18577,7 +19072,7 @@ SWIGINTERN PyObject *_wrap_IplImage___or__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18620,10 +19115,10 @@ SWIGINTERN PyObject *_wrap_IplImage___ior____SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ior__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18663,7 +19158,7 @@ SWIGINTERN PyObject *_wrap_IplImage___ior__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18697,7 +19192,10 @@ SWIGINTERN PyObject *_wrap_IplImage___ior__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___ior__'.\n  Possible C/C++ prototypes are:\n    operator |=(CvArr *)\n    operator |=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___ior__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator |=(IplImage *,CvArr *)\n"
+    "    operator |=(IplImage *,CvScalar)\n");
   return NULL;
 }
 
@@ -18706,10 +19204,10 @@ SWIGINTERN PyObject *_wrap_IplImage___and____SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___and__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18749,7 +19247,7 @@ SWIGINTERN PyObject *_wrap_IplImage___and__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18792,10 +19290,10 @@ SWIGINTERN PyObject *_wrap_IplImage___iand____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___iand__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18835,7 +19333,7 @@ SWIGINTERN PyObject *_wrap_IplImage___iand__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18869,7 +19367,10 @@ SWIGINTERN PyObject *_wrap_IplImage___iand__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___iand__'.\n  Possible C/C++ prototypes are:\n    operator &=(CvArr *)\n    operator &=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___iand__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator &=(IplImage *,CvArr *)\n"
+    "    operator &=(IplImage *,CvScalar)\n");
   return NULL;
 }
 
@@ -18878,11 +19379,11 @@ SWIGINTERN PyObject *_wrap_IplImage___ge____SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ge__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18934,12 +19435,12 @@ SWIGINTERN PyObject *_wrap_IplImage___ge____SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ge__",&obj0,&obj1)) SWIG_fail;
   {
@@ -18981,7 +19482,7 @@ SWIGINTERN PyObject *_wrap_IplImage___ge__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19025,11 +19526,11 @@ SWIGINTERN PyObject *_wrap_IplImage___eq____SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___eq__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19081,12 +19582,12 @@ SWIGINTERN PyObject *_wrap_IplImage___eq____SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___eq__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19128,7 +19629,7 @@ SWIGINTERN PyObject *_wrap_IplImage___eq__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19172,11 +19673,11 @@ SWIGINTERN PyObject *_wrap_IplImage___le____SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___le__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19228,12 +19729,12 @@ SWIGINTERN PyObject *_wrap_IplImage___le____SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___le__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19275,7 +19776,7 @@ SWIGINTERN PyObject *_wrap_IplImage___le__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19319,11 +19820,11 @@ SWIGINTERN PyObject *_wrap_IplImage___ne____SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ne__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19375,12 +19876,12 @@ SWIGINTERN PyObject *_wrap_IplImage___ne____SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ne__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19422,7 +19923,7 @@ SWIGINTERN PyObject *_wrap_IplImage___ne__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19466,11 +19967,11 @@ SWIGINTERN PyObject *_wrap_IplImage___lt____SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___lt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19522,12 +20023,12 @@ SWIGINTERN PyObject *_wrap_IplImage___lt____SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___lt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19569,7 +20070,7 @@ SWIGINTERN PyObject *_wrap_IplImage___lt__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19613,11 +20114,11 @@ SWIGINTERN PyObject *_wrap_IplImage___gt____SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___gt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19669,12 +20170,12 @@ SWIGINTERN PyObject *_wrap_IplImage___gt____SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___gt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19716,7 +20217,7 @@ SWIGINTERN PyObject *_wrap_IplImage___gt__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19760,12 +20261,12 @@ SWIGINTERN PyObject *_wrap_IplImage___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___mul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19807,7 +20308,7 @@ SWIGINTERN PyObject *_wrap_IplImage___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19851,12 +20352,12 @@ SWIGINTERN PyObject *_wrap_IplImage___imul____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___imul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19898,7 +20399,7 @@ SWIGINTERN PyObject *_wrap_IplImage___imul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19933,7 +20434,10 @@ SWIGINTERN PyObject *_wrap_IplImage___imul__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___imul__'.\n  Possible C/C++ prototypes are:\n    operator *=(CvArr *)\n    operator *=(double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___imul__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator *=(IplImage *,CvArr *)\n"
+    "    operator *=(IplImage *,double)\n");
   return NULL;
 }
 
@@ -19942,12 +20446,12 @@ SWIGINTERN PyObject *_wrap_IplImage___div____SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___div__",&obj0,&obj1)) SWIG_fail;
   {
@@ -19989,7 +20493,7 @@ SWIGINTERN PyObject *_wrap_IplImage___div__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20033,12 +20537,12 @@ SWIGINTERN PyObject *_wrap_IplImage___idiv____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___idiv__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20080,7 +20584,7 @@ SWIGINTERN PyObject *_wrap_IplImage___idiv__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20115,7 +20619,10 @@ SWIGINTERN PyObject *_wrap_IplImage___idiv__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___idiv__'.\n  Possible C/C++ prototypes are:\n    operator /=(CvArr *)\n    operator /=(double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___idiv__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator /=(IplImage *,CvArr *)\n"
+    "    operator /=(IplImage *,double)\n");
   return NULL;
 }
 
@@ -20124,11 +20631,11 @@ SWIGINTERN PyObject *_wrap_IplImage___radd____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___radd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20180,11 +20687,11 @@ SWIGINTERN PyObject *_wrap_IplImage___rsub____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rsub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20236,11 +20743,11 @@ SWIGINTERN PyObject *_wrap_IplImage___rdiv__(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rdiv__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20292,11 +20799,11 @@ SWIGINTERN PyObject *_wrap_IplImage___rmul____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rmul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20348,10 +20855,10 @@ SWIGINTERN PyObject *_wrap_IplImage___radd____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___radd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20389,12 +20896,12 @@ SWIGINTERN PyObject *_wrap_IplImage___radd____SWIG_2(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___radd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20436,7 +20943,7 @@ SWIGINTERN PyObject *_wrap_IplImage___radd__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20494,10 +21001,10 @@ SWIGINTERN PyObject *_wrap_IplImage___rsub____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rsub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20535,12 +21042,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rsub____SWIG_2(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rsub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20582,7 +21089,7 @@ SWIGINTERN PyObject *_wrap_IplImage___rsub__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20640,12 +21147,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rmul____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rmul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20687,7 +21194,7 @@ SWIGINTERN PyObject *_wrap_IplImage___rmul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20731,10 +21238,10 @@ SWIGINTERN PyObject *_wrap_IplImage___ror____SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ror__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20772,12 +21279,12 @@ SWIGINTERN PyObject *_wrap_IplImage___ror____SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___ror__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20819,7 +21326,7 @@ SWIGINTERN PyObject *_wrap_IplImage___ror__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20863,10 +21370,10 @@ SWIGINTERN PyObject *_wrap_IplImage___rand____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rand__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20904,12 +21411,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rand____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rand__",&obj0,&obj1)) SWIG_fail;
   {
@@ -20951,7 +21458,7 @@ SWIGINTERN PyObject *_wrap_IplImage___rand__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20995,10 +21502,10 @@ SWIGINTERN PyObject *_wrap_IplImage___rxor____SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   CvScalar arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rxor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21036,12 +21543,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rxor____SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rxor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21083,7 +21590,7 @@ SWIGINTERN PyObject *_wrap_IplImage___rxor__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -21127,12 +21634,12 @@ SWIGINTERN PyObject *_wrap_IplImage___req__(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___req__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21172,12 +21679,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rgt__(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rgt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21217,12 +21724,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rge__(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rge__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21262,12 +21769,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rlt__(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rlt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21307,12 +21814,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rle__(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rle__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21352,12 +21859,12 @@ SWIGINTERN PyObject *_wrap_IplImage___rne__(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___rne__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21397,12 +21904,12 @@ SWIGINTERN PyObject *_wrap_IplImage___pow__(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   double arg2 ;
-  IplImage *result = 0 ;
   IplImage header1 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___pow__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21441,9 +21948,9 @@ fail:
 SWIGINTERN PyObject *_wrap_IplImage___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  char *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplImage___str__",&obj0)) SWIG_fail;
   {
@@ -21734,7 +22241,7 @@ SWIGINTERN PyObject *_wrap_IplImage___setitem__(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -21824,7 +22331,13 @@ SWIGINTERN PyObject *_wrap_IplImage___setitem__(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___setitem__'.\n  Possible C/C++ prototypes are:\n    __setitem__(PyObject *,double)\n    __setitem__(PyObject *,CvPoint)\n    __setitem__(PyObject *,CvPoint2D32f)\n    __setitem__(PyObject *,CvScalar)\n    __setitem__(PyObject *,CvArr *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'IplImage___setitem__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    __setitem__(IplImage *,PyObject *,double)\n"
+    "    __setitem__(IplImage *,PyObject *,CvPoint)\n"
+    "    __setitem__(IplImage *,PyObject *,CvPoint2D32f)\n"
+    "    __setitem__(IplImage *,PyObject *,CvScalar)\n"
+    "    __setitem__(IplImage *,PyObject *,CvArr *)\n");
   return NULL;
 }
 
@@ -21833,10 +22346,10 @@ SWIGINTERN PyObject *_wrap_IplImage___getitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:IplImage___getitem__",&obj0,&obj1)) SWIG_fail;
   {
@@ -21867,7 +22380,7 @@ fail:
 
 SWIGINTERN PyObject *IplImage_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p__IplImage, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -21895,7 +22408,6 @@ SWIGINTERN PyObject *_wrap_IplROI_coi_set(PyObject *SWIGUNUSEDPARM(self), PyObje
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->coi = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21906,10 +22418,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplROI_coi_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplROI *arg1 = (IplROI *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplROI_coi_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplROI, 0 |  0 );
@@ -21948,7 +22460,6 @@ SWIGINTERN PyObject *_wrap_IplROI_xOffset_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->xOffset = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21959,10 +22470,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplROI_xOffset_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplROI *arg1 = (IplROI *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplROI_xOffset_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplROI, 0 |  0 );
@@ -22001,7 +22512,6 @@ SWIGINTERN PyObject *_wrap_IplROI_yOffset_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->yOffset = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22012,10 +22522,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplROI_yOffset_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplROI *arg1 = (IplROI *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplROI_yOffset_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplROI, 0 |  0 );
@@ -22054,7 +22564,6 @@ SWIGINTERN PyObject *_wrap_IplROI_width_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->width = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22065,10 +22574,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplROI_width_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplROI *arg1 = (IplROI *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplROI_width_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplROI, 0 |  0 );
@@ -22107,7 +22616,6 @@ SWIGINTERN PyObject *_wrap_IplROI_height_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->height = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22118,10 +22626,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplROI_height_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplROI *arg1 = (IplROI *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplROI_height_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplROI, 0 |  0 );
@@ -22173,7 +22681,7 @@ SWIGINTERN PyObject *_wrap_delete_IplROI(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< IplROI * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -22189,7 +22697,7 @@ fail:
 
 SWIGINTERN PyObject *IplROI_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p__IplROI, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -22217,7 +22725,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernel_nCols_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nCols = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22228,10 +22735,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernel_nCols_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernel *arg1 = (IplConvKernel *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernel_nCols_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernel, 0 |  0 );
@@ -22270,7 +22777,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernel_nRows_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nRows = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22281,10 +22787,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernel_nRows_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernel *arg1 = (IplConvKernel *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernel_nRows_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernel, 0 |  0 );
@@ -22323,7 +22829,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernel_anchorX_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->anchorX = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22334,10 +22839,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernel_anchorX_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernel *arg1 = (IplConvKernel *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernel_anchorX_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernel, 0 |  0 );
@@ -22376,7 +22881,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernel_anchorY_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->anchorY = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22387,10 +22891,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernel_anchorY_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernel *arg1 = (IplConvKernel *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernel_anchorY_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernel, 0 |  0 );
@@ -22429,7 +22933,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernel_values_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->values = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22440,10 +22943,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernel_values_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernel *arg1 = (IplConvKernel *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernel_values_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernel, 0 |  0 );
@@ -22482,7 +22985,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernel_nShiftR_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nShiftR = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22493,10 +22995,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernel_nShiftR_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernel *arg1 = (IplConvKernel *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernel_nShiftR_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernel, 0 |  0 );
@@ -22527,7 +23029,7 @@ SWIGINTERN PyObject *_wrap_delete_IplConvKernel(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< IplConvKernel * >(argp1);
   {
     try {
-      delete_IplConvKernel(arg1);
+      delete_IplConvKernel(arg1); 
     } 
     catch (...) 
     {
@@ -22543,7 +23045,7 @@ fail:
 
 SWIGINTERN PyObject *IplConvKernel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p__IplConvKernel, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -22571,7 +23073,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernelFP_nCols_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nCols = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22582,10 +23083,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernelFP_nCols_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernelFP *arg1 = (IplConvKernelFP *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernelFP_nCols_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernelFP, 0 |  0 );
@@ -22624,7 +23125,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernelFP_nRows_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nRows = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22635,10 +23135,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernelFP_nRows_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernelFP *arg1 = (IplConvKernelFP *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernelFP_nRows_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernelFP, 0 |  0 );
@@ -22677,7 +23177,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernelFP_anchorX_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->anchorX = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22688,10 +23187,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernelFP_anchorX_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernelFP *arg1 = (IplConvKernelFP *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernelFP_anchorX_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernelFP, 0 |  0 );
@@ -22730,7 +23229,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernelFP_anchorY_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->anchorY = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22741,10 +23239,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernelFP_anchorY_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernelFP *arg1 = (IplConvKernelFP *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernelFP_anchorY_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernelFP, 0 |  0 );
@@ -22783,7 +23281,6 @@ SWIGINTERN PyObject *_wrap_IplConvKernelFP_values_set(PyObject *SWIGUNUSEDPARM(s
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->values = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -22794,10 +23291,10 @@ fail:
 SWIGINTERN PyObject *_wrap_IplConvKernelFP_values_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplConvKernelFP *arg1 = (IplConvKernelFP *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:IplConvKernelFP_values_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__IplConvKernelFP, 0 |  0 );
@@ -22849,7 +23346,7 @@ SWIGINTERN PyObject *_wrap_delete_IplConvKernelFP(PyObject *SWIGUNUSEDPARM(self)
   arg1 = reinterpret_cast< IplConvKernelFP * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -22865,7 +23362,7 @@ fail:
 
 SWIGINTERN PyObject *IplConvKernelFP_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p__IplConvKernelFP, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -22890,7 +23387,6 @@ SWIGINTERN PyObject *_wrap_CvMat_type_set(PyObject *SWIGUNUSEDPARM(self), PyObje
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->type = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg1!=NULL && freearg1){
@@ -22913,9 +23409,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_type_get",&obj0)) SWIG_fail;
   {
@@ -22961,7 +23457,6 @@ SWIGINTERN PyObject *_wrap_CvMat_step_set(PyObject *SWIGUNUSEDPARM(self), PyObje
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->step = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg1!=NULL && freearg1){
@@ -22984,9 +23479,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_step_get",&obj0)) SWIG_fail;
   {
@@ -23032,7 +23527,6 @@ SWIGINTERN PyObject *_wrap_CvMat_refcount_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->refcount = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg1!=NULL && freearg1){
@@ -23055,9 +23549,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_refcount_get",&obj0)) SWIG_fail;
   {
@@ -23103,7 +23597,6 @@ SWIGINTERN PyObject *_wrap_CvMat_hdr_refcount_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->hdr_refcount = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg1!=NULL && freearg1){
@@ -23126,9 +23619,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_hdr_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_hdr_refcount_get",&obj0)) SWIG_fail;
   {
@@ -23157,9 +23650,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  CvMat_data *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvMat_data *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_data_get",&obj0)) SWIG_fail;
   {
@@ -23197,7 +23690,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMat(PyObject *SWIGUNUSEDPARM(self), PyObject
   }
   {
     try {
-      delete_CvMat(arg1);
+      delete_CvMat(arg1); 
     } 
     catch (...) 
     {
@@ -23244,7 +23737,7 @@ SWIGINTERN PyObject *_wrap_CvMat_depth_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_depth_set(arg1,arg2);
+      CvMat_depth_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23273,9 +23766,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_depth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_depth_get",&obj0)) SWIG_fail;
   {
@@ -23330,7 +23823,7 @@ SWIGINTERN PyObject *_wrap_CvMat_nChannels_set(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_nChannels_set(arg1,arg2);
+      CvMat_nChannels_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23359,9 +23852,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_nChannels_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_nChannels_get",&obj0)) SWIG_fail;
   {
@@ -23416,7 +23909,7 @@ SWIGINTERN PyObject *_wrap_CvMat_dataOrder_set(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_dataOrder_set(arg1,arg2);
+      CvMat_dataOrder_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23445,9 +23938,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_dataOrder_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_dataOrder_get",&obj0)) SWIG_fail;
   {
@@ -23502,7 +23995,7 @@ SWIGINTERN PyObject *_wrap_CvMat_origin_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_origin_set(arg1,arg2);
+      CvMat_origin_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23531,9 +24024,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_origin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_origin_get",&obj0)) SWIG_fail;
   {
@@ -23588,7 +24081,7 @@ SWIGINTERN PyObject *_wrap_CvMat_width_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_width_set(arg1,arg2);
+      CvMat_width_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23617,9 +24110,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_width_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_width_get",&obj0)) SWIG_fail;
   {
@@ -23674,7 +24167,7 @@ SWIGINTERN PyObject *_wrap_CvMat_height_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_height_set(arg1,arg2);
+      CvMat_height_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23703,9 +24196,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_height_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_height_get",&obj0)) SWIG_fail;
   {
@@ -23760,7 +24253,7 @@ SWIGINTERN PyObject *_wrap_CvMat_imageSize_set(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_imageSize_set(arg1,arg2);
+      CvMat_imageSize_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23789,9 +24282,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_imageSize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_imageSize_get",&obj0)) SWIG_fail;
   {
@@ -23846,7 +24339,7 @@ SWIGINTERN PyObject *_wrap_CvMat_widthStep_set(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_widthStep_set(arg1,arg2);
+      CvMat_widthStep_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23875,9 +24368,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_widthStep_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_widthStep_get",&obj0)) SWIG_fail;
   {
@@ -23932,7 +24425,7 @@ SWIGINTERN PyObject *_wrap_CvMat_rows_set(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_rows_set(arg1,arg2);
+      CvMat_rows_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -23961,9 +24454,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_rows_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_rows_get",&obj0)) SWIG_fail;
   {
@@ -24018,7 +24511,7 @@ SWIGINTERN PyObject *_wrap_CvMat_cols_set(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg2 = static_cast< int >(val2);
   {
     try {
-      CvMat_cols_set(arg1,arg2);
+      CvMat_cols_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -24047,9 +24540,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_cols_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_cols_get",&obj0)) SWIG_fail;
   {
@@ -24087,11 +24580,11 @@ SWIGINTERN PyObject *_wrap_CvMat___and____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___and__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24146,11 +24639,11 @@ SWIGINTERN PyObject *_wrap_CvMat___iand____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___iand__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24205,11 +24698,11 @@ SWIGINTERN PyObject *_wrap_CvMat___add____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___add__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24264,11 +24757,11 @@ SWIGINTERN PyObject *_wrap_CvMat___iadd____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___iadd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24323,11 +24816,11 @@ SWIGINTERN PyObject *_wrap_CvMat___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___mul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24382,11 +24875,11 @@ SWIGINTERN PyObject *_wrap_CvMat___imul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___imul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24441,11 +24934,11 @@ SWIGINTERN PyObject *_wrap_CvMat___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___sub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24500,11 +24993,11 @@ SWIGINTERN PyObject *_wrap_CvMat___isub____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___isub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24559,11 +25052,11 @@ SWIGINTERN PyObject *_wrap_CvMat___div____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___div__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24618,11 +25111,11 @@ SWIGINTERN PyObject *_wrap_CvMat___idiv____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___idiv__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24677,11 +25170,11 @@ SWIGINTERN PyObject *_wrap_CvMat___or____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___or__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24736,11 +25229,11 @@ SWIGINTERN PyObject *_wrap_CvMat___ior____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ior__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24795,11 +25288,11 @@ SWIGINTERN PyObject *_wrap_CvMat___xor____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___xor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24854,11 +25347,11 @@ SWIGINTERN PyObject *_wrap_CvMat___ixor____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ixor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24913,10 +25406,10 @@ SWIGINTERN PyObject *_wrap_CvMat___add____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___add__",&obj0,&obj1)) SWIG_fail;
   {
@@ -24959,7 +25452,7 @@ SWIGINTERN PyObject *_wrap_CvMat___add__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25002,10 +25495,10 @@ SWIGINTERN PyObject *_wrap_CvMat___iadd____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___iadd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25048,7 +25541,7 @@ SWIGINTERN PyObject *_wrap_CvMat___iadd__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25082,7 +25575,10 @@ SWIGINTERN PyObject *_wrap_CvMat___iadd__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___iadd__'.\n  Possible C/C++ prototypes are:\n    operator +=(CvArr *)\n    operator +=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___iadd__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator +=(CvMat *,CvArr *)\n"
+    "    operator +=(CvMat *,CvScalar)\n");
   return NULL;
 }
 
@@ -25091,10 +25587,10 @@ SWIGINTERN PyObject *_wrap_CvMat___xor____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___xor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25137,7 +25633,7 @@ SWIGINTERN PyObject *_wrap_CvMat___xor__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25180,10 +25676,10 @@ SWIGINTERN PyObject *_wrap_CvMat___ixor____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ixor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25226,7 +25722,7 @@ SWIGINTERN PyObject *_wrap_CvMat___ixor__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25260,7 +25756,10 @@ SWIGINTERN PyObject *_wrap_CvMat___ixor__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___ixor__'.\n  Possible C/C++ prototypes are:\n    operator ^=(CvArr *)\n    operator ^=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___ixor__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator ^=(CvMat *,CvArr *)\n"
+    "    operator ^=(CvMat *,CvScalar)\n");
   return NULL;
 }
 
@@ -25269,10 +25768,10 @@ SWIGINTERN PyObject *_wrap_CvMat___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___sub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25315,7 +25814,7 @@ SWIGINTERN PyObject *_wrap_CvMat___sub__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25358,10 +25857,10 @@ SWIGINTERN PyObject *_wrap_CvMat___isub____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___isub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25404,7 +25903,7 @@ SWIGINTERN PyObject *_wrap_CvMat___isub__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25438,7 +25937,10 @@ SWIGINTERN PyObject *_wrap_CvMat___isub__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___isub__'.\n  Possible C/C++ prototypes are:\n    operator -=(CvArr *)\n    operator -=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___isub__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator -=(CvMat *,CvArr *)\n"
+    "    operator -=(CvMat *,CvScalar)\n");
   return NULL;
 }
 
@@ -25447,10 +25949,10 @@ SWIGINTERN PyObject *_wrap_CvMat___or____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___or__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25493,7 +25995,7 @@ SWIGINTERN PyObject *_wrap_CvMat___or__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25536,10 +26038,10 @@ SWIGINTERN PyObject *_wrap_CvMat___ior____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ior__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25582,7 +26084,7 @@ SWIGINTERN PyObject *_wrap_CvMat___ior__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25616,7 +26118,10 @@ SWIGINTERN PyObject *_wrap_CvMat___ior__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___ior__'.\n  Possible C/C++ prototypes are:\n    operator |=(CvArr *)\n    operator |=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___ior__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator |=(CvMat *,CvArr *)\n"
+    "    operator |=(CvMat *,CvScalar)\n");
   return NULL;
 }
 
@@ -25625,10 +26130,10 @@ SWIGINTERN PyObject *_wrap_CvMat___and____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___and__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25671,7 +26176,7 @@ SWIGINTERN PyObject *_wrap_CvMat___and__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25714,10 +26219,10 @@ SWIGINTERN PyObject *_wrap_CvMat___iand____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___iand__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25760,7 +26265,7 @@ SWIGINTERN PyObject *_wrap_CvMat___iand__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25794,7 +26299,10 @@ SWIGINTERN PyObject *_wrap_CvMat___iand__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___iand__'.\n  Possible C/C++ prototypes are:\n    operator &=(CvArr *)\n    operator &=(CvScalar)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___iand__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator &=(CvMat *,CvArr *)\n"
+    "    operator &=(CvMat *,CvScalar)\n");
   return NULL;
 }
 
@@ -25803,11 +26311,11 @@ SWIGINTERN PyObject *_wrap_CvMat___ge____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ge__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25862,12 +26370,12 @@ SWIGINTERN PyObject *_wrap_CvMat___ge____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ge__",&obj0,&obj1)) SWIG_fail;
   {
@@ -25912,7 +26420,7 @@ SWIGINTERN PyObject *_wrap_CvMat___ge__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -25956,11 +26464,11 @@ SWIGINTERN PyObject *_wrap_CvMat___eq____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___eq__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26015,12 +26523,12 @@ SWIGINTERN PyObject *_wrap_CvMat___eq____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___eq__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26065,7 +26573,7 @@ SWIGINTERN PyObject *_wrap_CvMat___eq__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26109,11 +26617,11 @@ SWIGINTERN PyObject *_wrap_CvMat___le____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___le__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26168,12 +26676,12 @@ SWIGINTERN PyObject *_wrap_CvMat___le____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___le__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26218,7 +26726,7 @@ SWIGINTERN PyObject *_wrap_CvMat___le__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26262,11 +26770,11 @@ SWIGINTERN PyObject *_wrap_CvMat___ne____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ne__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26321,12 +26829,12 @@ SWIGINTERN PyObject *_wrap_CvMat___ne____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ne__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26371,7 +26879,7 @@ SWIGINTERN PyObject *_wrap_CvMat___ne__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26415,11 +26923,11 @@ SWIGINTERN PyObject *_wrap_CvMat___lt____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___lt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26474,12 +26982,12 @@ SWIGINTERN PyObject *_wrap_CvMat___lt____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___lt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26524,7 +27032,7 @@ SWIGINTERN PyObject *_wrap_CvMat___lt__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26568,11 +27076,11 @@ SWIGINTERN PyObject *_wrap_CvMat___gt____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___gt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26627,12 +27135,12 @@ SWIGINTERN PyObject *_wrap_CvMat___gt____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___gt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26677,7 +27185,7 @@ SWIGINTERN PyObject *_wrap_CvMat___gt__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26721,12 +27229,12 @@ SWIGINTERN PyObject *_wrap_CvMat___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___mul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26771,7 +27279,7 @@ SWIGINTERN PyObject *_wrap_CvMat___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26815,12 +27323,12 @@ SWIGINTERN PyObject *_wrap_CvMat___imul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___imul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26865,7 +27373,7 @@ SWIGINTERN PyObject *_wrap_CvMat___imul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26900,7 +27408,10 @@ SWIGINTERN PyObject *_wrap_CvMat___imul__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___imul__'.\n  Possible C/C++ prototypes are:\n    operator *=(CvArr *)\n    operator *=(double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___imul__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator *=(CvMat *,CvArr *)\n"
+    "    operator *=(CvMat *,double)\n");
   return NULL;
 }
 
@@ -26909,12 +27420,12 @@ SWIGINTERN PyObject *_wrap_CvMat___div____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___div__",&obj0,&obj1)) SWIG_fail;
   {
@@ -26959,7 +27470,7 @@ SWIGINTERN PyObject *_wrap_CvMat___div__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -27003,12 +27514,12 @@ SWIGINTERN PyObject *_wrap_CvMat___idiv____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___idiv__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27053,7 +27564,7 @@ SWIGINTERN PyObject *_wrap_CvMat___idiv__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -27088,7 +27599,10 @@ SWIGINTERN PyObject *_wrap_CvMat___idiv__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___idiv__'.\n  Possible C/C++ prototypes are:\n    operator /=(CvArr *)\n    operator /=(double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___idiv__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    operator /=(CvMat *,CvArr *)\n"
+    "    operator /=(CvMat *,double)\n");
   return NULL;
 }
 
@@ -27097,11 +27611,11 @@ SWIGINTERN PyObject *_wrap_CvMat___radd____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___radd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27156,11 +27670,11 @@ SWIGINTERN PyObject *_wrap_CvMat___rsub____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rsub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27215,11 +27729,11 @@ SWIGINTERN PyObject *_wrap_CvMat___rdiv____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rdiv__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27274,11 +27788,11 @@ SWIGINTERN PyObject *_wrap_CvMat___rmul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rmul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27333,10 +27847,10 @@ SWIGINTERN PyObject *_wrap_CvMat___radd____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___radd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27377,12 +27891,12 @@ SWIGINTERN PyObject *_wrap_CvMat___radd____SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___radd__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27427,7 +27941,7 @@ SWIGINTERN PyObject *_wrap_CvMat___radd__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -27485,10 +27999,10 @@ SWIGINTERN PyObject *_wrap_CvMat___rsub____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rsub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27529,12 +28043,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rsub____SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rsub__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27579,7 +28093,7 @@ SWIGINTERN PyObject *_wrap_CvMat___rsub__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -27637,12 +28151,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rmul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rmul__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27687,7 +28201,7 @@ SWIGINTERN PyObject *_wrap_CvMat___rmul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -27731,10 +28245,10 @@ SWIGINTERN PyObject *_wrap_CvMat___ror____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ror__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27775,12 +28289,12 @@ SWIGINTERN PyObject *_wrap_CvMat___ror____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___ror__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27825,7 +28339,7 @@ SWIGINTERN PyObject *_wrap_CvMat___ror__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -27869,10 +28383,10 @@ SWIGINTERN PyObject *_wrap_CvMat___rand____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rand__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27913,12 +28427,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rand____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rand__",&obj0,&obj1)) SWIG_fail;
   {
@@ -27963,7 +28477,7 @@ SWIGINTERN PyObject *_wrap_CvMat___rand__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28007,10 +28521,10 @@ SWIGINTERN PyObject *_wrap_CvMat___rxor____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvScalar arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rxor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28051,12 +28565,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rxor____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rxor__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28101,7 +28615,7 @@ SWIGINTERN PyObject *_wrap_CvMat___rxor__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28145,12 +28659,12 @@ SWIGINTERN PyObject *_wrap_CvMat___req__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___req__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28193,12 +28707,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rgt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rgt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28241,12 +28755,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rge__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rge__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28289,12 +28803,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rlt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rlt__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28337,12 +28851,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rle__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rle__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28385,12 +28899,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rne__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28433,12 +28947,12 @@ SWIGINTERN PyObject *_wrap_CvMat___rdiv____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___rdiv__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28483,7 +28997,7 @@ SWIGINTERN PyObject *_wrap_CvMat___rdiv__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28527,12 +29041,12 @@ SWIGINTERN PyObject *_wrap_CvMat___pow__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   double arg2 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___pow__",&obj0,&obj1)) SWIG_fail;
   {
@@ -28574,9 +29088,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  char *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat___str__",&obj0)) SWIG_fail;
   {
@@ -28903,7 +29417,7 @@ SWIGINTERN PyObject *_wrap_CvMat___setitem__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28993,7 +29507,13 @@ SWIGINTERN PyObject *_wrap_CvMat___setitem__(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___setitem__'.\n  Possible C/C++ prototypes are:\n    __setitem__(PyObject *,double)\n    __setitem__(PyObject *,CvPoint)\n    __setitem__(PyObject *,CvPoint2D32f)\n    __setitem__(PyObject *,CvScalar)\n    __setitem__(PyObject *,CvArr *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMat___setitem__'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    __setitem__(CvMat *,PyObject *,double)\n"
+    "    __setitem__(CvMat *,PyObject *,CvPoint)\n"
+    "    __setitem__(CvMat *,PyObject *,CvPoint2D32f)\n"
+    "    __setitem__(CvMat *,PyObject *,CvScalar)\n"
+    "    __setitem__(CvMat *,PyObject *,CvArr *)\n");
   return NULL;
 }
 
@@ -29002,10 +29522,10 @@ SWIGINTERN PyObject *_wrap_CvMat___getitem__(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMat___getitem__",&obj0,&obj1)) SWIG_fail;
   {
@@ -29043,9 +29563,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat___invert__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat___invert__",&obj0)) SWIG_fail;
   {
@@ -29094,7 +29614,7 @@ SWIGINTERN PyObject *_wrap_CvMat_imageData_set(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = obj1;
   {
     try {
-      CvMat_imageData_set(arg1,arg2);
+      CvMat_imageData_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -29123,9 +29643,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_imageData_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  PyObject *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_imageData_get",&obj0)) SWIG_fail;
   {
@@ -29161,7 +29681,7 @@ fail:
 
 SWIGINTERN PyObject *CvMat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMat, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -29189,7 +29709,6 @@ SWIGINTERN PyObject *_wrap_CvMat_data_ptr_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< uchar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -29200,10 +29719,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_data_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat_data *arg1 = (CvMat_data *) 0 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_data_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMat_data, 0 |  0 );
@@ -29242,7 +29761,6 @@ SWIGINTERN PyObject *_wrap_CvMat_data_s_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg2 = reinterpret_cast< short * >(argp2);
   if (arg1) (arg1)->s = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -29253,10 +29771,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_data_s_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat_data *arg1 = (CvMat_data *) 0 ;
-  short *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  short *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_data_s_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMat_data, 0 |  0 );
@@ -29295,7 +29813,6 @@ SWIGINTERN PyObject *_wrap_CvMat_data_i_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->i = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -29306,10 +29823,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_data_i_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat_data *arg1 = (CvMat_data *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_data_i_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMat_data, 0 |  0 );
@@ -29348,7 +29865,6 @@ SWIGINTERN PyObject *_wrap_CvMat_data_fl_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->fl = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -29359,10 +29875,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_data_fl_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat_data *arg1 = (CvMat_data *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_data_fl_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMat_data, 0 |  0 );
@@ -29401,7 +29917,6 @@ SWIGINTERN PyObject *_wrap_CvMat_data_db_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< double * >(argp2);
   if (arg1) (arg1)->db = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -29412,10 +29927,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMat_data_db_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat_data *arg1 = (CvMat_data *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMat_data_db_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMat_data, 0 |  0 );
@@ -29467,7 +29982,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMat_data(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvMat_data * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -29483,7 +29998,7 @@ fail:
 
 SWIGINTERN PyObject *CvMat_data_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMat_data, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -29494,7 +30009,6 @@ SWIGINTERN PyObject *_wrap_cvMat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int arg2 ;
   int arg3 ;
   void *arg4 = (void *) 0 ;
-  CvMat result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -29506,6 +30020,7 @@ SWIGINTERN PyObject *_wrap_cvMat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvMat result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvMat",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -29548,7 +30063,6 @@ SWIGINTERN PyObject *_wrap_cvMat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int arg1 ;
   int arg2 ;
   int arg3 ;
-  CvMat result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -29558,6 +30072,7 @@ SWIGINTERN PyObject *_wrap_cvMat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvMat",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -29597,7 +30112,7 @@ SWIGINTERN PyObject *_wrap_cvMat(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -29652,7 +30167,10 @@ SWIGINTERN PyObject *_wrap_cvMat(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvMat'.\n  Possible C/C++ prototypes are:\n    cvMat(int,int,int,void *)\n    cvMat(int,int,int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvMat'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvMat(int,int,int,void *)\n"
+    "    cvMat(int,int,int)\n");
   return NULL;
 }
 
@@ -29662,7 +30180,6 @@ SWIGINTERN PyObject *_wrap_cvmGet(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 ;
   int arg3 ;
-  double result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -29671,6 +30188,7 @@ SWIGINTERN PyObject *_wrap_cvmGet(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvmGet",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -29779,23 +30297,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_cvCvToIplDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_cvIplDepth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:cvCvToIplDepth",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:cvIplDepth",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvCvToIplDepth" "', argument " "1"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "cvIplDepth" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
   {
     try {
-      result = (int)cvCvToIplDepth(arg1); 
+      result = (int)cvIplDepth(arg1); 
     } 
     catch (...) 
     {
@@ -29832,7 +30350,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_type_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -29843,10 +30360,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND *arg1 = (CvMatND *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND, 0 |  0 );
@@ -29885,7 +30402,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_dims_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->dims = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -29896,10 +30412,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_dims_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND *arg1 = (CvMatND *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_dims_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND, 0 |  0 );
@@ -29938,7 +30454,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_refcount_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->refcount = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -29949,10 +30464,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND *arg1 = (CvMatND *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_refcount_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND, 0 |  0 );
@@ -29991,7 +30506,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_hdr_refcount_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->hdr_refcount = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30002,10 +30516,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_hdr_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND *arg1 = (CvMatND *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_hdr_refcount_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND, 0 |  0 );
@@ -30024,10 +30538,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_dim_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND *arg1 = (CvMatND *) 0 ;
-  CvMatND_dim *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMatND_dim *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_dim_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND, 0 |  0 );
@@ -30046,10 +30560,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND *arg1 = (CvMatND *) 0 ;
-  CvMatND_data *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMatND_data *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_data_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND, 0 |  0 );
@@ -30080,7 +30594,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMatND(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< CvMatND * >(argp1);
   {
     try {
-      delete_CvMatND(arg1);
+      delete_CvMatND(arg1); 
     } 
     catch (...) 
     {
@@ -30096,7 +30610,7 @@ fail:
 
 SWIGINTERN PyObject *CvMatND_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMatND, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -30124,7 +30638,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_dim_size_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30135,10 +30648,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_dim_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND_dim *arg1 = (CvMatND_dim *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_dim_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND_dim, 0 |  0 );
@@ -30177,7 +30690,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_dim_step_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->step = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30188,10 +30700,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_dim_step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND_dim *arg1 = (CvMatND_dim *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_dim_step_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND_dim, 0 |  0 );
@@ -30243,7 +30755,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMatND_dim(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvMatND_dim * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -30259,7 +30771,7 @@ fail:
 
 SWIGINTERN PyObject *CvMatND_dim_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMatND_dim, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -30287,7 +30799,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_data_ptr_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< uchar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30298,10 +30809,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_data_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND_data *arg1 = (CvMatND_data *) 0 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_data_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND_data, 0 |  0 );
@@ -30340,7 +30851,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_data_fl_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->fl = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30351,10 +30861,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_data_fl_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND_data *arg1 = (CvMatND_data *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_data_fl_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND_data, 0 |  0 );
@@ -30393,7 +30903,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_data_db_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< double * >(argp2);
   if (arg1) (arg1)->db = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30404,10 +30913,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_data_db_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND_data *arg1 = (CvMatND_data *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_data_db_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND_data, 0 |  0 );
@@ -30446,7 +30955,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_data_i_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->i = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30457,10 +30965,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_data_i_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND_data *arg1 = (CvMatND_data *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_data_i_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND_data, 0 |  0 );
@@ -30499,7 +31007,6 @@ SWIGINTERN PyObject *_wrap_CvMatND_data_s_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< short * >(argp2);
   if (arg1) (arg1)->s = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30510,10 +31017,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatND_data_s_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND_data *arg1 = (CvMatND_data *) 0 ;
-  short *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  short *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatND_data_s_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND_data, 0 |  0 );
@@ -30565,7 +31072,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMatND_data(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvMatND_data * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -30581,7 +31088,7 @@ fail:
 
 SWIGINTERN PyObject *CvMatND_data_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMatND_data, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -30609,7 +31116,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_type_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30620,10 +31126,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -30662,7 +31168,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_dims_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->dims = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30673,10 +31178,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_dims_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_dims_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -30715,7 +31220,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_refcount_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->refcount = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30726,10 +31230,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_refcount_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -30768,7 +31272,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_hdr_refcount_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->hdr_refcount = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30779,10 +31282,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_hdr_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_hdr_refcount_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -30825,7 +31328,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_heap_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSet *)ptr2;
   }
   if (arg1) (arg1)->heap = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30836,10 +31338,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_heap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  CvSet *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSet *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_heap_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -30880,7 +31382,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_hashtable_set(PyObject *SWIGUNUSEDPARM(se
     arg2=&buffer2;
   }
   if (arg1) (arg1)->hashtable = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30891,10 +31392,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_hashtable_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  void **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  void **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_hashtable_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -30933,7 +31434,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_hashsize_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->hashsize = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30944,10 +31444,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_hashsize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_hashsize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -30986,7 +31486,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_valoffset_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->valoffset = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -30997,10 +31496,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_valoffset_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_valoffset_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -31039,7 +31538,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMat_idxoffset_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->idxoffset = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31050,10 +31548,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_idxoffset_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_idxoffset_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -31109,10 +31607,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMat_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMat_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -31143,7 +31641,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSparseMat(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvSparseMat * >(argp1);
   {
     try {
-      delete_CvSparseMat(arg1);
+      delete_CvSparseMat(arg1); 
     } 
     catch (...) 
     {
@@ -31159,7 +31657,7 @@ fail:
 
 SWIGINTERN PyObject *CvSparseMat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSparseMat, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -31187,7 +31685,6 @@ SWIGINTERN PyObject *_wrap_CvSparseNode_hashval_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< unsigned int >(val2);
   if (arg1) (arg1)->hashval = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31198,10 +31695,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseNode_hashval_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseNode *arg1 = (CvSparseNode *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  unsigned int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseNode_hashval_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseNode, 0 |  0 );
@@ -31240,7 +31737,6 @@ SWIGINTERN PyObject *_wrap_CvSparseNode_next_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvSparseNode * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31251,10 +31747,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseNode_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseNode *arg1 = (CvSparseNode *) 0 ;
-  CvSparseNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSparseNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseNode_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseNode, 0 |  0 );
@@ -31306,7 +31802,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSparseNode(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvSparseNode * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -31322,7 +31818,7 @@ fail:
 
 SWIGINTERN PyObject *CvSparseNode_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSparseNode, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -31350,7 +31846,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMatIterator_mat_set(PyObject *SWIGUNUSEDPARM(
   }
   arg2 = reinterpret_cast< CvSparseMat * >(argp2);
   if (arg1) (arg1)->mat = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31361,10 +31856,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMatIterator_mat_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMatIterator *arg1 = (CvSparseMatIterator *) 0 ;
-  CvSparseMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSparseMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMatIterator_mat_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMatIterator, 0 |  0 );
@@ -31403,7 +31898,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMatIterator_node_set(PyObject *SWIGUNUSEDPARM
   }
   arg2 = reinterpret_cast< CvSparseNode * >(argp2);
   if (arg1) (arg1)->node = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31414,10 +31908,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMatIterator_node_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMatIterator *arg1 = (CvSparseMatIterator *) 0 ;
-  CvSparseNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSparseNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMatIterator_node_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMatIterator, 0 |  0 );
@@ -31456,7 +31950,6 @@ SWIGINTERN PyObject *_wrap_CvSparseMatIterator_curidx_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->curidx = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31467,10 +31960,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSparseMatIterator_curidx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMatIterator *arg1 = (CvSparseMatIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSparseMatIterator_curidx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMatIterator, 0 |  0 );
@@ -31522,7 +32015,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSparseMatIterator(PyObject *SWIGUNUSEDPARM(s
   arg1 = reinterpret_cast< CvSparseMatIterator * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -31538,7 +32031,7 @@ fail:
 
 SWIGINTERN PyObject *CvSparseMatIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSparseMatIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -31566,7 +32059,6 @@ SWIGINTERN PyObject *_wrap_CvHistogram_type_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31577,10 +32069,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHistogram_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHistogram_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -31616,7 +32108,6 @@ SWIGINTERN PyObject *_wrap_CvHistogram_bins_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->bins = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2)
@@ -31641,10 +32132,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHistogram_bins_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  CvArr *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvArr *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHistogram_bins_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -31707,10 +32198,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHistogram_thresh_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  float (*result)[2] = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float (*result)[2] = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHistogram_thresh_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -31751,7 +32242,6 @@ SWIGINTERN PyObject *_wrap_CvHistogram_thresh2_set(PyObject *SWIGUNUSEDPARM(self
     arg2=&buffer2;
   }
   if (arg1) (arg1)->thresh2 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31762,10 +32252,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHistogram_thresh2_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  float **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHistogram_thresh2_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -31804,7 +32294,6 @@ SWIGINTERN PyObject *_wrap_CvHistogram_mat_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvMatND * >(argp2);
   if (arg1) (arg1)->mat = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31815,10 +32304,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHistogram_mat_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHistogram *arg1 = (CvHistogram *) 0 ;
-  CvMatND *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMatND *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHistogram_mat_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -31849,7 +32338,7 @@ SWIGINTERN PyObject *_wrap_delete_CvHistogram(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvHistogram * >(argp1);
   {
     try {
-      delete_CvHistogram(arg1);
+      delete_CvHistogram(arg1); 
     } 
     catch (...) 
     {
@@ -31865,7 +32354,7 @@ fail:
 
 SWIGINTERN PyObject *CvHistogram_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvHistogram, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -31893,7 +32382,6 @@ SWIGINTERN PyObject *_wrap_CvRect_x_set(PyObject *SWIGUNUSEDPARM(self), PyObject
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->x = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31904,10 +32392,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRect_x_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRect *arg1 = (CvRect *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRect_x_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRect, 0 |  0 );
@@ -31946,7 +32434,6 @@ SWIGINTERN PyObject *_wrap_CvRect_y_set(PyObject *SWIGUNUSEDPARM(self), PyObject
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->y = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31957,10 +32444,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRect_y_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRect *arg1 = (CvRect *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRect_y_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRect, 0 |  0 );
@@ -31999,7 +32486,6 @@ SWIGINTERN PyObject *_wrap_CvRect_width_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->width = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32010,10 +32496,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRect_width_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRect *arg1 = (CvRect *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRect_width_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRect, 0 |  0 );
@@ -32052,7 +32538,6 @@ SWIGINTERN PyObject *_wrap_CvRect_height_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->height = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32063,10 +32548,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRect_height_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRect *arg1 = (CvRect *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRect_height_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRect, 0 |  0 );
@@ -32118,7 +32603,7 @@ SWIGINTERN PyObject *_wrap_delete_CvRect(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< CvRect * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -32134,7 +32619,7 @@ fail:
 
 SWIGINTERN PyObject *CvRect_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvRect, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -32145,7 +32630,6 @@ SWIGINTERN PyObject *_wrap_cvRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   int arg2 ;
   int arg3 ;
   int arg4 ;
-  CvRect result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -32158,6 +32642,7 @@ SWIGINTERN PyObject *_wrap_cvRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvRect result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvRect",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -32200,12 +32685,12 @@ SWIGINTERN PyObject *_wrap_cvRectToROI(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvRect arg1 ;
   int arg2 ;
-  IplROI result;
   CvRect temp1 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplROI result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvRectToROI",&obj0,&obj1)) SWIG_fail;
   {
@@ -32253,10 +32738,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvROIToRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplROI arg1 ;
-  CvRect result;
   void *argp1 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRect result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvROIToRect",&obj0)) SWIG_fail;
   {
@@ -32311,7 +32796,6 @@ SWIGINTERN PyObject *_wrap_CvTermCriteria_type_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32322,10 +32806,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTermCriteria_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTermCriteria *arg1 = (CvTermCriteria *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTermCriteria_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTermCriteria, 0 |  0 );
@@ -32364,7 +32848,6 @@ SWIGINTERN PyObject *_wrap_CvTermCriteria_max_iter_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->max_iter = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32375,10 +32858,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTermCriteria_max_iter_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTermCriteria *arg1 = (CvTermCriteria *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTermCriteria_max_iter_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTermCriteria, 0 |  0 );
@@ -32417,7 +32900,6 @@ SWIGINTERN PyObject *_wrap_CvTermCriteria_epsilon_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->epsilon = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32428,10 +32910,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTermCriteria_epsilon_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTermCriteria *arg1 = (CvTermCriteria *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTermCriteria_epsilon_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTermCriteria, 0 |  0 );
@@ -32483,7 +32965,7 @@ SWIGINTERN PyObject *_wrap_delete_CvTermCriteria(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvTermCriteria * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -32499,7 +32981,7 @@ fail:
 
 SWIGINTERN PyObject *CvTermCriteria_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvTermCriteria, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -32509,7 +32991,6 @@ SWIGINTERN PyObject *_wrap_cvTermCriteria(PyObject *SWIGUNUSEDPARM(self), PyObje
   int arg1 ;
   int arg2 ;
   double arg3 ;
-  CvTermCriteria result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -32519,6 +33000,7 @@ SWIGINTERN PyObject *_wrap_cvTermCriteria(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvTermCriteria result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvTermCriteria",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -32575,7 +33057,6 @@ SWIGINTERN PyObject *_wrap_CvPoint_x_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->x = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32586,10 +33067,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint_x_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint *arg1 = (CvPoint *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint_x_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint, 0 |  0 );
@@ -32628,7 +33109,6 @@ SWIGINTERN PyObject *_wrap_CvPoint_y_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->y = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32639,10 +33119,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint_y_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint *arg1 = (CvPoint *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint_y_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint, 0 |  0 );
@@ -32661,10 +33141,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint *arg1 = (CvPoint *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint___str__",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint, 0 |  0 );
@@ -32691,10 +33171,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint___repr__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint *arg1 = (CvPoint *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint___repr__",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint, 0 |  0 );
@@ -32754,7 +33234,7 @@ SWIGINTERN PyObject *_wrap_delete_CvPoint(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< CvPoint * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -32770,7 +33250,7 @@ fail:
 
 SWIGINTERN PyObject *CvPoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvPoint, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -32779,13 +33259,13 @@ SWIGINTERN PyObject *_wrap_cvPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
-  CvPoint result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvPoint result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvPoint",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -32837,7 +33317,6 @@ SWIGINTERN PyObject *_wrap_CvPoint2D32f_x_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->x = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32848,10 +33327,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint2D32f_x_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint2D32f *arg1 = (CvPoint2D32f *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint2D32f_x_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
@@ -32890,7 +33369,6 @@ SWIGINTERN PyObject *_wrap_CvPoint2D32f_y_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->y = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -32901,10 +33379,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint2D32f_y_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint2D32f *arg1 = (CvPoint2D32f *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint2D32f_y_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
@@ -32923,10 +33401,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint2D32f___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint2D32f *arg1 = (CvPoint2D32f *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint2D32f___str__",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
@@ -32953,10 +33431,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint2D32f___repr__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint2D32f *arg1 = (CvPoint2D32f *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint2D32f___repr__",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
@@ -33016,7 +33494,7 @@ SWIGINTERN PyObject *_wrap_delete_CvPoint2D32f(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvPoint2D32f * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -33032,7 +33510,7 @@ fail:
 
 SWIGINTERN PyObject *CvPoint2D32f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvPoint2D32f, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33041,13 +33519,13 @@ SWIGINTERN PyObject *_wrap_cvPoint2D32f(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
-  CvPoint2D32f result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvPoint2D32f result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvPoint2D32f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -33079,9 +33557,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvPointTo32f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint arg1 ;
-  CvPoint2D32f result;
   CvPoint temp1 ;
   PyObject * obj0 = 0 ;
+  CvPoint2D32f result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvPointTo32f",&obj0)) SWIG_fail;
   {
@@ -33124,9 +33602,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvPointFrom32f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint2D32f arg1 ;
-  CvPoint result;
   CvPoint2D32f temp1 ;
   PyObject * obj0 = 0 ;
+  CvPoint result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvPointFrom32f",&obj0)) SWIG_fail;
   {
@@ -33189,7 +33667,6 @@ SWIGINTERN PyObject *_wrap_CvPoint3D32f_x_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->x = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33200,10 +33677,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint3D32f_x_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint3D32f *arg1 = (CvPoint3D32f *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint3D32f_x_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint3D32f, 0 |  0 );
@@ -33242,7 +33719,6 @@ SWIGINTERN PyObject *_wrap_CvPoint3D32f_y_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->y = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33253,10 +33729,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint3D32f_y_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint3D32f *arg1 = (CvPoint3D32f *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint3D32f_y_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint3D32f, 0 |  0 );
@@ -33295,7 +33771,6 @@ SWIGINTERN PyObject *_wrap_CvPoint3D32f_z_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->z = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33306,10 +33781,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint3D32f_z_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint3D32f *arg1 = (CvPoint3D32f *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint3D32f_z_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint3D32f, 0 |  0 );
@@ -33361,7 +33836,7 @@ SWIGINTERN PyObject *_wrap_delete_CvPoint3D32f(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvPoint3D32f * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -33377,7 +33852,7 @@ fail:
 
 SWIGINTERN PyObject *CvPoint3D32f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvPoint3D32f, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33387,7 +33862,6 @@ SWIGINTERN PyObject *_wrap_cvPoint3D32f(PyObject *SWIGUNUSEDPARM(self), PyObject
   double arg1 ;
   double arg2 ;
   double arg3 ;
-  CvPoint3D32f result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -33397,6 +33871,7 @@ SWIGINTERN PyObject *_wrap_cvPoint3D32f(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvPoint3D32f result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvPoint3D32f",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -33453,7 +33928,6 @@ SWIGINTERN PyObject *_wrap_CvPoint2D64f_x_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->x = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33464,10 +33938,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint2D64f_x_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint2D64f *arg1 = (CvPoint2D64f *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint2D64f_x_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint2D64f, 0 |  0 );
@@ -33506,7 +33980,6 @@ SWIGINTERN PyObject *_wrap_CvPoint2D64f_y_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->y = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33517,10 +33990,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint2D64f_y_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint2D64f *arg1 = (CvPoint2D64f *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint2D64f_y_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint2D64f, 0 |  0 );
@@ -33572,7 +34045,7 @@ SWIGINTERN PyObject *_wrap_delete_CvPoint2D64f(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvPoint2D64f * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -33588,7 +34061,7 @@ fail:
 
 SWIGINTERN PyObject *CvPoint2D64f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvPoint2D64f, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33597,13 +34070,13 @@ SWIGINTERN PyObject *_wrap_cvPoint2D64f(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
-  CvPoint2D64f result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvPoint2D64f result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvPoint2D64f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -33655,7 +34128,6 @@ SWIGINTERN PyObject *_wrap_CvPoint3D64f_x_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->x = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33666,10 +34138,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint3D64f_x_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint3D64f *arg1 = (CvPoint3D64f *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint3D64f_x_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint3D64f, 0 |  0 );
@@ -33708,7 +34180,6 @@ SWIGINTERN PyObject *_wrap_CvPoint3D64f_y_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->y = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33719,10 +34190,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint3D64f_y_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint3D64f *arg1 = (CvPoint3D64f *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint3D64f_y_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint3D64f, 0 |  0 );
@@ -33761,7 +34232,6 @@ SWIGINTERN PyObject *_wrap_CvPoint3D64f_z_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->z = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33772,10 +34242,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPoint3D64f_z_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPoint3D64f *arg1 = (CvPoint3D64f *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPoint3D64f_z_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint3D64f, 0 |  0 );
@@ -33827,7 +34297,7 @@ SWIGINTERN PyObject *_wrap_delete_CvPoint3D64f(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvPoint3D64f * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -33843,7 +34313,7 @@ fail:
 
 SWIGINTERN PyObject *CvPoint3D64f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvPoint3D64f, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33853,7 +34323,6 @@ SWIGINTERN PyObject *_wrap_cvPoint3D64f(PyObject *SWIGUNUSEDPARM(self), PyObject
   double arg1 ;
   double arg2 ;
   double arg3 ;
-  CvPoint3D64f result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -33863,6 +34332,7 @@ SWIGINTERN PyObject *_wrap_cvPoint3D64f(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvPoint3D64f result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvPoint3D64f",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -33919,7 +34389,6 @@ SWIGINTERN PyObject *_wrap_CvSize_width_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->width = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33930,10 +34399,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSize_width_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSize *arg1 = (CvSize *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSize_width_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSize, 0 |  0 );
@@ -33972,7 +34441,6 @@ SWIGINTERN PyObject *_wrap_CvSize_height_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->height = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -33983,10 +34451,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSize_height_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSize *arg1 = (CvSize *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSize_height_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSize, 0 |  0 );
@@ -34038,7 +34506,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSize(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< CvSize * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -34054,7 +34522,7 @@ fail:
 
 SWIGINTERN PyObject *CvSize_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSize, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -34063,13 +34531,13 @@ SWIGINTERN PyObject *_wrap_cvSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
-  CvSize result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSize result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvSize",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -34121,7 +34589,6 @@ SWIGINTERN PyObject *_wrap_CvSize2D32f_width_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->width = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34132,10 +34599,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSize2D32f_width_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSize2D32f *arg1 = (CvSize2D32f *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSize2D32f_width_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSize2D32f, 0 |  0 );
@@ -34174,7 +34641,6 @@ SWIGINTERN PyObject *_wrap_CvSize2D32f_height_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->height = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34185,10 +34651,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSize2D32f_height_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSize2D32f *arg1 = (CvSize2D32f *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSize2D32f_height_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSize2D32f, 0 |  0 );
@@ -34240,7 +34706,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSize2D32f(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvSize2D32f * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -34256,7 +34722,7 @@ fail:
 
 SWIGINTERN PyObject *CvSize2D32f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSize2D32f, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -34265,13 +34731,13 @@ SWIGINTERN PyObject *_wrap_cvSize2D32f(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
-  CvSize2D32f result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSize2D32f result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvSize2D32f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -34323,7 +34789,6 @@ SWIGINTERN PyObject *_wrap_CvBox2D_center_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< CvPoint2D32f * >(argp2);
   if (arg1) (arg1)->center = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34334,10 +34799,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBox2D_center_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBox2D *arg1 = (CvBox2D *) 0 ;
-  CvPoint2D32f *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBox2D_center_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBox2D, 0 |  0 );
@@ -34376,7 +34841,6 @@ SWIGINTERN PyObject *_wrap_CvBox2D_size_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg2 = reinterpret_cast< CvSize2D32f * >(argp2);
   if (arg1) (arg1)->size = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34387,10 +34851,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBox2D_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBox2D *arg1 = (CvBox2D *) 0 ;
-  CvSize2D32f *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSize2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBox2D_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBox2D, 0 |  0 );
@@ -34429,7 +34893,6 @@ SWIGINTERN PyObject *_wrap_CvBox2D_angle_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->angle = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34440,10 +34903,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBox2D_angle_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBox2D *arg1 = (CvBox2D *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBox2D_angle_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBox2D, 0 |  0 );
@@ -34495,7 +34958,7 @@ SWIGINTERN PyObject *_wrap_delete_CvBox2D(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< CvBox2D * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -34511,7 +34974,7 @@ fail:
 
 SWIGINTERN PyObject *CvBox2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvBox2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -34539,7 +35002,6 @@ SWIGINTERN PyObject *_wrap_CvLineIterator_ptr_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< uchar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34550,10 +35012,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvLineIterator_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvLineIterator *arg1 = (CvLineIterator *) 0 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvLineIterator_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvLineIterator, 0 |  0 );
@@ -34592,7 +35054,6 @@ SWIGINTERN PyObject *_wrap_CvLineIterator_err_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->err = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34603,10 +35064,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvLineIterator_err_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvLineIterator *arg1 = (CvLineIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvLineIterator_err_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvLineIterator, 0 |  0 );
@@ -34645,7 +35106,6 @@ SWIGINTERN PyObject *_wrap_CvLineIterator_plus_delta_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->plus_delta = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34656,10 +35116,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvLineIterator_plus_delta_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvLineIterator *arg1 = (CvLineIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvLineIterator_plus_delta_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvLineIterator, 0 |  0 );
@@ -34698,7 +35158,6 @@ SWIGINTERN PyObject *_wrap_CvLineIterator_minus_delta_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->minus_delta = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34709,10 +35168,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvLineIterator_minus_delta_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvLineIterator *arg1 = (CvLineIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvLineIterator_minus_delta_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvLineIterator, 0 |  0 );
@@ -34751,7 +35210,6 @@ SWIGINTERN PyObject *_wrap_CvLineIterator_plus_step_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->plus_step = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34762,10 +35220,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvLineIterator_plus_step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvLineIterator *arg1 = (CvLineIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvLineIterator_plus_step_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvLineIterator, 0 |  0 );
@@ -34804,7 +35262,6 @@ SWIGINTERN PyObject *_wrap_CvLineIterator_minus_step_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->minus_step = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34815,10 +35272,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvLineIterator_minus_step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvLineIterator *arg1 = (CvLineIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvLineIterator_minus_step_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvLineIterator, 0 |  0 );
@@ -34870,7 +35327,7 @@ SWIGINTERN PyObject *_wrap_delete_CvLineIterator(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvLineIterator * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -34886,7 +35343,7 @@ fail:
 
 SWIGINTERN PyObject *CvLineIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvLineIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -34914,7 +35371,6 @@ SWIGINTERN PyObject *_wrap_CvSlice_start_index_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->start_index = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34925,10 +35381,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSlice_start_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSlice *arg1 = (CvSlice *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSlice_start_index_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSlice, 0 |  0 );
@@ -34967,7 +35423,6 @@ SWIGINTERN PyObject *_wrap_CvSlice_end_index_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->end_index = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -34978,10 +35433,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSlice_end_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSlice *arg1 = (CvSlice *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSlice_end_index_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSlice, 0 |  0 );
@@ -35033,7 +35488,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSlice(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< CvSlice * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -35049,7 +35504,7 @@ fail:
 
 SWIGINTERN PyObject *CvSlice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSlice, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -35058,13 +35513,13 @@ SWIGINTERN PyObject *_wrap_cvSlice(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
-  CvSlice result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSlice result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvSlice",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -35133,10 +35588,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvScalar_val_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvScalar *arg1 = (CvScalar *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvScalar_val_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvScalar, 0 |  0 );
@@ -35155,10 +35610,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvScalar___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvScalar *arg1 = (CvScalar *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvScalar___str__",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvScalar, 0 |  0 );
@@ -35185,10 +35640,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvScalar___repr__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvScalar *arg1 = (CvScalar *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvScalar___repr__",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvScalar, 0 |  0 );
@@ -35216,13 +35671,13 @@ SWIGINTERN PyObject *_wrap_CvScalar___getitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvScalar *arg1 = (CvScalar *) 0 ;
   int arg2 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvScalar___getitem__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvScalar, 0 |  0 );
@@ -35334,7 +35789,7 @@ SWIGINTERN PyObject *_wrap_delete_CvScalar(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = reinterpret_cast< CvScalar * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -35350,7 +35805,7 @@ fail:
 
 SWIGINTERN PyObject *CvScalar_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvScalar, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -35361,7 +35816,6 @@ SWIGINTERN PyObject *_wrap_cvScalar__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyOb
   double arg2 ;
   double arg3 ;
   double arg4 ;
-  CvScalar result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -35374,6 +35828,7 @@ SWIGINTERN PyObject *_wrap_cvScalar__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvScalar",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -35417,7 +35872,6 @@ SWIGINTERN PyObject *_wrap_cvScalar__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyOb
   double arg1 ;
   double arg2 ;
   double arg3 ;
-  CvScalar result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -35427,6 +35881,7 @@ SWIGINTERN PyObject *_wrap_cvScalar__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvScalar",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -35464,13 +35919,13 @@ SWIGINTERN PyObject *_wrap_cvScalar__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   double arg1 ;
   double arg2 ;
-  CvScalar result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvScalar",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -35502,10 +35957,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvScalar__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
-  CvScalar result;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvScalar",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -35535,7 +35990,7 @@ SWIGINTERN PyObject *_wrap_cvScalar(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -35617,7 +36072,12 @@ SWIGINTERN PyObject *_wrap_cvScalar(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvScalar'.\n  Possible C/C++ prototypes are:\n    cvScalar(double,double,double,double)\n    cvScalar(double,double,double)\n    cvScalar(double,double)\n    cvScalar(double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvScalar'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvScalar(double,double,double,double)\n"
+    "    cvScalar(double,double,double)\n"
+    "    cvScalar(double,double)\n"
+    "    cvScalar(double)\n");
   return NULL;
 }
 
@@ -35625,10 +36085,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvRealScalar(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
-  CvScalar result;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvRealScalar",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -35655,10 +36115,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvScalarAll(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   double arg1 ;
-  CvScalar result;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvScalarAll",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -35705,7 +36165,6 @@ SWIGINTERN PyObject *_wrap_CvMemBlock_prev_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvMemBlock * >(argp2);
   if (arg1) (arg1)->prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -35716,10 +36175,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemBlock_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemBlock *arg1 = (CvMemBlock *) 0 ;
-  CvMemBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemBlock_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemBlock, 0 |  0 );
@@ -35758,7 +36217,6 @@ SWIGINTERN PyObject *_wrap_CvMemBlock_next_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvMemBlock * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -35769,10 +36227,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemBlock_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemBlock *arg1 = (CvMemBlock *) 0 ;
-  CvMemBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemBlock_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemBlock, 0 |  0 );
@@ -35824,7 +36282,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMemBlock(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvMemBlock * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -35840,7 +36298,7 @@ fail:
 
 SWIGINTERN PyObject *CvMemBlock_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMemBlock, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -35868,7 +36326,6 @@ SWIGINTERN PyObject *_wrap_CvMemStorage_signature_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->signature = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -35879,10 +36336,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemStorage_signature_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemStorage_signature_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -35921,7 +36378,6 @@ SWIGINTERN PyObject *_wrap_CvMemStorage_bottom_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvMemBlock * >(argp2);
   if (arg1) (arg1)->bottom = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -35932,10 +36388,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemStorage_bottom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
-  CvMemBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemStorage_bottom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -35974,7 +36430,6 @@ SWIGINTERN PyObject *_wrap_CvMemStorage_top_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvMemBlock * >(argp2);
   if (arg1) (arg1)->top = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -35985,10 +36440,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemStorage_top_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
-  CvMemBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemStorage_top_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -36027,7 +36482,6 @@ SWIGINTERN PyObject *_wrap_CvMemStorage_parent_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->parent = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36038,10 +36492,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemStorage_parent_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemStorage_parent_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -36080,7 +36534,6 @@ SWIGINTERN PyObject *_wrap_CvMemStorage_block_size_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->block_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36091,10 +36544,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemStorage_block_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemStorage_block_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -36133,7 +36586,6 @@ SWIGINTERN PyObject *_wrap_CvMemStorage_free_space_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->free_space = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36144,10 +36596,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemStorage_free_space_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemStorage_free_space_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -36178,7 +36630,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMemStorage(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvMemStorage * >(argp1);
   {
     try {
-      delete_CvMemStorage(arg1);
+      delete_CvMemStorage(arg1); 
     } 
     catch (...) 
     {
@@ -36194,7 +36646,7 @@ fail:
 
 SWIGINTERN PyObject *CvMemStorage_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMemStorage, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36222,7 +36674,6 @@ SWIGINTERN PyObject *_wrap_CvMemStoragePos_top_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvMemBlock * >(argp2);
   if (arg1) (arg1)->top = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36233,10 +36684,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemStoragePos_top_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStoragePos *arg1 = (CvMemStoragePos *) 0 ;
-  CvMemBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemStoragePos_top_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStoragePos, 0 |  0 );
@@ -36275,7 +36726,6 @@ SWIGINTERN PyObject *_wrap_CvMemStoragePos_free_space_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->free_space = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36286,10 +36736,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMemStoragePos_free_space_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStoragePos *arg1 = (CvMemStoragePos *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMemStoragePos_free_space_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStoragePos, 0 |  0 );
@@ -36341,7 +36791,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMemStoragePos(PyObject *SWIGUNUSEDPARM(self)
   arg1 = reinterpret_cast< CvMemStoragePos * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -36357,7 +36807,7 @@ fail:
 
 SWIGINTERN PyObject *CvMemStoragePos_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMemStoragePos, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36385,7 +36835,6 @@ SWIGINTERN PyObject *_wrap_CvSeqBlock_prev_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36396,10 +36845,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqBlock_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqBlock *arg1 = (CvSeqBlock *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqBlock_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqBlock, 0 |  0 );
@@ -36438,7 +36887,6 @@ SWIGINTERN PyObject *_wrap_CvSeqBlock_next_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36449,10 +36897,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqBlock_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqBlock *arg1 = (CvSeqBlock *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqBlock_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqBlock, 0 |  0 );
@@ -36491,7 +36939,6 @@ SWIGINTERN PyObject *_wrap_CvSeqBlock_start_index_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->start_index = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36502,10 +36949,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqBlock_start_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqBlock *arg1 = (CvSeqBlock *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqBlock_start_index_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqBlock, 0 |  0 );
@@ -36544,7 +36991,6 @@ SWIGINTERN PyObject *_wrap_CvSeqBlock_count_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36555,10 +37001,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqBlock_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqBlock *arg1 = (CvSeqBlock *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqBlock_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqBlock, 0 |  0 );
@@ -36597,7 +37043,6 @@ SWIGINTERN PyObject *_wrap_CvSeqBlock_data_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->data = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36608,10 +37053,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqBlock_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqBlock *arg1 = (CvSeqBlock *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqBlock_data_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqBlock, 0 |  0 );
@@ -36663,7 +37108,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSeqBlock(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvSeqBlock * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -36679,7 +37124,7 @@ fail:
 
 SWIGINTERN PyObject *CvSeqBlock_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSeqBlock, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36715,7 +37160,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_flags_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36726,9 +37170,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_flags_get",&obj0)) SWIG_fail;
   {
@@ -36784,7 +37228,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_header_size_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36795,9 +37238,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_header_size_get",&obj0)) SWIG_fail;
   {
@@ -36861,7 +37304,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_h_prev_set(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36872,9 +37314,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_h_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_h_prev_get",&obj0)) SWIG_fail;
   {
@@ -36938,7 +37380,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_h_next_set(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -36949,9 +37390,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_h_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_h_next_get",&obj0)) SWIG_fail;
   {
@@ -37015,7 +37456,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_v_prev_set(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37026,9 +37466,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_v_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_v_prev_get",&obj0)) SWIG_fail;
   {
@@ -37092,7 +37532,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_v_next_set(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37103,9 +37542,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_v_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_v_next_get",&obj0)) SWIG_fail;
   {
@@ -37161,7 +37600,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_total_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->total = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37172,9 +37610,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_total_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_total_get",&obj0)) SWIG_fail;
   {
@@ -37230,7 +37668,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_elem_size_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->elem_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37241,9 +37678,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_elem_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_elem_size_get",&obj0)) SWIG_fail;
   {
@@ -37299,7 +37736,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_block_max_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37310,9 +37746,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  schar *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_block_max_get",&obj0)) SWIG_fail;
   {
@@ -37368,7 +37804,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_ptr_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37379,9 +37814,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  schar *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_ptr_get",&obj0)) SWIG_fail;
   {
@@ -37437,7 +37872,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_delta_elems_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37448,9 +37882,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_delta_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_delta_elems_get",&obj0)) SWIG_fail;
   {
@@ -37506,7 +37940,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_storage_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37517,9 +37950,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvMemStorage *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_storage_get",&obj0)) SWIG_fail;
   {
@@ -37575,7 +38008,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_free_blocks_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->free_blocks = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37586,9 +38018,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_free_blocks_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_free_blocks_get",&obj0)) SWIG_fail;
   {
@@ -37644,7 +38076,6 @@ SWIGINTERN PyObject *_wrap_CvSeq_first_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37655,9 +38086,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeq_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_first_get",&obj0)) SWIG_fail;
   {
@@ -37726,7 +38157,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSeq(PyObject *SWIGUNUSEDPARM(self), PyObject
   }
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -37742,7 +38173,7 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSeq, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -37770,7 +38201,6 @@ SWIGINTERN PyObject *_wrap_CvSetElem_flags_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37781,10 +38211,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSetElem_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSetElem *arg1 = (CvSetElem *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSetElem_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSetElem, 0 |  0 );
@@ -37823,7 +38253,6 @@ SWIGINTERN PyObject *_wrap_CvSetElem_next_free_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvSetElem * >(argp2);
   if (arg1) (arg1)->next_free = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37834,10 +38263,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSetElem_next_free_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSetElem *arg1 = (CvSetElem *) 0 ;
-  CvSetElem *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSetElem *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSetElem_next_free_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSetElem, 0 |  0 );
@@ -37889,7 +38318,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSetElem(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< CvSetElem * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -37905,7 +38334,7 @@ fail:
 
 SWIGINTERN PyObject *CvSetElem_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSetElem, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -37937,7 +38366,6 @@ SWIGINTERN PyObject *_wrap_CvSet_flags_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37948,9 +38376,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_flags_get",&obj0)) SWIG_fail;
   {
@@ -37998,7 +38426,6 @@ SWIGINTERN PyObject *_wrap_CvSet_header_size_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38009,9 +38436,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_header_size_get",&obj0)) SWIG_fail;
   {
@@ -38067,7 +38494,6 @@ SWIGINTERN PyObject *_wrap_CvSet_h_prev_set(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38078,9 +38504,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_h_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_h_prev_get",&obj0)) SWIG_fail;
   {
@@ -38136,7 +38562,6 @@ SWIGINTERN PyObject *_wrap_CvSet_h_next_set(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38147,9 +38572,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_h_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_h_next_get",&obj0)) SWIG_fail;
   {
@@ -38205,7 +38630,6 @@ SWIGINTERN PyObject *_wrap_CvSet_v_prev_set(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38216,9 +38640,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_v_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_v_prev_get",&obj0)) SWIG_fail;
   {
@@ -38274,7 +38698,6 @@ SWIGINTERN PyObject *_wrap_CvSet_v_next_set(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38285,9 +38708,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_v_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_v_next_get",&obj0)) SWIG_fail;
   {
@@ -38335,7 +38758,6 @@ SWIGINTERN PyObject *_wrap_CvSet_total_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->total = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38346,9 +38768,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_total_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_total_get",&obj0)) SWIG_fail;
   {
@@ -38396,7 +38818,6 @@ SWIGINTERN PyObject *_wrap_CvSet_elem_size_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->elem_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38407,9 +38828,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_elem_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_elem_size_get",&obj0)) SWIG_fail;
   {
@@ -38457,7 +38878,6 @@ SWIGINTERN PyObject *_wrap_CvSet_block_max_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38468,9 +38888,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  schar *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_block_max_get",&obj0)) SWIG_fail;
   {
@@ -38518,7 +38938,6 @@ SWIGINTERN PyObject *_wrap_CvSet_ptr_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38529,9 +38948,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  schar *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_ptr_get",&obj0)) SWIG_fail;
   {
@@ -38579,7 +38998,6 @@ SWIGINTERN PyObject *_wrap_CvSet_delta_elems_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38590,9 +39008,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_delta_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_delta_elems_get",&obj0)) SWIG_fail;
   {
@@ -38640,7 +39058,6 @@ SWIGINTERN PyObject *_wrap_CvSet_storage_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38651,9 +39068,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvMemStorage *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_storage_get",&obj0)) SWIG_fail;
   {
@@ -38701,7 +39118,6 @@ SWIGINTERN PyObject *_wrap_CvSet_free_blocks_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->free_blocks = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38712,9 +39128,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_free_blocks_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_free_blocks_get",&obj0)) SWIG_fail;
   {
@@ -38762,7 +39178,6 @@ SWIGINTERN PyObject *_wrap_CvSet_first_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38773,9 +39188,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_first_get",&obj0)) SWIG_fail;
   {
@@ -38823,7 +39238,6 @@ SWIGINTERN PyObject *_wrap_CvSet_free_elems_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvSetElem * >(argp2);
   if (arg1) (arg1)->free_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38834,9 +39248,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_free_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvSetElem *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSetElem *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_free_elems_get",&obj0)) SWIG_fail;
   {
@@ -38884,7 +39298,6 @@ SWIGINTERN PyObject *_wrap_CvSet_active_count_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->active_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -38895,9 +39308,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSet_active_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSet_active_count_get",&obj0)) SWIG_fail;
   {
@@ -38958,7 +39371,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSet(PyObject *SWIGUNUSEDPARM(self), PyObject
   }
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -38974,7 +39387,7 @@ fail:
 
 SWIGINTERN PyObject *CvSet_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSet, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -39002,7 +39415,6 @@ SWIGINTERN PyObject *_wrap_CvGraphEdge_flags_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39013,10 +39425,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphEdge_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphEdge *arg1 = (CvGraphEdge *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphEdge_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphEdge, 0 |  0 );
@@ -39055,7 +39467,6 @@ SWIGINTERN PyObject *_wrap_CvGraphEdge_weight_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->weight = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39066,10 +39477,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphEdge_weight_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphEdge *arg1 = (CvGraphEdge *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphEdge_weight_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphEdge, 0 |  0 );
@@ -39125,10 +39536,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphEdge_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphEdge *arg1 = (CvGraphEdge *) 0 ;
-  CvGraphEdge **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvGraphEdge **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphEdge_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphEdge, 0 |  0 );
@@ -39184,10 +39595,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphEdge_vtx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphEdge *arg1 = (CvGraphEdge *) 0 ;
-  CvGraphVtx **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvGraphVtx **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphEdge_vtx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphEdge, 0 |  0 );
@@ -39239,7 +39650,7 @@ SWIGINTERN PyObject *_wrap_delete_CvGraphEdge(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvGraphEdge * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -39255,7 +39666,7 @@ fail:
 
 SWIGINTERN PyObject *CvGraphEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvGraphEdge, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -39283,7 +39694,6 @@ SWIGINTERN PyObject *_wrap_CvGraphVtx_flags_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39294,10 +39704,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphVtx_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphVtx *arg1 = (CvGraphVtx *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphVtx_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphVtx, 0 |  0 );
@@ -39336,7 +39746,6 @@ SWIGINTERN PyObject *_wrap_CvGraphVtx_first_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvGraphEdge * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39347,10 +39756,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphVtx_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphVtx *arg1 = (CvGraphVtx *) 0 ;
-  CvGraphEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvGraphEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphVtx_first_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphVtx, 0 |  0 );
@@ -39402,7 +39811,7 @@ SWIGINTERN PyObject *_wrap_delete_CvGraphVtx(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvGraphVtx * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -39418,7 +39827,7 @@ fail:
 
 SWIGINTERN PyObject *CvGraphVtx_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvGraphVtx, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -39446,7 +39855,6 @@ SWIGINTERN PyObject *_wrap_CvGraphVtx2D_flags_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39457,10 +39865,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphVtx2D_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphVtx2D *arg1 = (CvGraphVtx2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphVtx2D_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphVtx2D, 0 |  0 );
@@ -39499,7 +39907,6 @@ SWIGINTERN PyObject *_wrap_CvGraphVtx2D_first_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvGraphEdge * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39510,10 +39917,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphVtx2D_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphVtx2D *arg1 = (CvGraphVtx2D *) 0 ;
-  CvGraphEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvGraphEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphVtx2D_first_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphVtx2D, 0 |  0 );
@@ -39552,7 +39959,6 @@ SWIGINTERN PyObject *_wrap_CvGraphVtx2D_ptr_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvPoint2D32f * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39563,10 +39969,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphVtx2D_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphVtx2D *arg1 = (CvGraphVtx2D *) 0 ;
-  CvPoint2D32f *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphVtx2D_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphVtx2D, 0 |  0 );
@@ -39618,7 +40024,7 @@ SWIGINTERN PyObject *_wrap_delete_CvGraphVtx2D(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvGraphVtx2D * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -39634,7 +40040,7 @@ fail:
 
 SWIGINTERN PyObject *CvGraphVtx2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvGraphVtx2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -39665,7 +40071,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_flags_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39676,9 +40081,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_flags_get",&obj0)) SWIG_fail;
   {
@@ -39724,7 +40129,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_header_size_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39735,9 +40139,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_header_size_get",&obj0)) SWIG_fail;
   {
@@ -39791,7 +40195,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_h_prev_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39802,9 +40205,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_h_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_h_prev_get",&obj0)) SWIG_fail;
   {
@@ -39858,7 +40261,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_h_next_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39869,9 +40271,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_h_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_h_next_get",&obj0)) SWIG_fail;
   {
@@ -39925,7 +40327,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_v_prev_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -39936,9 +40337,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_v_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_v_prev_get",&obj0)) SWIG_fail;
   {
@@ -39992,7 +40393,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_v_next_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40003,9 +40403,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_v_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_v_next_get",&obj0)) SWIG_fail;
   {
@@ -40051,7 +40451,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_total_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->total = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40062,9 +40461,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_total_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_total_get",&obj0)) SWIG_fail;
   {
@@ -40110,7 +40509,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_elem_size_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->elem_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40121,9 +40519,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_elem_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_elem_size_get",&obj0)) SWIG_fail;
   {
@@ -40169,7 +40567,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_block_max_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40180,9 +40577,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  schar *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_block_max_get",&obj0)) SWIG_fail;
   {
@@ -40228,7 +40625,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_ptr_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40239,9 +40635,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  schar *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_ptr_get",&obj0)) SWIG_fail;
   {
@@ -40287,7 +40683,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_delta_elems_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40298,9 +40693,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_delta_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_delta_elems_get",&obj0)) SWIG_fail;
   {
@@ -40346,7 +40741,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_storage_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40357,9 +40751,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvMemStorage *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_storage_get",&obj0)) SWIG_fail;
   {
@@ -40405,7 +40799,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_free_blocks_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->free_blocks = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40416,9 +40809,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_free_blocks_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_free_blocks_get",&obj0)) SWIG_fail;
   {
@@ -40464,7 +40857,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_first_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40475,9 +40867,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_first_get",&obj0)) SWIG_fail;
   {
@@ -40523,7 +40915,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_free_elems_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvSetElem * >(argp2);
   if (arg1) (arg1)->free_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40534,9 +40925,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_free_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvSetElem *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSetElem *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_free_elems_get",&obj0)) SWIG_fail;
   {
@@ -40582,7 +40973,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_active_count_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->active_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40593,9 +40983,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_active_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  int result;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_active_count_get",&obj0)) SWIG_fail;
   {
@@ -40645,7 +41035,6 @@ SWIGINTERN PyObject *_wrap_CvGraph_edges_set(PyObject *SWIGUNUSEDPARM(self), PyO
     arg2 = (CvSet *)ptr2;
   }
   if (arg1) (arg1)->edges = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40656,9 +41045,9 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraph_edges_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
-  CvSet *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSet *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraph_edges_get",&obj0)) SWIG_fail;
   {
@@ -40717,7 +41106,7 @@ SWIGINTERN PyObject *_wrap_delete_CvGraph(PyObject *SWIGUNUSEDPARM(self), PyObje
   }
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -40733,7 +41122,7 @@ fail:
 
 SWIGINTERN PyObject *CvGraph_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvGraph, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -40761,7 +41150,6 @@ SWIGINTERN PyObject *_wrap_CvChain_flags_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40772,10 +41160,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -40814,7 +41202,6 @@ SWIGINTERN PyObject *_wrap_CvChain_header_size_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40825,10 +41212,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_header_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -40875,7 +41262,6 @@ SWIGINTERN PyObject *_wrap_CvChain_h_prev_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40886,10 +41272,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_h_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_h_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -40936,7 +41322,6 @@ SWIGINTERN PyObject *_wrap_CvChain_h_next_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -40947,10 +41332,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_h_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_h_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -40997,7 +41382,6 @@ SWIGINTERN PyObject *_wrap_CvChain_v_prev_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41008,10 +41392,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_v_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_v_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41058,7 +41442,6 @@ SWIGINTERN PyObject *_wrap_CvChain_v_next_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41069,10 +41452,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_v_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_v_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41111,7 +41494,6 @@ SWIGINTERN PyObject *_wrap_CvChain_total_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->total = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41122,10 +41504,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_total_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_total_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41164,7 +41546,6 @@ SWIGINTERN PyObject *_wrap_CvChain_elem_size_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->elem_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41175,10 +41556,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_elem_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_elem_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41217,7 +41598,6 @@ SWIGINTERN PyObject *_wrap_CvChain_block_max_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41228,10 +41608,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_block_max_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41270,7 +41650,6 @@ SWIGINTERN PyObject *_wrap_CvChain_ptr_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41281,10 +41660,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41323,7 +41702,6 @@ SWIGINTERN PyObject *_wrap_CvChain_delta_elems_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41334,10 +41712,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_delta_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_delta_elems_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41376,7 +41754,6 @@ SWIGINTERN PyObject *_wrap_CvChain_storage_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41387,10 +41764,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_storage_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41429,7 +41806,6 @@ SWIGINTERN PyObject *_wrap_CvChain_free_blocks_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->free_blocks = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41440,10 +41816,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_free_blocks_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_free_blocks_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41482,7 +41858,6 @@ SWIGINTERN PyObject *_wrap_CvChain_first_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41493,10 +41868,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_first_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41535,7 +41910,6 @@ SWIGINTERN PyObject *_wrap_CvChain_origin_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< CvPoint * >(argp2);
   if (arg1) (arg1)->origin = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41546,10 +41920,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChain_origin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChain *arg1 = (CvChain *) 0 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChain_origin_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChain, 0 |  0 );
@@ -41601,7 +41975,7 @@ SWIGINTERN PyObject *_wrap_delete_CvChain(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< CvChain * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -41617,7 +41991,7 @@ fail:
 
 SWIGINTERN PyObject *CvChain_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvChain, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -41645,7 +42019,6 @@ SWIGINTERN PyObject *_wrap_CvContour_flags_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41656,10 +42029,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -41698,7 +42071,6 @@ SWIGINTERN PyObject *_wrap_CvContour_header_size_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41709,10 +42081,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_header_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -41759,7 +42131,6 @@ SWIGINTERN PyObject *_wrap_CvContour_h_prev_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41770,10 +42141,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_h_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_h_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -41820,7 +42191,6 @@ SWIGINTERN PyObject *_wrap_CvContour_h_next_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41831,10 +42201,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_h_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_h_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -41881,7 +42251,6 @@ SWIGINTERN PyObject *_wrap_CvContour_v_prev_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41892,10 +42261,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_v_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_v_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -41942,7 +42311,6 @@ SWIGINTERN PyObject *_wrap_CvContour_v_next_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -41953,10 +42321,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_v_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_v_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -41995,7 +42363,6 @@ SWIGINTERN PyObject *_wrap_CvContour_total_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->total = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42006,10 +42373,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_total_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_total_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42048,7 +42415,6 @@ SWIGINTERN PyObject *_wrap_CvContour_elem_size_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->elem_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42059,10 +42425,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_elem_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_elem_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42101,7 +42467,6 @@ SWIGINTERN PyObject *_wrap_CvContour_block_max_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42112,10 +42477,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_block_max_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42154,7 +42519,6 @@ SWIGINTERN PyObject *_wrap_CvContour_ptr_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42165,10 +42529,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42207,7 +42571,6 @@ SWIGINTERN PyObject *_wrap_CvContour_delta_elems_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42218,10 +42581,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_delta_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_delta_elems_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42260,7 +42623,6 @@ SWIGINTERN PyObject *_wrap_CvContour_storage_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42271,10 +42633,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_storage_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42313,7 +42675,6 @@ SWIGINTERN PyObject *_wrap_CvContour_free_blocks_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->free_blocks = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42324,10 +42685,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_free_blocks_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_free_blocks_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42366,7 +42727,6 @@ SWIGINTERN PyObject *_wrap_CvContour_first_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42377,10 +42737,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_first_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42419,7 +42779,6 @@ SWIGINTERN PyObject *_wrap_CvContour_rect_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< CvRect * >(argp2);
   if (arg1) (arg1)->rect = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42430,10 +42789,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_rect_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  CvRect *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRect *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_rect_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42472,7 +42831,6 @@ SWIGINTERN PyObject *_wrap_CvContour_color_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->color = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42483,10 +42841,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_color_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_color_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42542,10 +42900,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContour_reserved_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContour *arg1 = (CvContour *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContour_reserved_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContour, 0 |  0 );
@@ -42597,7 +42955,7 @@ SWIGINTERN PyObject *_wrap_delete_CvContour(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< CvContour * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -42613,7 +42971,7 @@ fail:
 
 SWIGINTERN PyObject *CvContour_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvContour, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -42641,7 +42999,6 @@ SWIGINTERN PyObject *_wrap_CvSeqWriter_header_size_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42652,10 +43009,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqWriter_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqWriter *arg1 = (CvSeqWriter *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqWriter_header_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqWriter, 0 |  0 );
@@ -42702,7 +43059,6 @@ SWIGINTERN PyObject *_wrap_CvSeqWriter_seq_set(PyObject *SWIGUNUSEDPARM(self), P
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->seq = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42713,10 +43069,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqWriter_seq_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqWriter *arg1 = (CvSeqWriter *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqWriter_seq_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqWriter, 0 |  0 );
@@ -42755,7 +43111,6 @@ SWIGINTERN PyObject *_wrap_CvSeqWriter_block_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->block = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42766,10 +43121,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqWriter_block_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqWriter *arg1 = (CvSeqWriter *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqWriter_block_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqWriter, 0 |  0 );
@@ -42808,7 +43163,6 @@ SWIGINTERN PyObject *_wrap_CvSeqWriter_ptr_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42819,10 +43173,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqWriter_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqWriter *arg1 = (CvSeqWriter *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqWriter_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqWriter, 0 |  0 );
@@ -42861,7 +43215,6 @@ SWIGINTERN PyObject *_wrap_CvSeqWriter_block_min_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_min = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42872,10 +43225,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqWriter_block_min_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqWriter *arg1 = (CvSeqWriter *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqWriter_block_min_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqWriter, 0 |  0 );
@@ -42914,7 +43267,6 @@ SWIGINTERN PyObject *_wrap_CvSeqWriter_block_max_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -42925,10 +43277,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqWriter_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqWriter *arg1 = (CvSeqWriter *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqWriter_block_max_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqWriter, 0 |  0 );
@@ -42980,7 +43332,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSeqWriter(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvSeqWriter * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -42996,7 +43348,7 @@ fail:
 
 SWIGINTERN PyObject *CvSeqWriter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSeqWriter, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -43024,7 +43376,6 @@ SWIGINTERN PyObject *_wrap_CvSeqReader_header_size_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43035,10 +43386,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqReader_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqReader_header_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -43085,7 +43436,6 @@ SWIGINTERN PyObject *_wrap_CvSeqReader_seq_set(PyObject *SWIGUNUSEDPARM(self), P
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->seq = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43096,10 +43446,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqReader_seq_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqReader_seq_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -43138,7 +43488,6 @@ SWIGINTERN PyObject *_wrap_CvSeqReader_block_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->block = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43149,10 +43498,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqReader_block_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqReader_block_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -43191,7 +43540,6 @@ SWIGINTERN PyObject *_wrap_CvSeqReader_ptr_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43202,10 +43550,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqReader_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqReader_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -43244,7 +43592,6 @@ SWIGINTERN PyObject *_wrap_CvSeqReader_block_min_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_min = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43255,10 +43602,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqReader_block_min_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqReader_block_min_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -43297,7 +43644,6 @@ SWIGINTERN PyObject *_wrap_CvSeqReader_block_max_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43308,10 +43654,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqReader_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqReader_block_max_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -43350,7 +43696,6 @@ SWIGINTERN PyObject *_wrap_CvSeqReader_delta_index_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_index = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43361,10 +43706,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqReader_delta_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqReader_delta_index_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -43403,7 +43748,6 @@ SWIGINTERN PyObject *_wrap_CvSeqReader_prev_elem_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->prev_elem = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43414,10 +43758,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSeqReader_prev_elem_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeqReader_prev_elem_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -43469,7 +43813,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSeqReader(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvSeqReader * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -43485,7 +43829,7 @@ fail:
 
 SWIGINTERN PyObject *CvSeqReader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSeqReader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -43515,7 +43859,6 @@ SWIGINTERN PyObject *_wrap_CvAttrList_attr_set(PyObject *SWIGUNUSEDPARM(self), P
     arg2=&buffer2;
   }
   if (arg1) (arg1)->attr = (char const **)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43526,10 +43869,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvAttrList_attr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvAttrList *arg1 = (CvAttrList *) 0 ;
-  char **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvAttrList_attr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvAttrList, 0 |  0 );
@@ -43568,7 +43911,6 @@ SWIGINTERN PyObject *_wrap_CvAttrList_next_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvAttrList * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43579,10 +43921,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvAttrList_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvAttrList *arg1 = (CvAttrList *) 0 ;
-  CvAttrList *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvAttrList *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvAttrList_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvAttrList, 0 |  0 );
@@ -43634,7 +43976,7 @@ SWIGINTERN PyObject *_wrap_delete_CvAttrList(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvAttrList * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -43650,7 +43992,7 @@ fail:
 
 SWIGINTERN PyObject *CvAttrList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvAttrList, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -43659,13 +44001,13 @@ SWIGINTERN PyObject *_wrap_cvAttrList__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   char **arg1 = (char **) 0 ;
   CvAttrList *arg2 = (CvAttrList *) 0 ;
-  CvAttrList result;
   void *vptr1 ;
   char *buffer1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvAttrList result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvAttrList",&obj0,&obj1)) SWIG_fail;
   {
@@ -43699,10 +44041,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvAttrList__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char **arg1 = (char **) 0 ;
-  CvAttrList result;
   void *vptr1 ;
   char *buffer1 ;
   PyObject * obj0 = 0 ;
+  CvAttrList result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvAttrList",&obj0)) SWIG_fail;
   {
@@ -43755,7 +44097,7 @@ SWIGINTERN PyObject *_wrap_cvAttrList(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -43787,7 +44129,11 @@ SWIGINTERN PyObject *_wrap_cvAttrList(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvAttrList'.\n  Possible C/C++ prototypes are:\n    cvAttrList(char const **,CvAttrList *)\n    cvAttrList(char const **)\n    cvAttrList()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvAttrList'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvAttrList(char const **,CvAttrList *)\n"
+    "    cvAttrList(char const **)\n"
+    "    cvAttrList()\n");
   return NULL;
 }
 
@@ -43815,7 +44161,6 @@ SWIGINTERN PyObject *_wrap_CvString_len_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->len = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43826,10 +44171,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvString_len_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvString *arg1 = (CvString *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvString_len_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvString, 0 |  0 );
@@ -43887,10 +44232,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvString_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvString *arg1 = (CvString *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvString_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvString, 0 |  0 );
@@ -43942,7 +44287,7 @@ SWIGINTERN PyObject *_wrap_delete_CvString(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = reinterpret_cast< CvString * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -43958,7 +44303,7 @@ fail:
 
 SWIGINTERN PyObject *CvString_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvString, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -43986,7 +44331,6 @@ SWIGINTERN PyObject *_wrap_CvStringHashNode_hashval_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< unsigned int >(val2);
   if (arg1) (arg1)->hashval = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43997,10 +44341,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStringHashNode_hashval_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStringHashNode *arg1 = (CvStringHashNode *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  unsigned int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStringHashNode_hashval_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStringHashNode, 0 |  0 );
@@ -44039,7 +44383,6 @@ SWIGINTERN PyObject *_wrap_CvStringHashNode_str_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< CvString * >(argp2);
   if (arg1) (arg1)->str = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44050,10 +44393,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStringHashNode_str_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStringHashNode *arg1 = (CvStringHashNode *) 0 ;
-  CvString *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvString *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStringHashNode_str_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStringHashNode, 0 |  0 );
@@ -44092,7 +44435,6 @@ SWIGINTERN PyObject *_wrap_CvStringHashNode_next_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvStringHashNode * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44103,10 +44445,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStringHashNode_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStringHashNode *arg1 = (CvStringHashNode *) 0 ;
-  CvStringHashNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvStringHashNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStringHashNode_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStringHashNode, 0 |  0 );
@@ -44158,7 +44500,7 @@ SWIGINTERN PyObject *_wrap_delete_CvStringHashNode(PyObject *SWIGUNUSEDPARM(self
   arg1 = reinterpret_cast< CvStringHashNode * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -44174,7 +44516,7 @@ fail:
 
 SWIGINTERN PyObject *CvStringHashNode_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvStringHashNode, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -44202,7 +44544,6 @@ SWIGINTERN PyObject *_wrap_CvFileNode_tag_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->tag = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44213,10 +44554,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFileNode_tag_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode *arg1 = (CvFileNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFileNode_tag_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode, 0 |  0 );
@@ -44255,7 +44596,6 @@ SWIGINTERN PyObject *_wrap_CvFileNode_info_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvTypeInfo * >(argp2);
   if (arg1) (arg1)->info = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44266,10 +44606,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFileNode_info_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode *arg1 = (CvFileNode *) 0 ;
-  CvTypeInfo *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTypeInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFileNode_info_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode, 0 |  0 );
@@ -44288,10 +44628,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFileNode_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode *arg1 = (CvFileNode *) 0 ;
-  CvFileNode_data *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvFileNode_data *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFileNode_data_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode, 0 |  0 );
@@ -44343,7 +44683,7 @@ SWIGINTERN PyObject *_wrap_delete_CvFileNode(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvFileNode * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -44359,7 +44699,7 @@ fail:
 
 SWIGINTERN PyObject *CvFileNode_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvFileNode, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -44387,7 +44727,6 @@ SWIGINTERN PyObject *_wrap_CvFileNode_data_f_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->f = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44398,10 +44737,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFileNode_data_f_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode_data *arg1 = (CvFileNode_data *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFileNode_data_f_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode_data, 0 |  0 );
@@ -44440,7 +44779,6 @@ SWIGINTERN PyObject *_wrap_CvFileNode_data_i_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->i = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44451,10 +44789,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFileNode_data_i_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode_data *arg1 = (CvFileNode_data *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFileNode_data_i_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode_data, 0 |  0 );
@@ -44493,7 +44831,6 @@ SWIGINTERN PyObject *_wrap_CvFileNode_data_str_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvString * >(argp2);
   if (arg1) (arg1)->str = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44504,10 +44841,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFileNode_data_str_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode_data *arg1 = (CvFileNode_data *) 0 ;
-  CvString *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvString *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFileNode_data_str_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode_data, 0 |  0 );
@@ -44554,7 +44891,6 @@ SWIGINTERN PyObject *_wrap_CvFileNode_data_seq_set(PyObject *SWIGUNUSEDPARM(self
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->seq = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44565,10 +44901,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFileNode_data_seq_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode_data *arg1 = (CvFileNode_data *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFileNode_data_seq_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode_data, 0 |  0 );
@@ -44607,7 +44943,6 @@ SWIGINTERN PyObject *_wrap_CvFileNode_data_map_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvFileNodeHash * >(argp2);
   if (arg1) (arg1)->map = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44618,10 +44953,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFileNode_data_map_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode_data *arg1 = (CvFileNode_data *) 0 ;
-  CvFileNodeHash *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvFileNodeHash *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFileNode_data_map_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode_data, 0 |  0 );
@@ -44673,7 +45008,7 @@ SWIGINTERN PyObject *_wrap_delete_CvFileNode_data(PyObject *SWIGUNUSEDPARM(self)
   arg1 = reinterpret_cast< CvFileNode_data * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -44689,7 +45024,7 @@ fail:
 
 SWIGINTERN PyObject *CvFileNode_data_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvFileNode_data, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -44717,7 +45052,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_flags_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44728,10 +45062,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -44770,7 +45104,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_header_size_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44781,10 +45114,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_header_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -44823,7 +45156,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_prev_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvTypeInfo * >(argp2);
   if (arg1) (arg1)->prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44834,10 +45166,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  CvTypeInfo *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTypeInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -44876,7 +45208,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_next_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvTypeInfo * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44887,10 +45218,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  CvTypeInfo *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTypeInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -44947,10 +45278,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_type_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_type_name_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -44988,7 +45319,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_is_instance_set(PyObject *SWIGUNUSEDPARM(s
     }
   }
   if (arg1) (arg1)->is_instance = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -44999,10 +45329,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_is_instance_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  CvIsInstanceFunc result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvIsInstanceFunc result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_is_instance_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -45040,7 +45370,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_release_set(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   if (arg1) (arg1)->release = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45051,10 +45380,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_release_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  CvReleaseFunc result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvReleaseFunc result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_release_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -45092,7 +45421,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_read_set(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   if (arg1) (arg1)->read = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45103,10 +45431,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_read_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  CvReadFunc result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvReadFunc result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_read_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -45144,7 +45472,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_write_set(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   if (arg1) (arg1)->write = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45155,10 +45482,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_write_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  CvWriteFunc result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvWriteFunc result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_write_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -45196,7 +45523,6 @@ SWIGINTERN PyObject *_wrap_CvTypeInfo_clone_set(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   if (arg1) (arg1)->clone = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45207,10 +45533,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTypeInfo_clone_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTypeInfo *arg1 = (CvTypeInfo *) 0 ;
-  CvCloneFunc result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvCloneFunc result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTypeInfo_clone_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypeInfo, 0 |  0 );
@@ -45262,7 +45588,7 @@ SWIGINTERN PyObject *_wrap_delete_CvTypeInfo(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvTypeInfo * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -45278,7 +45604,7 @@ fail:
 
 SWIGINTERN PyObject *CvTypeInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvTypeInfo, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -45308,7 +45634,6 @@ SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_func_addr_set(PyObject *SWIGUNUSEDPA
     arg2=&buffer2;
   }
   if (arg1) (arg1)->func_addr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45319,10 +45644,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_func_addr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPluginFuncInfo *arg1 = (CvPluginFuncInfo *) 0 ;
-  void **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  void **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPluginFuncInfo_func_addr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPluginFuncInfo, 0 |  0 );
@@ -45359,7 +45684,6 @@ SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_default_func_addr_set(PyObject *SWIG
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvPluginFuncInfo_default_func_addr_set" "', argument " "2"" of type '" "void *""'"); 
   }
   if (arg1) (arg1)->default_func_addr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45370,10 +45694,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_default_func_addr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPluginFuncInfo *arg1 = (CvPluginFuncInfo *) 0 ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPluginFuncInfo_default_func_addr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPluginFuncInfo, 0 |  0 );
@@ -45430,10 +45754,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_func_names_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPluginFuncInfo *arg1 = (CvPluginFuncInfo *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPluginFuncInfo_func_names_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPluginFuncInfo, 0 |  0 );
@@ -45472,7 +45796,6 @@ SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_search_modules_set(PyObject *SWIGUNU
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->search_modules = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45483,10 +45806,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_search_modules_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPluginFuncInfo *arg1 = (CvPluginFuncInfo *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPluginFuncInfo_search_modules_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPluginFuncInfo, 0 |  0 );
@@ -45525,7 +45848,6 @@ SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_loaded_from_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->loaded_from = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45536,10 +45858,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPluginFuncInfo_loaded_from_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPluginFuncInfo *arg1 = (CvPluginFuncInfo *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPluginFuncInfo_loaded_from_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPluginFuncInfo, 0 |  0 );
@@ -45591,7 +45913,7 @@ SWIGINTERN PyObject *_wrap_delete_CvPluginFuncInfo(PyObject *SWIGUNUSEDPARM(self
   arg1 = reinterpret_cast< CvPluginFuncInfo * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -45607,7 +45929,7 @@ fail:
 
 SWIGINTERN PyObject *CvPluginFuncInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvPluginFuncInfo, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -45635,7 +45957,6 @@ SWIGINTERN PyObject *_wrap_CvModuleInfo_next_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvModuleInfo * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45646,10 +45967,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvModuleInfo_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvModuleInfo *arg1 = (CvModuleInfo *) 0 ;
-  CvModuleInfo *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvModuleInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvModuleInfo_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvModuleInfo, 0 |  0 );
@@ -45706,10 +46027,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvModuleInfo_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvModuleInfo *arg1 = (CvModuleInfo *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvModuleInfo_name_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvModuleInfo, 0 |  0 );
@@ -45766,10 +46087,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvModuleInfo_version_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvModuleInfo *arg1 = (CvModuleInfo *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvModuleInfo_version_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvModuleInfo, 0 |  0 );
@@ -45808,7 +46129,6 @@ SWIGINTERN PyObject *_wrap_CvModuleInfo_func_tab_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvPluginFuncInfo * >(argp2);
   if (arg1) (arg1)->func_tab = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45819,10 +46139,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvModuleInfo_func_tab_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvModuleInfo *arg1 = (CvModuleInfo *) 0 ;
-  CvPluginFuncInfo *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPluginFuncInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvModuleInfo_func_tab_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvModuleInfo, 0 |  0 );
@@ -45874,7 +46194,7 @@ SWIGINTERN PyObject *_wrap_delete_CvModuleInfo(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvModuleInfo * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -45890,7 +46210,7 @@ fail:
 
 SWIGINTERN PyObject *CvModuleInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvModuleInfo, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -45898,10 +46218,10 @@ SWIGINTERN PyObject *CvModuleInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), P
 SWIGINTERN PyObject *_wrap_cvAlloc(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   size_t arg1 ;
-  void *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvAlloc",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
@@ -45989,7 +46309,6 @@ SWIGINTERN PyObject *_wrap_cvCreateMatHeader(PyObject *SWIGUNUSEDPARM(self), PyO
   int arg1 ;
   int arg2 ;
   int arg3 ;
-  CvMat *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -45999,6 +46318,7 @@ SWIGINTERN PyObject *_wrap_cvCreateMatHeader(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvCreateMatHeader",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -46040,7 +46360,6 @@ SWIGINTERN PyObject *_wrap_cvInitMatHeader(PyObject *SWIGUNUSEDPARM(self), PyObj
   int arg4 ;
   void *arg5 = (void *) NULL ;
   int arg6 = (int) 0x7fffffff ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -46057,6 +46376,7 @@ SWIGINTERN PyObject *_wrap_cvInitMatHeader(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:cvInitMatHeader",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -46123,7 +46443,6 @@ SWIGINTERN PyObject *_wrap_cvCreateMat(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg1 ;
   int arg2 ;
   int arg3 ;
-  CvMat *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -46133,6 +46452,7 @@ SWIGINTERN PyObject *_wrap_cvCreateMat(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvCreateMat",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -46209,9 +46529,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvIncRefData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvIncRefData",&obj0)) SWIG_fail;
   {
@@ -46250,9 +46570,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCloneMat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCloneMat",&obj0)) SWIG_fail;
   {
@@ -46291,13 +46611,13 @@ SWIGINTERN PyObject *_wrap_cvGetSubRect(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvArr *arg1 = (CvArr *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvRect arg3 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   CvMat *header2 ;
   bool freearg2 = false ;
   CvRect temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   {
     header2 = (CvMat *)cvAlloc(sizeof(CvMat));
@@ -46382,7 +46702,6 @@ SWIGINTERN PyObject *_wrap_cvGetRows(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   int arg3 ;
   int arg4 ;
   int arg5 = (int) 1 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   CvMat *header2 ;
   bool freearg2 = false ;
@@ -46396,6 +46715,7 @@ SWIGINTERN PyObject *_wrap_cvGetRows(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvMat *result = 0 ;
   
   {
     header2 = (CvMat *)cvAlloc(sizeof(CvMat));
@@ -46474,7 +46794,6 @@ SWIGINTERN PyObject *_wrap_cvGetRow(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   CvArr *arg1 = (CvArr *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   CvMat *header2 ;
   bool freearg2 = false ;
@@ -46482,6 +46801,7 @@ SWIGINTERN PyObject *_wrap_cvGetRow(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   {
     header2 = (CvMat *)cvAlloc(sizeof(CvMat));
@@ -46549,7 +46869,6 @@ SWIGINTERN PyObject *_wrap_cvGetCols(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   int arg4 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   CvMat *header2 ;
   bool freearg2 = false ;
@@ -46560,6 +46879,7 @@ SWIGINTERN PyObject *_wrap_cvGetCols(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   {
     header2 = (CvMat *)cvAlloc(sizeof(CvMat));
@@ -46631,7 +46951,6 @@ SWIGINTERN PyObject *_wrap_cvGetCol(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   CvArr *arg1 = (CvArr *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   CvMat *header2 ;
   bool freearg2 = false ;
@@ -46639,6 +46958,7 @@ SWIGINTERN PyObject *_wrap_cvGetCol(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   {
     header2 = (CvMat *)cvAlloc(sizeof(CvMat));
@@ -46705,7 +47025,6 @@ SWIGINTERN PyObject *_wrap_cvGetDiag(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   CvArr *arg1 = (CvArr *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 = (int) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   CvMat *header2 ;
   bool freearg2 = false ;
@@ -46713,6 +47032,7 @@ SWIGINTERN PyObject *_wrap_cvGetDiag(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   {
     header2 = (CvMat *)cvAlloc(sizeof(CvMat));
@@ -46882,11 +47202,11 @@ SWIGINTERN PyObject *_wrap_cvCreateMatNDHeader(PyObject *SWIGUNUSEDPARM(self), P
   int arg1 ;
   int *arg2 = (int *) 0 ;
   int arg3 ;
-  CvMatND *result = 0 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMatND *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvCreateMatNDHeader",&obj0,&obj1)) SWIG_fail;
   {
@@ -46930,11 +47250,11 @@ SWIGINTERN PyObject *_wrap_cvCreateMatND(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int arg1 ;
   int *arg2 = (int *) 0 ;
   int arg3 ;
-  CvMatND *result = 0 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMatND *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvCreateMatND",&obj0,&obj1)) SWIG_fail;
   {
@@ -46980,7 +47300,6 @@ SWIGINTERN PyObject *_wrap_cvInitMatNDHeader(PyObject *SWIGUNUSEDPARM(self), PyO
   int *arg3 = (int *) 0 ;
   int arg4 ;
   void *arg5 = (void *) NULL ;
-  CvMatND *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val4 ;
@@ -46990,6 +47309,7 @@ SWIGINTERN PyObject *_wrap_cvInitMatNDHeader(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvMatND *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvInitMatNDHeader",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND, 0 |  0 );
@@ -47042,10 +47362,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCloneMatND(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatND *arg1 = (CvMatND *) 0 ;
-  CvMatND *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMatND *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCloneMatND",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatND, 0 |  0 );
@@ -47074,11 +47394,11 @@ SWIGINTERN PyObject *_wrap_cvCreateSparseMat(PyObject *SWIGUNUSEDPARM(self), PyO
   int arg1 ;
   int *arg2 = (int *) 0 ;
   int arg3 ;
-  CvSparseMat *result = 0 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSparseMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvCreateSparseMat",&obj0,&obj1)) SWIG_fail;
   {
@@ -47120,10 +47440,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCloneSparseMat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
-  CvSparseMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSparseMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCloneSparseMat",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -47151,13 +47471,13 @@ SWIGINTERN PyObject *_wrap_cvInitSparseMatIterator(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   CvSparseMat *arg1 = (CvSparseMat *) 0 ;
   CvSparseMatIterator *arg2 = (CvSparseMatIterator *) 0 ;
-  CvSparseNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSparseNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvInitSparseMatIterator",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMat, 0 |  0 );
@@ -47189,10 +47509,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGetNextSparseNode(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSparseMatIterator *arg1 = (CvSparseMatIterator *) 0 ;
-  CvSparseNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSparseNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetNextSparseNode",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSparseMatIterator, 0 |  0 );
@@ -47239,7 +47559,6 @@ SWIGINTERN PyObject *_wrap_CvNArrayIterator_count_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -47250,10 +47569,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvNArrayIterator_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvNArrayIterator *arg1 = (CvNArrayIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvNArrayIterator_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNArrayIterator, 0 |  0 );
@@ -47292,7 +47611,6 @@ SWIGINTERN PyObject *_wrap_CvNArrayIterator_dims_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->dims = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -47303,10 +47621,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvNArrayIterator_dims_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvNArrayIterator *arg1 = (CvNArrayIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvNArrayIterator_dims_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNArrayIterator, 0 |  0 );
@@ -47345,7 +47663,6 @@ SWIGINTERN PyObject *_wrap_CvNArrayIterator_size_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvSize * >(argp2);
   if (arg1) (arg1)->size = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -47356,10 +47673,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvNArrayIterator_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvNArrayIterator *arg1 = (CvNArrayIterator *) 0 ;
-  CvSize *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSize *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvNArrayIterator_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNArrayIterator, 0 |  0 );
@@ -47415,10 +47732,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvNArrayIterator_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvNArrayIterator *arg1 = (CvNArrayIterator *) 0 ;
-  uchar **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvNArrayIterator_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNArrayIterator, 0 |  0 );
@@ -47474,10 +47791,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvNArrayIterator_stack_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvNArrayIterator *arg1 = (CvNArrayIterator *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvNArrayIterator_stack_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNArrayIterator, 0 |  0 );
@@ -47533,10 +47850,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvNArrayIterator_hdr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvNArrayIterator *arg1 = (CvNArrayIterator *) 0 ;
-  CvMatND **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMatND **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvNArrayIterator_hdr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNArrayIterator, 0 |  0 );
@@ -47588,7 +47905,7 @@ SWIGINTERN PyObject *_wrap_delete_CvNArrayIterator(PyObject *SWIGUNUSEDPARM(self
   arg1 = reinterpret_cast< CvNArrayIterator * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -47604,7 +47921,7 @@ fail:
 
 SWIGINTERN PyObject *CvNArrayIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvNArrayIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -47617,7 +47934,6 @@ SWIGINTERN PyObject *_wrap_cvInitNArrayIterator(PyObject *SWIGUNUSEDPARM(self),
   CvMatND *arg4 = (CvMatND *) 0 ;
   CvNArrayIterator *arg5 = (CvNArrayIterator *) 0 ;
   int arg6 = (int) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   void *vptr2 ;
@@ -47635,6 +47951,7 @@ SWIGINTERN PyObject *_wrap_cvInitNArrayIterator(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:cvInitNArrayIterator",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -47702,10 +48019,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvNextNArraySlice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvNArrayIterator *arg1 = (CvNArrayIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvNextNArraySlice",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNArrayIterator, 0 |  0 );
@@ -47732,9 +48049,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGetElemType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetElemType",&obj0)) SWIG_fail;
   {
@@ -47774,10 +48091,10 @@ SWIGINTERN PyObject *_wrap_cvGetDims(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   int *arg2 = (int *) NULL ;
-  int result;
   void *myarr1 ;
   int mysizes1[CV_MAX_DIM] ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetDims",&obj0)) SWIG_fail;
   {
@@ -47811,12 +48128,12 @@ SWIGINTERN PyObject *_wrap_cvGetDimSize(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 ;
-  int result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGetDimSize",&obj0,&obj1)) SWIG_fail;
   {
@@ -47862,7 +48179,6 @@ SWIGINTERN PyObject *_wrap_cvPtr1D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 ;
   int *arg3 = (int *) NULL ;
-  uchar *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -47871,6 +48187,7 @@ SWIGINTERN PyObject *_wrap_cvPtr1D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvPtr1D",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -47924,7 +48241,6 @@ SWIGINTERN PyObject *_wrap_cvPtr2D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   int arg2 ;
   int arg3 ;
   int *arg4 = (int *) NULL ;
-  uchar *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -47936,6 +48252,7 @@ SWIGINTERN PyObject *_wrap_cvPtr2D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvPtr2D",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -47995,7 +48312,6 @@ SWIGINTERN PyObject *_wrap_cvPtr3D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   int arg3 ;
   int arg4 ;
   int *arg5 = (int *) NULL ;
-  uchar *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -48010,6 +48326,7 @@ SWIGINTERN PyObject *_wrap_cvPtr3D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:cvPtr3D",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -48074,7 +48391,6 @@ SWIGINTERN PyObject *_wrap_cvPtrND(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   int *arg3 = (int *) NULL ;
   int arg4 = (int) 1 ;
   unsigned int *arg5 = (unsigned int *) NULL ;
-  uchar *result = 0 ;
   bool freearg1 = false ;
   void *argp3 = 0 ;
   int res3 = 0 ;
@@ -48087,6 +48403,7 @@ SWIGINTERN PyObject *_wrap_cvPtrND(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OOO:cvPtrND",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -48163,12 +48480,12 @@ SWIGINTERN PyObject *_wrap_cvGet1D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 ;
-  CvScalar result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGet1D",&obj0,&obj1)) SWIG_fail;
   {
@@ -48214,7 +48531,6 @@ SWIGINTERN PyObject *_wrap_cvGet2D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 ;
   int arg3 ;
-  CvScalar result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -48223,6 +48539,7 @@ SWIGINTERN PyObject *_wrap_cvGet2D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvGet2D",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -48274,7 +48591,6 @@ SWIGINTERN PyObject *_wrap_cvGet3D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   int arg2 ;
   int arg3 ;
   int arg4 ;
-  CvScalar result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -48286,6 +48602,7 @@ SWIGINTERN PyObject *_wrap_cvGet3D(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvGet3D",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -48340,10 +48657,10 @@ SWIGINTERN PyObject *_wrap_cvGetND(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   int *arg2 = (int *) 0 ;
-  CvScalar result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGetND",&obj0,&obj1)) SWIG_fail;
   {
@@ -48399,12 +48716,12 @@ SWIGINTERN PyObject *_wrap_cvGetReal1D(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 ;
-  double result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGetReal1D",&obj0,&obj1)) SWIG_fail;
   {
@@ -48450,7 +48767,6 @@ SWIGINTERN PyObject *_wrap_cvGetReal2D(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 ;
   int arg3 ;
-  double result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -48459,6 +48775,7 @@ SWIGINTERN PyObject *_wrap_cvGetReal2D(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvGetReal2D",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -48510,7 +48827,6 @@ SWIGINTERN PyObject *_wrap_cvGetReal3D(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg2 ;
   int arg3 ;
   int arg4 ;
-  double result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -48522,6 +48838,7 @@ SWIGINTERN PyObject *_wrap_cvGetReal3D(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvGetReal3D",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -48576,10 +48893,10 @@ SWIGINTERN PyObject *_wrap_cvGetRealND(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   int *arg2 = (int *) 0 ;
-  double result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGetRealND",&obj0,&obj1)) SWIG_fail;
   {
@@ -49215,7 +49532,6 @@ SWIGINTERN PyObject *_wrap_cvGetMat(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   CvMat *arg2 = (CvMat *) 0 ;
   int *arg3 = (int *) NULL ;
   int arg4 = (int) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   CvMat *header2 ;
   bool freearg2 = false ;
@@ -49226,6 +49542,7 @@ SWIGINTERN PyObject *_wrap_cvGetMat(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   {
     header2 = (CvMat *)cvAlloc(sizeof(CvMat));
@@ -49304,7 +49621,6 @@ SWIGINTERN PyObject *_wrap_cvReshapeMatND(PyObject *SWIGUNUSEDPARM(self), PyObje
   int arg4 ;
   int arg5 ;
   int *arg6 = (int *) 0 ;
-  CvArr *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -49321,6 +49637,7 @@ SWIGINTERN PyObject *_wrap_cvReshapeMatND(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvArr *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:cvReshapeMatND",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -49399,7 +49716,6 @@ SWIGINTERN PyObject *_wrap_cvReshape(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   int arg4 = (int) 0 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   CvMat *header2 ;
   bool freearg2 = false ;
@@ -49410,6 +49726,7 @@ SWIGINTERN PyObject *_wrap_cvReshape(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   {
     header2 = (CvMat *)cvAlloc(sizeof(CvMat));
@@ -49748,9 +50065,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  CvSize result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvSize result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetSize",&obj0)) SWIG_fail;
   {
@@ -50462,7 +50779,6 @@ SWIGINTERN PyObject *_wrap_cvCheckTermCriteria(PyObject *SWIGUNUSEDPARM(self), P
   CvTermCriteria arg1 ;
   double arg2 ;
   int arg3 ;
-  CvTermCriteria result;
   CvTermCriteria temp1 ;
   double val2 ;
   int ecode2 = 0 ;
@@ -50471,6 +50787,7 @@ SWIGINTERN PyObject *_wrap_cvCheckTermCriteria(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvTermCriteria result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvCheckTermCriteria",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -51363,11 +51680,11 @@ SWIGINTERN PyObject *_wrap_cvDotProduct(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
-  double result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvDotProduct",&obj0,&obj1)) SWIG_fail;
   {
@@ -53244,13 +53561,13 @@ SWIGINTERN PyObject *_wrap_cvFastArctan(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   float arg1 ;
   float arg2 ;
-  float result;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvFastArctan",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
@@ -53282,10 +53599,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCbrt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   float arg1 ;
-  float result;
   float val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCbrt",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
@@ -53315,7 +53632,6 @@ SWIGINTERN PyObject *_wrap_cvCheckArr(PyObject *SWIGUNUSEDPARM(self), PyObject *
   int arg2 = (int) 0 ;
   double arg3 = (double) 0 ;
   double arg4 = (double) 0 ;
-  int result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -53327,6 +53643,7 @@ SWIGINTERN PyObject *_wrap_cvCheckArr(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OOO:cvCheckArr",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -53616,9 +53933,9 @@ SWIGINTERN PyObject *_wrap_cvSolveCubic(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvSolveCubic",&obj0)) SWIG_fail;
   {
@@ -54649,7 +54966,6 @@ SWIGINTERN PyObject *_wrap_cvInvert(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   CvArr *arg1 = (CvArr *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   int arg3 = (int) 0 ;
-  double result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   int val3 ;
@@ -54657,6 +54973,7 @@ SWIGINTERN PyObject *_wrap_cvInvert(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvInvert",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -54722,7 +55039,6 @@ SWIGINTERN PyObject *_wrap_cvSolve(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   CvArr *arg2 = (CvArr *) 0 ;
   CvArr *arg3 = (CvArr *) 0 ;
   int arg4 = (int) 0 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -54732,6 +55048,7 @@ SWIGINTERN PyObject *_wrap_cvSolve(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvSolve",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -54811,9 +55128,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvDet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  double result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvDet",&obj0)) SWIG_fail;
   {
@@ -54852,9 +55169,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvTrace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  CvScalar result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvTrace",&obj0)) SWIG_fail;
   {
@@ -55033,7 +55350,6 @@ SWIGINTERN PyObject *_wrap_cvRange(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   CvArr *arg1 = (CvArr *) 0 ;
   double arg2 ;
   double arg3 ;
-  CvArr *result = 0 ;
   bool freearg1 = false ;
   double val2 ;
   int ecode2 = 0 ;
@@ -55042,6 +55358,7 @@ SWIGINTERN PyObject *_wrap_cvRange(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvArr *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvRange",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -55560,13 +55877,13 @@ SWIGINTERN PyObject *_wrap_cvMahalanobis(PyObject *SWIGUNUSEDPARM(self), PyObjec
   CvArr *arg1 = (CvArr *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   CvArr *arg3 = (CvArr *) 0 ;
-  double result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvMahalanobis",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -55639,9 +55956,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSum(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  CvScalar result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvSum",&obj0)) SWIG_fail;
   {
@@ -55680,9 +55997,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCountNonZero(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCountNonZero",&obj0)) SWIG_fail;
   {
@@ -55722,11 +56039,11 @@ SWIGINTERN PyObject *_wrap_cvAvg(PyObject *SWIGUNUSEDPARM(self), PyObject *args)
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   CvArr *arg2 = (CvArr *) NULL ;
-  CvScalar result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvAvg",&obj0,&obj1)) SWIG_fail;
   {
@@ -55965,7 +56282,6 @@ SWIGINTERN PyObject *_wrap_cvNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   CvArr *arg2 = (CvArr *) NULL ;
   int arg3 = (int) 4 ;
   CvArr *arg4 = (CvArr *) NULL ;
-  double result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   int val3 ;
@@ -55975,6 +56291,7 @@ SWIGINTERN PyObject *_wrap_cvNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OOO:cvNorm",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -56424,10 +56741,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGetOptimalDFTSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetOptimalDFTSize",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -56524,11 +56841,11 @@ SWIGINTERN PyObject *_wrap_cvSliceLength(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvSlice arg1 ;
   CvSeq *arg2 = (CvSeq *) 0 ;
-  int result;
   CvSlice temp1 ;
   void *ptr2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvSliceLength",&obj0,&obj1)) SWIG_fail;
   {
@@ -56585,10 +56902,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCreateMemStorage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 = (int) 0 ;
-  CvMemStorage *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"|O:cvCreateMemStorage",&obj0)) SWIG_fail;
   if (obj0) {
@@ -56617,10 +56934,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCreateChildMemStorage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCreateChildMemStorage",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -56753,13 +57070,13 @@ SWIGINTERN PyObject *_wrap_cvMemStorageAlloc(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
   size_t arg2 ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvMemStorageAlloc",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -56793,7 +57110,6 @@ SWIGINTERN PyObject *_wrap_cvMemStorageAllocString(PyObject *SWIGUNUSEDPARM(self
   CvMemStorage *arg1 = (CvMemStorage *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 = (int) -1 ;
-  CvString result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -56804,6 +57120,7 @@ SWIGINTERN PyObject *_wrap_cvMemStorageAllocString(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvString result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvMemStorageAllocString",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMemStorage, 0 |  0 );
@@ -56847,7 +57164,6 @@ SWIGINTERN PyObject *_wrap_cvCreateSeq(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg2 ;
   int arg3 ;
   CvMemStorage *arg4 = (CvMemStorage *) 0 ;
-  CvSeq *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -56860,6 +57176,7 @@ SWIGINTERN PyObject *_wrap_cvCreateSeq(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvCreateSeq",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -56948,11 +57265,11 @@ SWIGINTERN PyObject *_wrap_cvSeqPush(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
   void *arg2 = (void *) NULL ;
-  schar *result = 0 ;
   void *ptr1 ;
   int res2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvSeqPush",&obj0,&obj1)) SWIG_fail;
   {
@@ -56972,12 +57289,12 @@ SWIGINTERN PyObject *_wrap_cvSeqPush(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   if (obj1) {
     res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPush" "', argument " "2"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPush" "', argument " "2"" of type '" "void const *""'"); 
     }
   }
   {
     try {
-      result = (schar *)cvSeqPush(arg1,arg2); 
+      result = (schar *)cvSeqPush(arg1,(void const *)arg2); 
     } 
     catch (...) 
     {
@@ -56995,11 +57312,11 @@ SWIGINTERN PyObject *_wrap_cvSeqPushFront(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
   void *arg2 = (void *) NULL ;
-  schar *result = 0 ;
   void *ptr1 ;
   int res2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvSeqPushFront",&obj0,&obj1)) SWIG_fail;
   {
@@ -57019,12 +57336,12 @@ SWIGINTERN PyObject *_wrap_cvSeqPushFront(PyObject *SWIGUNUSEDPARM(self), PyObje
   if (obj1) {
     res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPushFront" "', argument " "2"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPushFront" "', argument " "2"" of type '" "void const *""'"); 
     }
   }
   {
     try {
-      result = (schar *)cvSeqPushFront(arg1,arg2); 
+      result = (schar *)cvSeqPushFront(arg1,(void const *)arg2); 
     } 
     catch (...) 
     {
@@ -57164,7 +57481,7 @@ SWIGINTERN PyObject *_wrap_cvSeqPushMulti(PyObject *SWIGUNUSEDPARM(self), PyObje
   }
   res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPushMulti" "', argument " "2"" of type '" "void *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPushMulti" "', argument " "2"" of type '" "void const *""'"); 
   }
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
@@ -57180,7 +57497,7 @@ SWIGINTERN PyObject *_wrap_cvSeqPushMulti(PyObject *SWIGUNUSEDPARM(self), PyObje
   }
   {
     try {
-      cvSeqPushMulti(arg1,arg2,arg3,arg4); 
+      cvSeqPushMulti(arg1,(void const *)arg2,arg3,arg4); 
     } 
     catch (...) 
     {
@@ -57228,7 +57545,7 @@ SWIGINTERN PyObject *_wrap_cvSeqPopMulti(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPopMulti" "', argument " "2"" of type '" "void *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvSeqPopMulti" "', argument " "2"" of type '" "void const *""'"); 
   }
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
@@ -57244,7 +57561,7 @@ SWIGINTERN PyObject *_wrap_cvSeqPopMulti(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   {
     try {
-      cvSeqPopMulti(arg1,arg2,arg3,arg4); 
+      cvSeqPopMulti(arg1,(void const *)arg2,arg3,arg4); 
     } 
     catch (...) 
     {
@@ -57263,7 +57580,6 @@ SWIGINTERN PyObject *_wrap_cvSeqInsert(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvSeq *arg1 = (CvSeq *) 0 ;
   int arg2 ;
   void *arg3 = (void *) NULL ;
-  schar *result = 0 ;
   void *ptr1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -57271,6 +57587,7 @@ SWIGINTERN PyObject *_wrap_cvSeqInsert(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvSeqInsert",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -57295,12 +57612,12 @@ SWIGINTERN PyObject *_wrap_cvSeqInsert(PyObject *SWIGUNUSEDPARM(self), PyObject
   if (obj2) {
     res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0);
     if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvSeqInsert" "', argument " "3"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "cvSeqInsert" "', argument " "3"" of type '" "void const *""'"); 
     }
   }
   {
     try {
-      result = (schar *)cvSeqInsert(arg1,arg2,arg3); 
+      result = (schar *)cvSeqInsert(arg1,arg2,(void const *)arg3); 
     } 
     catch (...) 
     {
@@ -57401,12 +57718,12 @@ SWIGINTERN PyObject *_wrap_cvGetSeqElem(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
   int arg2 ;
-  schar *result = 0 ;
   void *ptr1 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGetSeqElem",&obj0,&obj1)) SWIG_fail;
   {
@@ -57449,7 +57766,6 @@ SWIGINTERN PyObject *_wrap_cvSeqElemIdx(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvSeq *arg1 = (CvSeq *) 0 ;
   void *arg2 = (void *) 0 ;
   CvSeqBlock **arg3 = (CvSeqBlock **) NULL ;
-  int result;
   void *ptr1 ;
   int res2 ;
   void *vptr3 ;
@@ -57457,6 +57773,7 @@ SWIGINTERN PyObject *_wrap_cvSeqElemIdx(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvSeqElemIdx",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -57616,10 +57933,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvEndWriteSeq(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqWriter *arg1 = (CvSeqWriter *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvEndWriteSeq",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqWriter, 0 |  0 );
@@ -57732,10 +58049,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGetSeqReaderPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeqReader *arg1 = (CvSeqReader *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetSeqReaderPos",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSeqReader, 0 |  0 );
@@ -57817,7 +58134,6 @@ SWIGINTERN PyObject *_wrap_cvMakeSeqHeaderForArray(PyObject *SWIGUNUSEDPARM(self
   int arg5 ;
   CvSeq *arg6 = (CvSeq *) 0 ;
   CvSeqBlock *arg7 = (CvSeqBlock *) 0 ;
-  CvSeq *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -57837,6 +58153,7 @@ SWIGINTERN PyObject *_wrap_cvMakeSeqHeaderForArray(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:cvMakeSeqHeaderForArray",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -57904,7 +58221,6 @@ SWIGINTERN PyObject *_wrap_cvSeqSlice(PyObject *SWIGUNUSEDPARM(self), PyObject *
   CvSlice arg2 ;
   CvMemStorage *arg3 = (CvMemStorage *) NULL ;
   int arg4 = (int) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   CvSlice temp2 ;
   void *argp3 = 0 ;
@@ -57915,6 +58231,7 @@ SWIGINTERN PyObject *_wrap_cvSeqSlice(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OO:cvSeqSlice",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -57986,12 +58303,12 @@ SWIGINTERN PyObject *_wrap_cvCloneSeq(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
   CvMemStorage *arg2 = (CvMemStorage *) NULL ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvCloneSeq",&obj0,&obj1)) SWIG_fail;
   {
@@ -58220,7 +58537,6 @@ SWIGINTERN PyObject *_wrap_cvSeqSearch(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg4 ;
   int *arg5 = (int *) 0 ;
   void *arg6 = (void *) NULL ;
-  schar *result = 0 ;
   void *ptr1 ;
   int res2 ;
   int val4 ;
@@ -58234,6 +58550,7 @@ SWIGINTERN PyObject *_wrap_cvSeqSearch(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:cvSeqSearch",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -58336,7 +58653,6 @@ SWIGINTERN PyObject *_wrap_cvSeqPartition(PyObject *SWIGUNUSEDPARM(self), PyObje
   CvSeq **arg3 = (CvSeq **) 0 ;
   CvCmpFunc arg4 = (CvCmpFunc) 0 ;
   void *arg5 = (void *) 0 ;
-  int result;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -58348,6 +58664,7 @@ SWIGINTERN PyObject *_wrap_cvSeqPartition(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvSeqPartition",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -58473,7 +58790,6 @@ SWIGINTERN PyObject *_wrap_cvCreateSet(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg2 ;
   int arg3 ;
   CvMemStorage *arg4 = (CvMemStorage *) 0 ;
-  CvSet *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -58486,6 +58802,7 @@ SWIGINTERN PyObject *_wrap_cvCreateSet(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvSet *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvCreateSet",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -58529,7 +58846,6 @@ SWIGINTERN PyObject *_wrap_cvSetAdd(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   CvSet *arg1 = (CvSet *) 0 ;
   CvSetElem *arg2 = (CvSetElem *) NULL ;
   CvSetElem **arg3 = (CvSetElem **) NULL ;
-  int result;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -58538,6 +58854,7 @@ SWIGINTERN PyObject *_wrap_cvSetAdd(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OO:cvSetAdd",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -58585,9 +58902,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSetNew(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
-  CvSetElem *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvSetElem *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvSetNew",&obj0)) SWIG_fail;
   {
@@ -58702,12 +59019,12 @@ SWIGINTERN PyObject *_wrap_cvGetSetElem(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvSet *arg1 = (CvSet *) 0 ;
   int arg2 ;
-  CvSetElem *result = 0 ;
   void *ptr1 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSetElem *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGetSetElem",&obj0,&obj1)) SWIG_fail;
   {
@@ -58781,7 +59098,6 @@ SWIGINTERN PyObject *_wrap_cvCreateGraph(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int arg3 ;
   int arg4 ;
   CvMemStorage *arg5 = (CvMemStorage *) 0 ;
-  CvGraph *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -58797,6 +59113,7 @@ SWIGINTERN PyObject *_wrap_cvCreateGraph(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvGraph *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvCreateGraph",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -58845,7 +59162,6 @@ SWIGINTERN PyObject *_wrap_cvGraphAddVtx(PyObject *SWIGUNUSEDPARM(self), PyObjec
   CvGraph *arg1 = (CvGraph *) 0 ;
   CvGraphVtx *arg2 = (CvGraphVtx *) NULL ;
   CvGraphVtx **arg3 = (CvGraphVtx **) NULL ;
-  int result;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -58854,6 +59170,7 @@ SWIGINTERN PyObject *_wrap_cvGraphAddVtx(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OO:cvGraphAddVtx",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -58901,12 +59218,12 @@ SWIGINTERN PyObject *_wrap_cvGraphRemoveVtx(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
   int arg2 ;
-  int result;
   void *ptr1 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGraphRemoveVtx",&obj0,&obj1)) SWIG_fail;
   {
@@ -58943,12 +59260,12 @@ SWIGINTERN PyObject *_wrap_cvGraphRemoveVtxByPtr(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
   CvGraphVtx *arg2 = (CvGraphVtx *) 0 ;
-  int result;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGraphRemoveVtxByPtr",&obj0,&obj1)) SWIG_fail;
   {
@@ -58988,7 +59305,6 @@ SWIGINTERN PyObject *_wrap_cvGraphAddEdge(PyObject *SWIGUNUSEDPARM(self), PyObje
   int arg3 ;
   CvGraphEdge *arg4 = (CvGraphEdge *) NULL ;
   CvGraphEdge **arg5 = (CvGraphEdge **) NULL ;
-  int result;
   void *ptr1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -59003,6 +59319,7 @@ SWIGINTERN PyObject *_wrap_cvGraphAddEdge(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:cvGraphAddEdge",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -59063,7 +59380,6 @@ SWIGINTERN PyObject *_wrap_cvGraphAddEdgeByPtr(PyObject *SWIGUNUSEDPARM(self), P
   CvGraphVtx *arg3 = (CvGraphVtx *) 0 ;
   CvGraphEdge *arg4 = (CvGraphEdge *) NULL ;
   CvGraphEdge **arg5 = (CvGraphEdge **) NULL ;
-  int result;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -59078,6 +59394,7 @@ SWIGINTERN PyObject *_wrap_cvGraphAddEdgeByPtr(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:cvGraphAddEdgeByPtr",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -59236,7 +59553,6 @@ SWIGINTERN PyObject *_wrap_cvFindGraphEdge(PyObject *SWIGUNUSEDPARM(self), PyObj
   CvGraph *arg1 = (CvGraph *) 0 ;
   int arg2 ;
   int arg3 ;
-  CvGraphEdge *result = 0 ;
   void *ptr1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -59245,6 +59561,7 @@ SWIGINTERN PyObject *_wrap_cvFindGraphEdge(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvGraphEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvFindGraphEdge",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -59287,7 +59604,6 @@ SWIGINTERN PyObject *_wrap_cvFindGraphEdgeByPtr(PyObject *SWIGUNUSEDPARM(self),
   CvGraph *arg1 = (CvGraph *) 0 ;
   CvGraphVtx *arg2 = (CvGraphVtx *) 0 ;
   CvGraphVtx *arg3 = (CvGraphVtx *) 0 ;
-  CvGraphEdge *result = 0 ;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -59296,6 +59612,7 @@ SWIGINTERN PyObject *_wrap_cvFindGraphEdgeByPtr(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvGraphEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvFindGraphEdgeByPtr",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -59369,12 +59686,12 @@ SWIGINTERN PyObject *_wrap_cvGraphVtxDegree(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
   int arg2 ;
-  int result;
   void *ptr1 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGraphVtxDegree",&obj0,&obj1)) SWIG_fail;
   {
@@ -59411,12 +59728,12 @@ SWIGINTERN PyObject *_wrap_cvGraphVtxDegreeByPtr(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
   CvGraphVtx *arg2 = (CvGraphVtx *) 0 ;
-  int result;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGraphVtxDegreeByPtr",&obj0,&obj1)) SWIG_fail;
   {
@@ -59472,7 +59789,6 @@ SWIGINTERN PyObject *_wrap_CvGraphScanner_vtx_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvGraphVtx * >(argp2);
   if (arg1) (arg1)->vtx = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -59483,10 +59799,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphScanner_vtx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphScanner *arg1 = (CvGraphScanner *) 0 ;
-  CvGraphVtx *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvGraphVtx *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphScanner_vtx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphScanner, 0 |  0 );
@@ -59525,7 +59841,6 @@ SWIGINTERN PyObject *_wrap_CvGraphScanner_dst_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvGraphVtx * >(argp2);
   if (arg1) (arg1)->dst = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -59536,10 +59851,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphScanner_dst_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphScanner *arg1 = (CvGraphScanner *) 0 ;
-  CvGraphVtx *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvGraphVtx *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphScanner_dst_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphScanner, 0 |  0 );
@@ -59578,7 +59893,6 @@ SWIGINTERN PyObject *_wrap_CvGraphScanner_edge_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvGraphEdge * >(argp2);
   if (arg1) (arg1)->edge = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -59589,10 +59903,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphScanner_edge_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphScanner *arg1 = (CvGraphScanner *) 0 ;
-  CvGraphEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvGraphEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphScanner_edge_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphScanner, 0 |  0 );
@@ -59634,7 +59948,6 @@ SWIGINTERN PyObject *_wrap_CvGraphScanner_graph_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = (CvGraph *)ptr2;
   }
   if (arg1) (arg1)->graph = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -59645,10 +59958,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphScanner_graph_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphScanner *arg1 = (CvGraphScanner *) 0 ;
-  CvGraph *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvGraph *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphScanner_graph_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphScanner, 0 |  0 );
@@ -59695,7 +60008,6 @@ SWIGINTERN PyObject *_wrap_CvGraphScanner_stack_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->stack = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -59706,10 +60018,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphScanner_stack_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphScanner *arg1 = (CvGraphScanner *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphScanner_stack_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphScanner, 0 |  0 );
@@ -59748,7 +60060,6 @@ SWIGINTERN PyObject *_wrap_CvGraphScanner_index_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->index = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -59759,10 +60070,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphScanner_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphScanner *arg1 = (CvGraphScanner *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphScanner_index_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphScanner, 0 |  0 );
@@ -59801,7 +60112,6 @@ SWIGINTERN PyObject *_wrap_CvGraphScanner_mask_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->mask = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -59812,10 +60122,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvGraphScanner_mask_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphScanner *arg1 = (CvGraphScanner *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvGraphScanner_mask_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphScanner, 0 |  0 );
@@ -59846,7 +60156,7 @@ SWIGINTERN PyObject *_wrap_delete_CvGraphScanner(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvGraphScanner * >(argp1);
   {
     try {
-      delete_CvGraphScanner(arg1);
+      delete_CvGraphScanner(arg1); 
     } 
     catch (...) 
     {
@@ -59862,7 +60172,7 @@ fail:
 
 SWIGINTERN PyObject *CvGraphScanner_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvGraphScanner, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -59872,7 +60182,6 @@ SWIGINTERN PyObject *_wrap_cvCreateGraphScanner(PyObject *SWIGUNUSEDPARM(self),
   CvGraph *arg1 = (CvGraph *) 0 ;
   CvGraphVtx *arg2 = (CvGraphVtx *) NULL ;
   int arg3 = (int) -1 ;
-  CvGraphScanner *result = 0 ;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -59881,6 +60190,7 @@ SWIGINTERN PyObject *_wrap_cvCreateGraphScanner(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvGraphScanner *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OO:cvCreateGraphScanner",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -59925,10 +60235,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvNextGraphItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvGraphScanner *arg1 = (CvGraphScanner *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvNextGraphItem",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvGraphScanner, 0 |  0 );
@@ -59956,12 +60266,12 @@ SWIGINTERN PyObject *_wrap_cvCloneGraph(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvGraph *arg1 = (CvGraph *) 0 ;
   CvMemStorage *arg2 = (CvMemStorage *) 0 ;
-  CvGraph *result = 0 ;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvGraph *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvCloneGraph",&obj0,&obj1)) SWIG_fail;
   {
@@ -61013,7 +61323,6 @@ SWIGINTERN PyObject *_wrap_cvClipLine(PyObject *SWIGUNUSEDPARM(self), PyObject *
   CvSize arg1 ;
   CvPoint *arg2 = (CvPoint *) 0 ;
   CvPoint *arg3 = (CvPoint *) 0 ;
-  int result;
   CvSize temp1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -61022,6 +61331,7 @@ SWIGINTERN PyObject *_wrap_cvClipLine(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvClipLine",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -61079,7 +61389,6 @@ SWIGINTERN PyObject *_wrap_cvInitLineIterator(PyObject *SWIGUNUSEDPARM(self), Py
   CvLineIterator *arg4 = (CvLineIterator *) 0 ;
   int arg5 = (int) 8 ;
   int arg6 = (int) 0 ;
-  int result;
   bool freearg1 = false ;
   CvPoint temp2 ;
   CvPoint temp3 ;
@@ -61095,6 +61404,7 @@ SWIGINTERN PyObject *_wrap_cvInitLineIterator(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:cvInitLineIterator",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -61214,7 +61524,6 @@ SWIGINTERN PyObject *_wrap_CvFont_font_face_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->font_face = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61225,10 +61534,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_font_face_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_font_face_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61267,7 +61576,6 @@ SWIGINTERN PyObject *_wrap_CvFont_ascii_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->ascii = (int const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61278,10 +61586,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_ascii_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_ascii_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61320,7 +61628,6 @@ SWIGINTERN PyObject *_wrap_CvFont_greek_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->greek = (int const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61331,10 +61638,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_greek_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_greek_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61373,7 +61680,6 @@ SWIGINTERN PyObject *_wrap_CvFont_cyrillic_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->cyrillic = (int const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61384,10 +61690,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_cyrillic_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_cyrillic_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61426,7 +61732,6 @@ SWIGINTERN PyObject *_wrap_CvFont_hscale_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->hscale = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61437,10 +61742,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_hscale_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_hscale_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61479,7 +61784,6 @@ SWIGINTERN PyObject *_wrap_CvFont_vscale_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->vscale = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61490,10 +61794,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_vscale_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_vscale_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61532,7 +61836,6 @@ SWIGINTERN PyObject *_wrap_CvFont_shear_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->shear = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61543,10 +61846,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_shear_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_shear_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61585,7 +61888,6 @@ SWIGINTERN PyObject *_wrap_CvFont_thickness_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->thickness = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61596,10 +61898,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_thickness_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_thickness_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61638,7 +61940,6 @@ SWIGINTERN PyObject *_wrap_CvFont_dx_set(PyObject *SWIGUNUSEDPARM(self), PyObjec
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->dx = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61649,10 +61950,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_dx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_dx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61691,7 +61992,6 @@ SWIGINTERN PyObject *_wrap_CvFont_line_type_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->line_type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -61702,10 +62002,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvFont_line_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFont *arg1 = (CvFont *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvFont_line_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFont, 0 |  0 );
@@ -61757,7 +62057,7 @@ SWIGINTERN PyObject *_wrap_delete_CvFont(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< CvFont * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -61773,7 +62073,7 @@ fail:
 
 SWIGINTERN PyObject *CvFont_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvFont, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -61869,13 +62169,13 @@ SWIGINTERN PyObject *_wrap_cvFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 = (int) 1 ;
-  CvFont result;
   double val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvFont result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvFont",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -62058,13 +62358,13 @@ SWIGINTERN PyObject *_wrap_cvColorToScalar(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 ;
-  CvScalar result;
   double val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvScalar result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvColorToScalar",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -62102,7 +62402,6 @@ SWIGINTERN PyObject *_wrap_cvEllipse2Poly(PyObject *SWIGUNUSEDPARM(self), PyObje
   int arg5 ;
   CvPoint *arg6 = (CvPoint *) 0 ;
   int arg7 ;
-  int result;
   CvPoint temp1 ;
   CvSize temp2 ;
   int val3 ;
@@ -62122,6 +62421,7 @@ SWIGINTERN PyObject *_wrap_cvEllipse2Poly(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:cvEllipse2Poly",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
@@ -62432,7 +62732,6 @@ SWIGINTERN PyObject *_wrap_CvTreeNodeIterator_node_set(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvTreeNodeIterator_node_set" "', argument " "2"" of type '" "void const *""'"); 
   }
   if (arg1) (arg1)->node = (void const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -62443,10 +62742,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTreeNodeIterator_node_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTreeNodeIterator *arg1 = (CvTreeNodeIterator *) 0 ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTreeNodeIterator_node_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTreeNodeIterator, 0 |  0 );
@@ -62485,7 +62784,6 @@ SWIGINTERN PyObject *_wrap_CvTreeNodeIterator_level_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->level = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -62496,10 +62794,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTreeNodeIterator_level_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTreeNodeIterator *arg1 = (CvTreeNodeIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTreeNodeIterator_level_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTreeNodeIterator, 0 |  0 );
@@ -62538,7 +62836,6 @@ SWIGINTERN PyObject *_wrap_CvTreeNodeIterator_max_level_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->max_level = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -62549,10 +62846,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTreeNodeIterator_max_level_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTreeNodeIterator *arg1 = (CvTreeNodeIterator *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTreeNodeIterator_max_level_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTreeNodeIterator, 0 |  0 );
@@ -62604,7 +62901,7 @@ SWIGINTERN PyObject *_wrap_delete_CvTreeNodeIterator(PyObject *SWIGUNUSEDPARM(se
   arg1 = reinterpret_cast< CvTreeNodeIterator * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -62620,7 +62917,7 @@ fail:
 
 SWIGINTERN PyObject *CvTreeNodeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvTreeNodeIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -62673,10 +62970,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvNextTreeNode(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTreeNodeIterator *arg1 = (CvTreeNodeIterator *) 0 ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvNextTreeNode",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTreeNodeIterator, 0 |  0 );
@@ -62703,10 +63000,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvPrevTreeNode(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTreeNodeIterator *arg1 = (CvTreeNodeIterator *) 0 ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvPrevTreeNode",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTreeNodeIterator, 0 |  0 );
@@ -62810,7 +63107,6 @@ SWIGINTERN PyObject *_wrap_cvTreeToNodeSeq(PyObject *SWIGUNUSEDPARM(self), PyObj
   void *arg1 = (void *) 0 ;
   int arg2 ;
   CvMemStorage *arg3 = (CvMemStorage *) 0 ;
-  CvSeq *result = 0 ;
   int res1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -62819,6 +63115,7 @@ SWIGINTERN PyObject *_wrap_cvTreeToNodeSeq(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvTreeToNodeSeq",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -62862,7 +63159,6 @@ SWIGINTERN PyObject *_wrap_cvKMeans2(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   int arg7 = (int) 0 ;
   CvArr *arg8 = (CvArr *) 0 ;
   double *arg9 = (double *) 0 ;
-  int result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -62886,6 +63182,7 @@ SWIGINTERN PyObject *_wrap_cvKMeans2(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO|OOOOO:cvKMeans2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
@@ -63017,10 +63314,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvRegisterModule(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvModuleInfo *arg1 = (CvModuleInfo *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvRegisterModule",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvModuleInfo, 0 |  0 );
@@ -63047,10 +63344,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvUseOptimized(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvUseOptimized",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -63202,10 +63499,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSetErrMode(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvSetErrMode",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -63306,10 +63603,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvErrorStr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  char *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvErrorStr",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -63339,7 +63636,6 @@ SWIGINTERN PyObject *_wrap_cvGetErrInfo(PyObject *SWIGUNUSEDPARM(self), PyObject
   char **arg2 = (char **) 0 ;
   char **arg3 = (char **) 0 ;
   int *arg4 = (int *) 0 ;
-  int result;
   void *vptr1 ;
   char *buffer1 ;
   void *vptr2 ;
@@ -63352,6 +63648,7 @@ SWIGINTERN PyObject *_wrap_cvGetErrInfo(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvGetErrInfo",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -63399,10 +63696,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvErrorFromIppStatus(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvErrorFromIppStatus",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -63431,13 +63728,13 @@ SWIGINTERN PyObject *_wrap_cvRedirectError(PyObject *SWIGUNUSEDPARM(self), PyObj
   CvErrorCallback arg1 = (CvErrorCallback) 0 ;
   void *arg2 = (void *) NULL ;
   void **arg3 = (void **) NULL ;
-  CvErrorCallback result;
   int res2 ;
   void *vptr3 ;
   void *buffer3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvErrorCallback result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OO:cvRedirectError",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -63485,7 +63782,6 @@ SWIGINTERN PyObject *_wrap_cvNulDevReport(PyObject *SWIGUNUSEDPARM(self), PyObje
   char *arg4 = (char *) 0 ;
   int arg5 ;
   void *arg6 = (void *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   int res2 ;
@@ -63506,6 +63802,7 @@ SWIGINTERN PyObject *_wrap_cvNulDevReport(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:cvNulDevReport",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -63567,7 +63864,6 @@ SWIGINTERN PyObject *_wrap_cvStdErrReport(PyObject *SWIGUNUSEDPARM(self), PyObje
   char *arg4 = (char *) 0 ;
   int arg5 ;
   void *arg6 = (void *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   int res2 ;
@@ -63588,6 +63884,7 @@ SWIGINTERN PyObject *_wrap_cvStdErrReport(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:cvStdErrReport",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -63649,7 +63946,6 @@ SWIGINTERN PyObject *_wrap_cvGuiBoxReport(PyObject *SWIGUNUSEDPARM(self), PyObje
   char *arg4 = (char *) 0 ;
   int arg5 ;
   void *arg6 = (void *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   int res2 ;
@@ -63670,6 +63966,7 @@ SWIGINTERN PyObject *_wrap_cvGuiBoxReport(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:cvGuiBoxReport",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -63837,7 +64134,6 @@ SWIGINTERN PyObject *_wrap_cvOpenFileStorage(PyObject *SWIGUNUSEDPARM(self), PyO
   char *arg1 = (char *) 0 ;
   CvMemStorage *arg2 = (CvMemStorage *) 0 ;
   int arg3 ;
-  CvFileStorage *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -63848,6 +64144,7 @@ SWIGINTERN PyObject *_wrap_cvOpenFileStorage(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvFileStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvOpenFileStorage",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -63916,7 +64213,6 @@ SWIGINTERN PyObject *_wrap_cvAttrValue(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvAttrList *arg1 = (CvAttrList *) 0 ;
   char *arg2 = (char *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -63924,6 +64220,7 @@ SWIGINTERN PyObject *_wrap_cvAttrValue(PyObject *SWIGUNUSEDPARM(self), PyObject
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvAttrValue",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvAttrList, 0 |  0 );
@@ -64439,7 +64736,6 @@ SWIGINTERN PyObject *_wrap_cvGetHashedKey(PyObject *SWIGUNUSEDPARM(self), PyObje
   char *arg2 = (char *) 0 ;
   int arg3 = (int) -1 ;
   int arg4 = (int) 0 ;
-  CvStringHashNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -64453,6 +64749,7 @@ SWIGINTERN PyObject *_wrap_cvGetHashedKey(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvStringHashNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OO:cvGetHashedKey",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -64501,13 +64798,13 @@ SWIGINTERN PyObject *_wrap_cvGetRootFileNode(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   CvFileStorage *arg1 = (CvFileStorage *) 0 ;
   int arg2 = (int) 0 ;
-  CvFileNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvFileNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvGetRootFileNode",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -64544,7 +64841,6 @@ SWIGINTERN PyObject *_wrap_cvGetFileNode(PyObject *SWIGUNUSEDPARM(self), PyObjec
   CvFileNode *arg2 = (CvFileNode *) 0 ;
   CvStringHashNode *arg3 = (CvStringHashNode *) 0 ;
   int arg4 = (int) 0 ;
-  CvFileNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -64557,6 +64853,7 @@ SWIGINTERN PyObject *_wrap_cvGetFileNode(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvFileNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvGetFileNode",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -64602,7 +64899,6 @@ SWIGINTERN PyObject *_wrap_cvGetFileNodeByName(PyObject *SWIGUNUSEDPARM(self), P
   CvFileStorage *arg1 = (CvFileStorage *) 0 ;
   CvFileNode *arg2 = (CvFileNode *) 0 ;
   char *arg3 = (char *) 0 ;
-  CvFileNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -64613,6 +64909,7 @@ SWIGINTERN PyObject *_wrap_cvGetFileNodeByName(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvFileNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvGetFileNodeByName",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -64652,13 +64949,13 @@ SWIGINTERN PyObject *_wrap_cvReadInt(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject *resultobj = 0;
   CvFileNode *arg1 = (CvFileNode *) 0 ;
   int arg2 = (int) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvReadInt",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode, 0 |  0 );
@@ -64695,7 +64992,6 @@ SWIGINTERN PyObject *_wrap_cvReadIntByName(PyObject *SWIGUNUSEDPARM(self), PyObj
   CvFileNode *arg2 = (CvFileNode *) 0 ;
   char *arg3 = (char *) 0 ;
   int arg4 = (int) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -64709,6 +65005,7 @@ SWIGINTERN PyObject *_wrap_cvReadIntByName(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvReadIntByName",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -64755,13 +65052,13 @@ SWIGINTERN PyObject *_wrap_cvReadReal(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject *resultobj = 0;
   CvFileNode *arg1 = (CvFileNode *) 0 ;
   double arg2 = (double) 0. ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvReadReal",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode, 0 |  0 );
@@ -64798,7 +65095,6 @@ SWIGINTERN PyObject *_wrap_cvReadRealByName(PyObject *SWIGUNUSEDPARM(self), PyOb
   CvFileNode *arg2 = (CvFileNode *) 0 ;
   char *arg3 = (char *) 0 ;
   double arg4 = (double) 0. ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -64812,6 +65108,7 @@ SWIGINTERN PyObject *_wrap_cvReadRealByName(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvReadRealByName",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -64858,7 +65155,6 @@ SWIGINTERN PyObject *_wrap_cvReadString(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvFileNode *arg1 = (CvFileNode *) 0 ;
   char *arg2 = (char *) NULL ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -64866,6 +65162,7 @@ SWIGINTERN PyObject *_wrap_cvReadString(PyObject *SWIGUNUSEDPARM(self), PyObject
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvReadString",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode, 0 |  0 );
@@ -64904,7 +65201,6 @@ SWIGINTERN PyObject *_wrap_cvReadStringByName(PyObject *SWIGUNUSEDPARM(self), Py
   CvFileNode *arg2 = (CvFileNode *) 0 ;
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) NULL ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -64919,6 +65215,7 @@ SWIGINTERN PyObject *_wrap_cvReadStringByName(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvReadStringByName",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -64968,7 +65265,6 @@ SWIGINTERN PyObject *_wrap_cvRead(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   CvFileStorage *arg1 = (CvFileStorage *) 0 ;
   CvFileNode *arg2 = (CvFileNode *) 0 ;
   CvAttrList *arg3 = (CvAttrList *) NULL ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -64978,6 +65274,7 @@ SWIGINTERN PyObject *_wrap_cvRead(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvRead",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -65019,7 +65316,6 @@ SWIGINTERN PyObject *_wrap_cvReadByName(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvFileNode *arg2 = (CvFileNode *) 0 ;
   char *arg3 = (char *) 0 ;
   CvAttrList *arg4 = (CvAttrList *) NULL ;
-  void *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -65033,6 +65329,7 @@ SWIGINTERN PyObject *_wrap_cvReadByName(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvReadByName",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -65307,10 +65604,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGetFileNodeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvFileNode *arg1 = (CvFileNode *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetFileNodeName",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileNode, 0 |  0 );
@@ -65419,11 +65716,11 @@ fail:
 SWIGINTERN PyObject *_wrap_cvFindType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  CvTypeInfo *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTypeInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvFindType",&obj0)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -65452,9 +65749,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvTypeOf(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   void *arg1 = (void *) 0 ;
-  CvTypeInfo *result = 0 ;
   int res1 ;
   PyObject * obj0 = 0 ;
+  CvTypeInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvTypeOf",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -65480,9 +65777,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvClone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   void *arg1 = (void *) 0 ;
-  void *result = 0 ;
   int res1 ;
   PyObject * obj0 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvClone",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -65597,7 +65894,6 @@ SWIGINTERN PyObject *_wrap_cvLoad(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   CvMemStorage *arg2 = (CvMemStorage *) NULL ;
   char *arg3 = (char *) NULL ;
   char **arg4 = (char **) NULL ;
-  void *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -65612,6 +65908,7 @@ SWIGINTERN PyObject *_wrap_cvLoad(PyObject *SWIGUNUSEDPARM(self), PyObject *args
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OOO:cvLoad",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -65783,11 +66080,11 @@ SWIGINTERN PyObject *_wrap_cvSetImageIOFunctions(PyObject *SWIGUNUSEDPARM(self),
   CvLoadImageMFunc arg2 = (CvLoadImageMFunc) 0 ;
   CvSaveImageFunc arg3 = (CvSaveImageFunc) 0 ;
   CvShowImageFunc arg4 = (CvShowImageFunc) 0 ;
-  int result;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvSetImageIOFunctions",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -65856,7 +66153,6 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   CvSize arg1 ;
   int arg2 ;
   int arg3 ;
-  CvImage *result = 0 ;
   CvSize temp1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -65865,6 +66161,7 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvImage",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -65917,9 +66214,9 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IplImage *arg1 = (IplImage *) 0 ;
-  CvImage *result = 0 ;
   IplImage header1 ;
   PyObject * obj0 = 0 ;
+  CvImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvImage",&obj0)) SWIG_fail;
   {
@@ -65950,10 +66247,10 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = 0 ;
-  CvImage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvImage",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_CvImage,  0  | 0);
@@ -65985,7 +66282,6 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_4(PyObject *SWIGUNUSEDPARM(self), P
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 ;
-  CvImage *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -65997,6 +66293,7 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_4(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvImage",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -66038,7 +66335,6 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_5(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
-  CvImage *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -66047,6 +66343,7 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_5(PyObject *SWIGUNUSEDPARM(self), P
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvImage",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -66082,11 +66379,11 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  CvImage *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvImage",&obj0)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -66117,7 +66414,6 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_7(PyObject *SWIGUNUSEDPARM(self), P
   CvFileStorage *arg1 = (CvFileStorage *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  CvImage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -66129,6 +66425,7 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_7(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvImage",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -66171,7 +66468,6 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_8(PyObject *SWIGUNUSEDPARM(self), P
   CvFileStorage *arg1 = (CvFileStorage *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 ;
-  CvImage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -66182,6 +66478,7 @@ SWIGINTERN PyObject *_wrap_new_CvImage__SWIG_8(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvImage",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -66223,7 +66520,7 @@ SWIGINTERN PyObject *_wrap_new_CvImage(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -66343,7 +66640,17 @@ SWIGINTERN PyObject *_wrap_new_CvImage(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvImage'.\n  Possible C/C++ prototypes are:\n    CvImage()\n    CvImage(CvSize,int,int)\n    CvImage(IplImage *)\n    CvImage(CvImage const &)\n    CvImage(char const *,char const *,int)\n    CvImage(char const *,char const *)\n    CvImage(char const *)\n    CvImage(CvFileStorage *,char const *,char const *)\n    CvImage(CvFileStorage *,char const *,int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvImage'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvImage()\n"
+    "    CvImage(CvSize,int,int)\n"
+    "    CvImage(IplImage *)\n"
+    "    CvImage(CvImage const &)\n"
+    "    CvImage(char const *,char const *,int)\n"
+    "    CvImage(char const *,char const *)\n"
+    "    CvImage(char const *)\n"
+    "    CvImage(CvFileStorage *,char const *,char const *)\n"
+    "    CvImage(CvFileStorage *,char const *,int)\n");
   return NULL;
 }
 
@@ -66363,7 +66670,7 @@ SWIGINTERN PyObject *_wrap_delete_CvImage(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< CvImage * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -66380,10 +66687,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  CvImage result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvImage result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_clone",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -66633,7 +66940,7 @@ SWIGINTERN PyObject *_wrap_CvImage_attach(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -66673,7 +66980,10 @@ SWIGINTERN PyObject *_wrap_CvImage_attach(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_attach'.\n  Possible C/C++ prototypes are:\n    attach(IplImage *,bool)\n    attach(IplImage *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_attach'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    attach(CvImage *,IplImage *,bool)\n"
+    "    attach(CvImage *,IplImage *)\n");
   return NULL;
 }
 
@@ -66713,7 +67023,6 @@ SWIGINTERN PyObject *_wrap_CvImage_load__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   int arg4 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -66728,6 +67037,7 @@ SWIGINTERN PyObject *_wrap_CvImage_load__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvImage_load",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -66775,7 +67085,6 @@ SWIGINTERN PyObject *_wrap_CvImage_load__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   CvImage *arg1 = (CvImage *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -66787,6 +67096,7 @@ SWIGINTERN PyObject *_wrap_CvImage_load__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvImage_load",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -66828,7 +67138,6 @@ SWIGINTERN PyObject *_wrap_CvImage_load__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
   char *arg2 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -66836,6 +67145,7 @@ SWIGINTERN PyObject *_wrap_CvImage_load__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvImage_load",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -66872,7 +67182,7 @@ SWIGINTERN PyObject *_wrap_CvImage_load(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -66931,7 +67241,11 @@ SWIGINTERN PyObject *_wrap_CvImage_load(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_load'.\n  Possible C/C++ prototypes are:\n    load(char const *,char const *,int)\n    load(char const *,char const *)\n    load(char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_load'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    load(CvImage *,char const *,char const *,int)\n"
+    "    load(CvImage *,char const *,char const *)\n"
+    "    load(CvImage *,char const *)\n");
   return NULL;
 }
 
@@ -66942,7 +67256,6 @@ SWIGINTERN PyObject *_wrap_CvImage_read__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   CvFileStorage *arg2 = (CvFileStorage *) 0 ;
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -66957,6 +67270,7 @@ SWIGINTERN PyObject *_wrap_CvImage_read__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvImage_read",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67005,7 +67319,6 @@ SWIGINTERN PyObject *_wrap_CvImage_read__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   CvFileStorage *arg2 = (CvFileStorage *) 0 ;
   char *arg3 = (char *) 0 ;
   int arg4 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -67019,6 +67332,7 @@ SWIGINTERN PyObject *_wrap_CvImage_read__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvImage_read",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67065,7 +67379,7 @@ SWIGINTERN PyObject *_wrap_CvImage_read(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67117,7 +67431,10 @@ SWIGINTERN PyObject *_wrap_CvImage_read(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_read'.\n  Possible C/C++ prototypes are:\n    read(CvFileStorage *,char const *,char const *)\n    read(CvFileStorage *,char const *,int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_read'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    read(CvImage *,CvFileStorage *,char const *,char const *)\n"
+    "    read(CvImage *,CvFileStorage *,char const *,int)\n");
   return NULL;
 }
 
@@ -67243,7 +67560,7 @@ SWIGINTERN PyObject *_wrap_CvImage_save(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67288,7 +67605,10 @@ SWIGINTERN PyObject *_wrap_CvImage_save(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_save'.\n  Possible C/C++ prototypes are:\n    save(char const *,char const *,int const *)\n    save(char const *,char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_save'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    save(CvImage *,char const *,char const *,int const *)\n"
+    "    save(CvImage *,char const *,char const *)\n");
   return NULL;
 }
 
@@ -67387,10 +67707,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_is_valid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_is_valid",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67417,10 +67737,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_width(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_width",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67447,10 +67767,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_height(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_height",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67477,10 +67797,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  CvSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSize result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_size",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67507,10 +67827,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_roi_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  CvSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSize result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_roi_size",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67537,10 +67857,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_roi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  CvRect result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRect result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_roi",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67567,10 +67887,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_coi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_coi",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67717,10 +68037,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_depth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_depth",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67747,10 +68067,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_channels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_channels",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67777,10 +68097,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_pix_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_pix_size",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67807,10 +68127,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_data__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_data",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67837,10 +68157,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_data__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_data",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67870,7 +68190,7 @@ SWIGINTERN PyObject *_wrap_CvImage_data(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67894,7 +68214,10 @@ SWIGINTERN PyObject *_wrap_CvImage_data(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_data'.\n  Possible C/C++ prototypes are:\n    data()\n    data()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_data'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    data(CvImage *)\n"
+    "    data(CvImage const *)\n");
   return NULL;
 }
 
@@ -67902,10 +68225,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_step(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_step",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67932,10 +68255,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_origin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_origin",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -67963,13 +68286,13 @@ SWIGINTERN PyObject *_wrap_CvImage_roi_row__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
   int arg2 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvImage_roi_row",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -68002,13 +68325,13 @@ SWIGINTERN PyObject *_wrap_CvImage_roi_row__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
   int arg2 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvImage_roi_row",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -68043,7 +68366,7 @@ SWIGINTERN PyObject *_wrap_CvImage_roi_row(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68079,7 +68402,10 @@ SWIGINTERN PyObject *_wrap_CvImage_roi_row(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_roi_row'.\n  Possible C/C++ prototypes are:\n    roi_row(int)\n    roi_row(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvImage_roi_row'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    roi_row(CvImage *,int)\n"
+    "    roi_row(CvImage const *,int)\n");
   return NULL;
 }
 
@@ -68087,10 +68413,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvImage_asIplImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvImage *arg1 = (CvImage *) 0 ;
-  IplImage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvImage_asIplImage",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvImage, 0 |  0 );
@@ -68119,7 +68445,7 @@ fail:
 
 SWIGINTERN PyObject *CvImage_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvImage, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -68150,7 +68476,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   int arg1 ;
   int arg2 ;
   int arg3 ;
-  CvMatrix *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -68160,6 +68485,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvMatrix",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -68201,7 +68527,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg4 = (CvMat *) 0 ;
   void *arg5 = (void *) 0 ;
   int arg6 ;
-  CvMatrix *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -68218,6 +68543,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_CvMatrix",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -68282,7 +68608,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   void *arg5 = (void *) 0 ;
-  CvMatrix *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -68296,6 +68621,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvMatrix",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -68354,7 +68680,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_4(PyObject *SWIGUNUSEDPARM(self),
   int arg2 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvMatrix *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -68366,6 +68691,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_4(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvMatrix",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -68421,7 +68747,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_5(PyObject *SWIGUNUSEDPARM(self),
   int arg3 ;
   CvMemStorage *arg4 = (CvMemStorage *) 0 ;
   bool arg5 ;
-  CvMatrix *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -68437,6 +68762,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_5(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvMatrix",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -68486,7 +68812,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_6(PyObject *SWIGUNUSEDPARM(self),
   int arg2 ;
   int arg3 ;
   CvMemStorage *arg4 = (CvMemStorage *) 0 ;
-  CvMatrix *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -68499,6 +68824,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_6(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvMatrix",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -68544,7 +68870,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_7(PyObject *SWIGUNUSEDPARM(self),
   int arg3 ;
   void *arg4 = (void *) 0 ;
   int arg5 ;
-  CvMatrix *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -68559,6 +68884,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_7(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvMatrix",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -68607,7 +68933,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_8(PyObject *SWIGUNUSEDPARM(self),
   int arg2 ;
   int arg3 ;
   void *arg4 = (void *) 0 ;
-  CvMatrix *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -68619,6 +68944,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_8(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvMatrix",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -68659,9 +68985,9 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_9(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  CvMatrix *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvMatrix",&obj0)) SWIG_fail;
   {
@@ -68698,10 +69024,10 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_10(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = 0 ;
-  CvMatrix *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvMatrix",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_CvMatrix,  0  | 0);
@@ -68733,7 +69059,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_11(PyObject *SWIGUNUSEDPARM(self),
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 ;
-  CvMatrix *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -68745,6 +69070,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_11(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvMatrix",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -68786,7 +69112,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_12(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
-  CvMatrix *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -68795,6 +69120,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_12(PyObject *SWIGUNUSEDPARM(self),
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvMatrix",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -68830,11 +69156,11 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_13(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  CvMatrix *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvMatrix",&obj0)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -68865,7 +69191,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_14(PyObject *SWIGUNUSEDPARM(self),
   CvFileStorage *arg1 = (CvFileStorage *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  CvMatrix *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -68877,6 +69202,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_14(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvMatrix",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -68919,7 +69245,6 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_15(PyObject *SWIGUNUSEDPARM(self),
   CvFileStorage *arg1 = (CvFileStorage *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 ;
-  CvMatrix *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -68930,6 +69255,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix__SWIG_15(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMatrix *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvMatrix",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFileStorage, 0 |  0 );
@@ -68971,7 +69297,7 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69310,7 +69636,24 @@ SWIGINTERN PyObject *_wrap_new_CvMatrix(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvMatrix'.\n  Possible C/C++ prototypes are:\n    CvMatrix()\n    CvMatrix(int,int,int)\n    CvMatrix(int,int,int,CvMat *,void *,int)\n    CvMatrix(int,int,int,CvMat *,void *)\n    CvMatrix(int,int,int,CvMat *)\n    CvMatrix(int,int,int,CvMemStorage *,bool)\n    CvMatrix(int,int,int,CvMemStorage *)\n    CvMatrix(int,int,int,void *,int)\n    CvMatrix(int,int,int,void *)\n    CvMatrix(CvMat *)\n    CvMatrix(CvMatrix const &)\n    CvMatrix(char const *,char const *,int)\n    CvMatrix(char const *,char const *)\n    CvMatrix(char const *)\n    CvMatrix(CvFileStorage *,char const *,char const *)\n    CvMatrix(CvFileStorage *,char const *,int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvMatrix'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvMatrix()\n"
+    "    CvMatrix(int,int,int)\n"
+    "    CvMatrix(int,int,int,CvMat *,void *,int)\n"
+    "    CvMatrix(int,int,int,CvMat *,void *)\n"
+    "    CvMatrix(int,int,int,CvMat *)\n"
+    "    CvMatrix(int,int,int,CvMemStorage *,bool)\n"
+    "    CvMatrix(int,int,int,CvMemStorage *)\n"
+    "    CvMatrix(int,int,int,void *,int)\n"
+    "    CvMatrix(int,int,int,void *)\n"
+    "    CvMatrix(CvMat *)\n"
+    "    CvMatrix(CvMatrix const &)\n"
+    "    CvMatrix(char const *,char const *,int)\n"
+    "    CvMatrix(char const *,char const *)\n"
+    "    CvMatrix(char const *)\n"
+    "    CvMatrix(CvFileStorage *,char const *,char const *)\n"
+    "    CvMatrix(CvFileStorage *,char const *,int)\n");
   return NULL;
 }
 
@@ -69330,7 +69673,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMatrix(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = reinterpret_cast< CvMatrix * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -69347,10 +69690,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  CvMatrix result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMatrix result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_clone",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -69579,7 +69922,6 @@ SWIGINTERN PyObject *_wrap_CvMatrix_load__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   int arg4 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -69594,6 +69936,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_load__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvMatrix_load",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -69641,7 +69984,6 @@ SWIGINTERN PyObject *_wrap_CvMatrix_load__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   CvMatrix *arg1 = (CvMatrix *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -69653,6 +69995,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_load__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvMatrix_load",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -69694,7 +70037,6 @@ SWIGINTERN PyObject *_wrap_CvMatrix_load__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
   char *arg2 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -69702,6 +70044,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_load__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMatrix_load",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -69738,7 +70081,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_load(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69797,7 +70140,11 @@ SWIGINTERN PyObject *_wrap_CvMatrix_load(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_load'.\n  Possible C/C++ prototypes are:\n    load(char const *,char const *,int)\n    load(char const *,char const *)\n    load(char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_load'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    load(CvMatrix *,char const *,char const *,int)\n"
+    "    load(CvMatrix *,char const *,char const *)\n"
+    "    load(CvMatrix *,char const *)\n");
   return NULL;
 }
 
@@ -69808,7 +70155,6 @@ SWIGINTERN PyObject *_wrap_CvMatrix_read__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   CvFileStorage *arg2 = (CvFileStorage *) 0 ;
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -69823,6 +70169,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_read__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvMatrix_read",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -69871,7 +70218,6 @@ SWIGINTERN PyObject *_wrap_CvMatrix_read__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   CvFileStorage *arg2 = (CvFileStorage *) 0 ;
   char *arg3 = (char *) 0 ;
   int arg4 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -69885,6 +70231,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_read__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvMatrix_read",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -69931,7 +70278,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_read(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69983,7 +70330,10 @@ SWIGINTERN PyObject *_wrap_CvMatrix_read(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_read'.\n  Possible C/C++ prototypes are:\n    read(CvFileStorage *,char const *,char const *)\n    read(CvFileStorage *,char const *,int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_read'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    read(CvMatrix *,CvFileStorage *,char const *,char const *)\n"
+    "    read(CvMatrix *,CvFileStorage *,char const *,int)\n");
   return NULL;
 }
 
@@ -70109,7 +70459,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_save(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70154,7 +70504,10 @@ SWIGINTERN PyObject *_wrap_CvMatrix_save(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_save'.\n  Possible C/C++ prototypes are:\n    save(char const *,char const *,int const *)\n    save(char const *,char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_save'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    save(CvMatrix *,char const *,char const *,int const *)\n"
+    "    save(CvMatrix *,char const *,char const *)\n");
   return NULL;
 }
 
@@ -70253,10 +70606,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_is_valid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_is_valid",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70283,10 +70636,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_rows(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_rows",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70313,10 +70666,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_cols(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_cols",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70343,10 +70696,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  CvSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSize result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_size",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70373,10 +70726,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_type(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_type",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70403,10 +70756,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_depth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_depth",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70433,10 +70786,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_channels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_channels",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70463,10 +70816,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_pix_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_pix_size",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70493,10 +70846,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_data__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_data",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70523,10 +70876,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_data__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_data",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70556,7 +70909,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_data(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70580,7 +70933,10 @@ SWIGINTERN PyObject *_wrap_CvMatrix_data(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_data'.\n  Possible C/C++ prototypes are:\n    data()\n    data()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_data'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    data(CvMatrix *)\n"
+    "    data(CvMatrix const *)\n");
   return NULL;
 }
 
@@ -70588,10 +70944,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_step(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_step",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70702,7 +71058,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_set_data(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70742,7 +71098,10 @@ SWIGINTERN PyObject *_wrap_CvMatrix_set_data(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_set_data'.\n  Possible C/C++ prototypes are:\n    set_data(void *,int)\n    set_data(void *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_set_data'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    set_data(CvMatrix *,void *,int)\n"
+    "    set_data(CvMatrix *,void *)\n");
   return NULL;
 }
 
@@ -70751,13 +71110,13 @@ SWIGINTERN PyObject *_wrap_CvMatrix_row__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
   int arg2 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMatrix_row",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70790,13 +71149,13 @@ SWIGINTERN PyObject *_wrap_CvMatrix_row__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
   int arg2 ;
-  uchar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  uchar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMatrix_row",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70831,7 +71190,7 @@ SWIGINTERN PyObject *_wrap_CvMatrix_row(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70867,7 +71226,10 @@ SWIGINTERN PyObject *_wrap_CvMatrix_row(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_row'.\n  Possible C/C++ prototypes are:\n    row(int)\n    row(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvMatrix_row'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    row(CvMatrix *,int)\n"
+    "    row(CvMatrix const *,int)\n");
   return NULL;
 }
 
@@ -70875,10 +71237,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix_asCvMat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix *arg1 = (CvMatrix *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix_asCvMat",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix, 0 |  0 );
@@ -70904,7 +71266,7 @@ fail:
 
 SWIGINTERN PyObject *CvMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMatrix, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70912,10 +71274,10 @@ SWIGINTERN PyObject *CvMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObj
 SWIGINTERN PyObject *_wrap_new_CvModule(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvModuleInfo *arg1 = (CvModuleInfo *) 0 ;
-  CvModule *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvModule *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvModule",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvModuleInfo, 0 |  0 );
@@ -70954,7 +71316,7 @@ SWIGINTERN PyObject *_wrap_delete_CvModule(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = reinterpret_cast< CvModule * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -70991,7 +71353,6 @@ SWIGINTERN PyObject *_wrap_CvModule_info_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< CvModuleInfo * >(argp2);
   if (arg1) (arg1)->info = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -71002,10 +71363,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvModule_info_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvModule *arg1 = (CvModule *) 0 ;
-  CvModuleInfo *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvModuleInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvModule_info_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvModule, 0 |  0 );
@@ -71021,7 +71382,7 @@ fail:
 }
 
 
-SWIGINTERN int CvModule_first_set(PyObject *_val) {
+SWIGINTERN int Swig_var_CvModule_first_set(PyObject *_val) {
   {
     void *argp = 0;
     int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_CvModuleInfo,  0 );  
@@ -71036,7 +71397,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *CvModule_first_get(void) {
+SWIGINTERN PyObject *Swig_var_CvModule_first_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(CvModule::first), SWIGTYPE_p_CvModuleInfo,  0 );
@@ -71045,7 +71406,7 @@ SWIGINTERN PyObject *CvModule_first_get(void) {
 
 
 SWIGINTERN PyObject *_wrap_CvModule_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(args)) {
-  return CvModule_first_get();
+  return Swig_var_CvModule_first_get();
 }
 
 
@@ -71054,12 +71415,12 @@ SWIGINTERN PyObject *_wrap_CvModule_first_set(PyObject *SWIGUNUSEDPARM(self), Py
   int res;
   
   if (!PyArg_ParseTuple(args,(char *)"O:set",&value)) return NULL;
-  res = CvModule_first_set(value);
+  res = Swig_var_CvModule_first_set(value);
   return !res ? SWIG_Py_Void() : NULL;
 }
 
 
-SWIGINTERN int CvModule_last_set(PyObject *_val) {
+SWIGINTERN int Swig_var_CvModule_last_set(PyObject *_val) {
   {
     void *argp = 0;
     int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_CvModuleInfo,  0 );  
@@ -71074,7 +71435,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *CvModule_last_get(void) {
+SWIGINTERN PyObject *Swig_var_CvModule_last_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(CvModule::last), SWIGTYPE_p_CvModuleInfo,  0 );
@@ -71083,7 +71444,7 @@ SWIGINTERN PyObject *CvModule_last_get(void) {
 
 
 SWIGINTERN PyObject *_wrap_CvModule_last_get(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(args)) {
-  return CvModule_last_get();
+  return Swig_var_CvModule_last_get();
 }
 
 
@@ -71092,14 +71453,14 @@ SWIGINTERN PyObject *_wrap_CvModule_last_set(PyObject *SWIGUNUSEDPARM(self), PyO
   int res;
   
   if (!PyArg_ParseTuple(args,(char *)"O:set",&value)) return NULL;
-  res = CvModule_last_set(value);
+  res = Swig_var_CvModule_last_set(value);
   return !res ? SWIG_Py_Void() : NULL;
 }
 
 
 SWIGINTERN PyObject *CvModule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvModule, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71112,7 +71473,6 @@ SWIGINTERN PyObject *_wrap_new_CvType__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py
   CvReadFunc arg4 = (CvReadFunc) 0 ;
   CvWriteFunc arg5 = (CvWriteFunc) 0 ;
   CvCloneFunc arg6 = (CvCloneFunc) 0 ;
-  CvType *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -71122,6 +71482,7 @@ SWIGINTERN PyObject *_wrap_new_CvType__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvType *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_CvType",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -71184,7 +71545,6 @@ SWIGINTERN PyObject *_wrap_new_CvType__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py
   CvReleaseFunc arg3 = (CvReleaseFunc) 0 ;
   CvReadFunc arg4 = (CvReadFunc) 0 ;
   CvWriteFunc arg5 = (CvWriteFunc) 0 ;
-  CvType *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -71193,6 +71553,7 @@ SWIGINTERN PyObject *_wrap_new_CvType__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvType *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvType",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -71248,7 +71609,6 @@ SWIGINTERN PyObject *_wrap_new_CvType__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py
   CvIsInstanceFunc arg2 = (CvIsInstanceFunc) 0 ;
   CvReleaseFunc arg3 = (CvReleaseFunc) 0 ;
   CvReadFunc arg4 = (CvReadFunc) 0 ;
-  CvType *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -71256,6 +71616,7 @@ SWIGINTERN PyObject *_wrap_new_CvType__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvType *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvType",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -71304,13 +71665,13 @@ SWIGINTERN PyObject *_wrap_new_CvType__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py
   char *arg1 = (char *) 0 ;
   CvIsInstanceFunc arg2 = (CvIsInstanceFunc) 0 ;
   CvReleaseFunc arg3 = (CvReleaseFunc) 0 ;
-  CvType *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvType *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvType",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -71352,12 +71713,12 @@ SWIGINTERN PyObject *_wrap_new_CvType__SWIG_4(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   CvIsInstanceFunc arg2 = (CvIsInstanceFunc) 0 ;
-  CvType *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvType *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvType",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -71395,7 +71756,7 @@ SWIGINTERN PyObject *_wrap_new_CvType(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71516,7 +71877,13 @@ SWIGINTERN PyObject *_wrap_new_CvType(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvType'.\n  Possible C/C++ prototypes are:\n    CvType(char const *,CvIsInstanceFunc,CvReleaseFunc,CvReadFunc,CvWriteFunc,CvCloneFunc)\n    CvType(char const *,CvIsInstanceFunc,CvReleaseFunc,CvReadFunc,CvWriteFunc)\n    CvType(char const *,CvIsInstanceFunc,CvReleaseFunc,CvReadFunc)\n    CvType(char const *,CvIsInstanceFunc,CvReleaseFunc)\n    CvType(char const *,CvIsInstanceFunc)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvType'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvType(char const *,CvIsInstanceFunc,CvReleaseFunc,CvReadFunc,CvWriteFunc,CvCloneFunc)\n"
+    "    CvType(char const *,CvIsInstanceFunc,CvReleaseFunc,CvReadFunc,CvWriteFunc)\n"
+    "    CvType(char const *,CvIsInstanceFunc,CvReleaseFunc,CvReadFunc)\n"
+    "    CvType(char const *,CvIsInstanceFunc,CvReleaseFunc)\n"
+    "    CvType(char const *,CvIsInstanceFunc)\n");
   return NULL;
 }
 
@@ -71536,7 +71903,7 @@ SWIGINTERN PyObject *_wrap_delete_CvType(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< CvType * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -71573,7 +71940,6 @@ SWIGINTERN PyObject *_wrap_CvType_info_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   arg2 = reinterpret_cast< CvTypeInfo * >(argp2);
   if (arg1) (arg1)->info = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -71584,10 +71950,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvType_info_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvType *arg1 = (CvType *) 0 ;
-  CvTypeInfo *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTypeInfo *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvType_info_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvType, 0 |  0 );
@@ -71603,7 +71969,7 @@ fail:
 }
 
 
-SWIGINTERN int CvType_first_set(PyObject *_val) {
+SWIGINTERN int Swig_var_CvType_first_set(PyObject *_val) {
   {
     void *argp = 0;
     int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_CvTypeInfo,  0 );  
@@ -71618,7 +71984,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *CvType_first_get(void) {
+SWIGINTERN PyObject *Swig_var_CvType_first_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(CvType::first), SWIGTYPE_p_CvTypeInfo,  0 );
@@ -71627,7 +71993,7 @@ SWIGINTERN PyObject *CvType_first_get(void) {
 
 
 SWIGINTERN PyObject *_wrap_CvType_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(args)) {
-  return CvType_first_get();
+  return Swig_var_CvType_first_get();
 }
 
 
@@ -71636,12 +72002,12 @@ SWIGINTERN PyObject *_wrap_CvType_first_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res;
   
   if (!PyArg_ParseTuple(args,(char *)"O:set",&value)) return NULL;
-  res = CvType_first_set(value);
+  res = Swig_var_CvType_first_set(value);
   return !res ? SWIG_Py_Void() : NULL;
 }
 
 
-SWIGINTERN int CvType_last_set(PyObject *_val) {
+SWIGINTERN int Swig_var_CvType_last_set(PyObject *_val) {
   {
     void *argp = 0;
     int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_CvTypeInfo,  0 );  
@@ -71656,7 +72022,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *CvType_last_get(void) {
+SWIGINTERN PyObject *Swig_var_CvType_last_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(CvType::last), SWIGTYPE_p_CvTypeInfo,  0 );
@@ -71665,7 +72031,7 @@ SWIGINTERN PyObject *CvType_last_get(void) {
 
 
 SWIGINTERN PyObject *_wrap_CvType_last_get(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(args)) {
-  return CvType_last_get();
+  return Swig_var_CvType_last_get();
 }
 
 
@@ -71674,14 +72040,14 @@ SWIGINTERN PyObject *_wrap_CvType_last_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   int res;
   
   if (!PyArg_ParseTuple(args,(char *)"O:set",&value)) return NULL;
-  res = CvType_last_set(value);
+  res = Swig_var_CvType_last_set(value);
   return !res ? SWIG_Py_Void() : NULL;
 }
 
 
 SWIGINTERN PyObject *CvType_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvType, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71709,7 +72075,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m00_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m00 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -71720,10 +72085,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m00_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m00_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -71762,7 +72127,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m10_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m10 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -71773,10 +72137,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m10_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m10_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -71815,7 +72179,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m01_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m01 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -71826,10 +72189,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m01_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m01_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -71868,7 +72231,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m20_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m20 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -71879,10 +72241,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m20_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m20_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -71921,7 +72283,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m11_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m11 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -71932,10 +72293,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m11_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m11_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -71974,7 +72335,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m02_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m02 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -71985,10 +72345,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m02_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m02_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72027,7 +72387,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m30_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m30 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72038,10 +72397,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m30_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m30_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72080,7 +72439,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m21_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m21 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72091,10 +72449,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m21_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m21_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72133,7 +72491,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m12_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m12 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72144,10 +72501,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m12_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m12_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72186,7 +72543,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_m03_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->m03 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72197,10 +72553,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_m03_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_m03_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72239,7 +72595,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_mu20_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->mu20 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72250,10 +72605,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_mu20_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_mu20_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72292,7 +72647,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_mu11_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->mu11 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72303,10 +72657,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_mu11_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_mu11_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72345,7 +72699,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_mu02_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->mu02 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72356,10 +72709,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_mu02_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_mu02_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72398,7 +72751,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_mu30_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->mu30 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72409,10 +72761,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_mu30_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_mu30_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72451,7 +72803,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_mu21_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->mu21 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72462,10 +72813,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_mu21_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_mu21_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72504,7 +72855,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_mu12_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->mu12 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72515,10 +72865,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_mu12_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_mu12_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72557,7 +72907,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_mu03_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->mu03 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72568,10 +72917,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_mu03_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_mu03_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72610,7 +72959,6 @@ SWIGINTERN PyObject *_wrap_CvMoments_inv_sqrt_m00_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->inv_sqrt_m00 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72621,10 +72969,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMoments_inv_sqrt_m00_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMoments *arg1 = (CvMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMoments_inv_sqrt_m00_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -72676,7 +73024,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMoments(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< CvMoments * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -72692,7 +73040,7 @@ fail:
 
 SWIGINTERN PyObject *CvMoments_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMoments, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72720,7 +73068,6 @@ SWIGINTERN PyObject *_wrap_CvHuMoments_hu1_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->hu1 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72731,10 +73078,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHuMoments_hu1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHuMoments *arg1 = (CvHuMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHuMoments_hu1_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHuMoments, 0 |  0 );
@@ -72773,7 +73120,6 @@ SWIGINTERN PyObject *_wrap_CvHuMoments_hu2_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->hu2 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72784,10 +73130,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHuMoments_hu2_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHuMoments *arg1 = (CvHuMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHuMoments_hu2_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHuMoments, 0 |  0 );
@@ -72826,7 +73172,6 @@ SWIGINTERN PyObject *_wrap_CvHuMoments_hu3_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->hu3 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72837,10 +73182,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHuMoments_hu3_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHuMoments *arg1 = (CvHuMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHuMoments_hu3_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHuMoments, 0 |  0 );
@@ -72879,7 +73224,6 @@ SWIGINTERN PyObject *_wrap_CvHuMoments_hu4_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->hu4 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72890,10 +73234,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHuMoments_hu4_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHuMoments *arg1 = (CvHuMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHuMoments_hu4_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHuMoments, 0 |  0 );
@@ -72932,7 +73276,6 @@ SWIGINTERN PyObject *_wrap_CvHuMoments_hu5_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->hu5 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72943,10 +73286,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHuMoments_hu5_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHuMoments *arg1 = (CvHuMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHuMoments_hu5_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHuMoments, 0 |  0 );
@@ -72985,7 +73328,6 @@ SWIGINTERN PyObject *_wrap_CvHuMoments_hu6_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->hu6 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -72996,10 +73338,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHuMoments_hu6_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHuMoments *arg1 = (CvHuMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHuMoments_hu6_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHuMoments, 0 |  0 );
@@ -73038,7 +73380,6 @@ SWIGINTERN PyObject *_wrap_CvHuMoments_hu7_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->hu7 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73049,10 +73390,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHuMoments_hu7_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHuMoments *arg1 = (CvHuMoments *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHuMoments_hu7_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHuMoments, 0 |  0 );
@@ -73104,7 +73445,7 @@ SWIGINTERN PyObject *_wrap_delete_CvHuMoments(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvHuMoments * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -73120,7 +73461,7 @@ fail:
 
 SWIGINTERN PyObject *CvHuMoments_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvHuMoments, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73148,7 +73489,6 @@ SWIGINTERN PyObject *_wrap_CvConnectedComp_area_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->area = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73159,10 +73499,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConnectedComp_area_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConnectedComp *arg1 = (CvConnectedComp *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConnectedComp_area_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConnectedComp, 0 |  0 );
@@ -73201,7 +73541,6 @@ SWIGINTERN PyObject *_wrap_CvConnectedComp_value_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvScalar * >(argp2);
   if (arg1) (arg1)->value = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73212,10 +73551,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConnectedComp_value_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConnectedComp *arg1 = (CvConnectedComp *) 0 ;
-  CvScalar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvScalar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConnectedComp_value_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConnectedComp, 0 |  0 );
@@ -73254,7 +73593,6 @@ SWIGINTERN PyObject *_wrap_CvConnectedComp_rect_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< CvRect * >(argp2);
   if (arg1) (arg1)->rect = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73265,10 +73603,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConnectedComp_rect_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConnectedComp *arg1 = (CvConnectedComp *) 0 ;
-  CvRect *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRect *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConnectedComp_rect_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConnectedComp, 0 |  0 );
@@ -73315,7 +73653,6 @@ SWIGINTERN PyObject *_wrap_CvConnectedComp_contour_set(PyObject *SWIGUNUSEDPARM(
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->contour = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73326,10 +73663,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConnectedComp_contour_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConnectedComp *arg1 = (CvConnectedComp *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConnectedComp_contour_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConnectedComp, 0 |  0 );
@@ -73381,7 +73718,7 @@ SWIGINTERN PyObject *_wrap_delete_CvConnectedComp(PyObject *SWIGUNUSEDPARM(self)
   arg1 = reinterpret_cast< CvConnectedComp * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -73397,7 +73734,7 @@ fail:
 
 SWIGINTERN PyObject *CvConnectedComp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvConnectedComp, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73425,7 +73762,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_header_size_set(PyObject *SWIGUNUSEDP
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73436,10 +73772,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_header_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73486,7 +73822,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_seq_set(PyObject *SWIGUNUSEDPARM(self
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->seq = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73497,10 +73832,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_seq_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_seq_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73539,7 +73874,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_block_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->block = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73550,10 +73884,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_block_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_block_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73592,7 +73926,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_ptr_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73603,10 +73936,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73645,7 +73978,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_block_min_set(PyObject *SWIGUNUSEDPAR
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_min = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73656,10 +73988,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_block_min_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_block_min_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73698,7 +74030,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_block_max_set(PyObject *SWIGUNUSEDPAR
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73709,10 +74040,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_block_max_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73751,7 +74082,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_delta_index_set(PyObject *SWIGUNUSEDP
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_index = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73762,10 +74092,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_delta_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_delta_index_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73804,7 +74134,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_prev_elem_set(PyObject *SWIGUNUSEDPAR
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->prev_elem = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73815,10 +74144,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_prev_elem_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_prev_elem_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73857,7 +74186,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_code_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< char >(val2);
   if (arg1) (arg1)->code = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73868,10 +74196,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_code_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  char result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_code_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73910,7 +74238,6 @@ SWIGINTERN PyObject *_wrap_CvChainPtReader_pt_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvPoint * >(argp2);
   if (arg1) (arg1)->pt = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -73921,10 +74248,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_pt_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_pt_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -73987,10 +74314,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvChainPtReader_deltas_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  schar (*result)[2] = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar (*result)[2] = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvChainPtReader_deltas_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -74042,7 +74369,7 @@ SWIGINTERN PyObject *_wrap_delete_CvChainPtReader(PyObject *SWIGUNUSEDPARM(self)
   arg1 = reinterpret_cast< CvChainPtReader * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -74058,7 +74385,7 @@ fail:
 
 SWIGINTERN PyObject *CvChainPtReader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvChainPtReader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74086,7 +74413,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_flags_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74097,10 +74423,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74139,7 +74465,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_header_size_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74150,10 +74475,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_header_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74200,7 +74525,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_h_prev_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74211,10 +74535,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_h_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_h_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74261,7 +74585,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_h_next_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74272,10 +74595,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_h_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_h_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74322,7 +74645,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_v_prev_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74333,10 +74655,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_v_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_v_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74383,7 +74705,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_v_next_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74394,10 +74715,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_v_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_v_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74436,7 +74757,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_total_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->total = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74447,10 +74767,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_total_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_total_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74489,7 +74809,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_elem_size_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->elem_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74500,10 +74819,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_elem_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_elem_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74542,7 +74861,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_block_max_set(PyObject *SWIGUNUSEDPARM(
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74553,10 +74871,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_block_max_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74595,7 +74913,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_ptr_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74606,10 +74923,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74648,7 +74965,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_delta_elems_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74659,10 +74975,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_delta_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_delta_elems_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74701,7 +75017,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_storage_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74712,10 +75027,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_storage_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74754,7 +75069,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_free_blocks_set(PyObject *SWIGUNUSEDPAR
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->free_blocks = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74765,10 +75079,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_free_blocks_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_free_blocks_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74807,7 +75121,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_first_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74818,10 +75131,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_first_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74860,7 +75173,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_p1_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvPoint * >(argp2);
   if (arg1) (arg1)->p1 = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74871,10 +75183,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_p1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_p1_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74913,7 +75225,6 @@ SWIGINTERN PyObject *_wrap_CvContourTree_p2_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvPoint * >(argp2);
   if (arg1) (arg1)->p2 = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -74924,10 +75235,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvContourTree_p2_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourTree *arg1 = (CvContourTree *) 0 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvContourTree_p2_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -74979,7 +75290,7 @@ SWIGINTERN PyObject *_wrap_delete_CvContourTree(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvContourTree * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -74995,7 +75306,7 @@ fail:
 
 SWIGINTERN PyObject *CvContourTree_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvContourTree, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75023,7 +75334,6 @@ SWIGINTERN PyObject *_wrap_CvConvexityDefect_start_set(PyObject *SWIGUNUSEDPARM(
   }
   arg2 = reinterpret_cast< CvPoint * >(argp2);
   if (arg1) (arg1)->start = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75034,10 +75344,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConvexityDefect_start_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConvexityDefect *arg1 = (CvConvexityDefect *) 0 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConvexityDefect_start_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConvexityDefect, 0 |  0 );
@@ -75076,7 +75386,6 @@ SWIGINTERN PyObject *_wrap_CvConvexityDefect_end_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvPoint * >(argp2);
   if (arg1) (arg1)->end = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75087,10 +75396,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConvexityDefect_end_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConvexityDefect *arg1 = (CvConvexityDefect *) 0 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConvexityDefect_end_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConvexityDefect, 0 |  0 );
@@ -75129,7 +75438,6 @@ SWIGINTERN PyObject *_wrap_CvConvexityDefect_depth_point_set(PyObject *SWIGUNUSE
   }
   arg2 = reinterpret_cast< CvPoint * >(argp2);
   if (arg1) (arg1)->depth_point = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75140,10 +75448,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConvexityDefect_depth_point_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConvexityDefect *arg1 = (CvConvexityDefect *) 0 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConvexityDefect_depth_point_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConvexityDefect, 0 |  0 );
@@ -75182,7 +75490,6 @@ SWIGINTERN PyObject *_wrap_CvConvexityDefect_depth_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->depth = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75193,10 +75500,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConvexityDefect_depth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConvexityDefect *arg1 = (CvConvexityDefect *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConvexityDefect_depth_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConvexityDefect, 0 |  0 );
@@ -75248,7 +75555,7 @@ SWIGINTERN PyObject *_wrap_delete_CvConvexityDefect(PyObject *SWIGUNUSEDPARM(sel
   arg1 = reinterpret_cast< CvConvexityDefect * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -75264,7 +75571,7 @@ fail:
 
 SWIGINTERN PyObject *CvConvexityDefect_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvConvexityDefect, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75292,7 +75599,6 @@ SWIGINTERN PyObject *_wrap_CvQuadEdge2D_flags_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75303,10 +75609,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvQuadEdge2D_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvQuadEdge2D *arg1 = (CvQuadEdge2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvQuadEdge2D_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvQuadEdge2D, 0 |  0 );
@@ -75362,10 +75668,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvQuadEdge2D_pt_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvQuadEdge2D *arg1 = (CvQuadEdge2D *) 0 ;
-  CvSubdiv2DPoint **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DPoint **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvQuadEdge2D_pt_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvQuadEdge2D, 0 |  0 );
@@ -75421,10 +75727,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvQuadEdge2D_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvQuadEdge2D *arg1 = (CvQuadEdge2D *) 0 ;
-  CvSubdiv2DEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvQuadEdge2D_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvQuadEdge2D, 0 |  0 );
@@ -75476,7 +75782,7 @@ SWIGINTERN PyObject *_wrap_delete_CvQuadEdge2D(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvQuadEdge2D * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -75492,7 +75798,7 @@ fail:
 
 SWIGINTERN PyObject *CvQuadEdge2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvQuadEdge2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75520,7 +75826,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DPoint_flags_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75531,10 +75836,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DPoint_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DPoint *arg1 = (CvSubdiv2DPoint *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DPoint_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DPoint, 0 |  0 );
@@ -75583,7 +75888,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DPoint_first_set(PyObject *SWIGUNUSEDPARM(se
     }
   }
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75594,10 +75898,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DPoint_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DPoint *arg1 = (CvSubdiv2DPoint *) 0 ;
-  CvSubdiv2DEdge result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DPoint_first_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DPoint, 0 |  0 );
@@ -75639,7 +75943,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DPoint_pt_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvPoint2D32f * >(argp2);
   if (arg1) (arg1)->pt = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75650,10 +75953,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DPoint_pt_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DPoint *arg1 = (CvSubdiv2DPoint *) 0 ;
-  CvPoint2D32f *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DPoint_pt_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DPoint, 0 |  0 );
@@ -75705,7 +76008,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSubdiv2DPoint(PyObject *SWIGUNUSEDPARM(self)
   arg1 = reinterpret_cast< CvSubdiv2DPoint * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -75721,7 +76024,7 @@ fail:
 
 SWIGINTERN PyObject *CvSubdiv2DPoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSubdiv2DPoint, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75749,7 +76052,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_flags_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75760,10 +76062,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -75802,7 +76104,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_header_size_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->header_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75813,10 +76114,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_header_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_header_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -75863,7 +76164,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_h_prev_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75874,10 +76174,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_h_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_h_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -75924,7 +76224,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_h_next_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->h_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75935,10 +76234,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_h_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_h_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -75985,7 +76284,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_v_prev_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -75996,10 +76294,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_v_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_v_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76046,7 +76344,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_v_next_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvSeq *) ptr2;
   }
   if (arg1) (arg1)->v_next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76057,10 +76354,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_v_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_v_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76099,7 +76396,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_total_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->total = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76110,10 +76406,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_total_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_total_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76152,7 +76448,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_elem_size_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->elem_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76163,10 +76458,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_elem_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_elem_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76205,7 +76500,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_block_max_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->block_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76216,10 +76510,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_block_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_block_max_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76258,7 +76552,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_ptr_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76269,10 +76562,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76311,7 +76604,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_delta_elems_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76322,10 +76614,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_delta_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_delta_elems_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76364,7 +76656,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_storage_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76375,10 +76666,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_storage_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76417,7 +76708,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_free_blocks_set(PyObject *SWIGUNUSEDPARM(s
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->free_blocks = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76428,10 +76718,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_free_blocks_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_free_blocks_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76470,7 +76760,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_first_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvSeqBlock * >(argp2);
   if (arg1) (arg1)->first = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76481,10 +76770,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_first_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvSeqBlock *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeqBlock *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_first_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76523,7 +76812,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_free_elems_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvSetElem * >(argp2);
   if (arg1) (arg1)->free_elems = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76534,10 +76822,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_free_elems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvSetElem *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSetElem *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_free_elems_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76576,7 +76864,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_active_count_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->active_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76587,10 +76874,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_active_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_active_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76629,7 +76916,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_quad_edges_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->quad_edges = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76640,10 +76926,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_quad_edges_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_quad_edges_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76682,7 +76968,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_is_geometry_valid_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->is_geometry_valid = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76693,10 +76978,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_is_geometry_valid_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_is_geometry_valid_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76745,7 +77030,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_recent_edge_set(PyObject *SWIGUNUSEDPARM(s
     }
   }
   if (arg1) (arg1)->recent_edge = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76756,10 +77040,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_recent_edge_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvSubdiv2DEdge result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_recent_edge_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76801,7 +77085,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_topleft_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvPoint2D32f * >(argp2);
   if (arg1) (arg1)->topleft = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76812,10 +77095,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_topleft_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvPoint2D32f *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_topleft_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76854,7 +77137,6 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_bottomright_set(PyObject *SWIGUNUSEDPARM(s
   }
   arg2 = reinterpret_cast< CvPoint2D32f * >(argp2);
   if (arg1) (arg1)->bottomright = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -76865,10 +77147,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_bottomright_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvPoint2D32f *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_bottomright_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76887,7 +77169,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_edges_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvTypedSeq<CvQuadEdge2D > *arg2 = (CvTypedSeq<CvQuadEdge2D > *) 0 ;
+  CvTypedSeq< CvQuadEdge2D > *arg2 = (CvTypedSeq< CvQuadEdge2D > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -76901,14 +77183,14 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_edges_set(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2D_edges_set" "', argument " "1"" of type '" "CvSubdiv2D *""'"); 
   }
   arg1 = reinterpret_cast< CvSubdiv2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, SWIG_POINTER_DISOWN |  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2D_edges_set" "', argument " "2"" of type '" "CvTypedSeq<CvQuadEdge2D > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2D_edges_set" "', argument " "2"" of type '" "CvTypedSeq< CvQuadEdge2D > *""'"); 
   }
-  arg2 = reinterpret_cast< CvTypedSeq<CvQuadEdge2D > * >(argp2);
+  arg2 = reinterpret_cast< CvTypedSeq< CvQuadEdge2D > * >(argp2);
   {
     try {
-      CvSubdiv2D_typed_edges_set(arg1,arg2);
+      CvSubdiv2D_typed_edges_set(arg1,arg2); 
     } 
     catch (...) 
     {
@@ -76925,10 +77207,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_edges_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvTypedSeq<CvQuadEdge2D > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvQuadEdge2D > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_edges_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76938,14 +77220,14 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_edges_get(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvSubdiv2D * >(argp1);
   {
     try {
-      result = (CvTypedSeq<CvQuadEdge2D > *)CvSubdiv2D_typed_edges_get(arg1); 
+      result = (CvTypedSeq< CvQuadEdge2D > *)CvSubdiv2D_typed_edges_get(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -76955,10 +77237,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_typed_edges_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvTypedSeq<CvQuadEdge2D > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvQuadEdge2D > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2D_typed_edges_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -76968,14 +77250,14 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_typed_edges_get(PyObject *SWIGUNUSEDPARM(s
   arg1 = reinterpret_cast< CvSubdiv2D * >(argp1);
   {
     try {
-      result = (CvTypedSeq<CvQuadEdge2D > *)CvSubdiv2D_typed_edges_get(arg1); 
+      result = (CvTypedSeq< CvQuadEdge2D > *)CvSubdiv2D_typed_edges_get(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -76985,7 +77267,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2D_typed_edges_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
-  CvTypedSeq<CvQuadEdge2D > *arg2 = (CvTypedSeq<CvQuadEdge2D > *) 0 ;
+  CvTypedSeq< CvQuadEdge2D > *arg2 = (CvTypedSeq< CvQuadEdge2D > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -76999,11 +77281,11 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2D_typed_edges_set(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2D_typed_edges_set" "', argument " "1"" of type '" "CvSubdiv2D *""'"); 
   }
   arg1 = reinterpret_cast< CvSubdiv2D * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2D_typed_edges_set" "', argument " "2"" of type '" "CvTypedSeq<CvQuadEdge2D > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSubdiv2D_typed_edges_set" "', argument " "2"" of type '" "CvTypedSeq< CvQuadEdge2D > *""'"); 
   }
-  arg2 = reinterpret_cast< CvTypedSeq<CvQuadEdge2D > * >(argp2);
+  arg2 = reinterpret_cast< CvTypedSeq< CvQuadEdge2D > * >(argp2);
   {
     try {
       CvSubdiv2D_typed_edges_set(arg1,arg2); 
@@ -77056,7 +77338,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSubdiv2D(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvSubdiv2D * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -77072,7 +77354,7 @@ fail:
 
 SWIGINTERN PyObject *CvSubdiv2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSubdiv2D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -77124,10 +77406,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMatrix3_m_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMatrix3 *arg1 = (CvMatrix3 *) 0 ;
-  float (*result)[3] = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float (*result)[3] = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMatrix3_m_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMatrix3, 0 |  0 );
@@ -77179,7 +77461,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMatrix3(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< CvMatrix3 * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -77195,7 +77477,7 @@ fail:
 
 SWIGINTERN PyObject *CvMatrix3_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMatrix3, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -77223,7 +77505,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_MP_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->MP = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77234,10 +77515,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_MP_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_MP_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77276,7 +77557,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_DP_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->DP = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77287,10 +77567,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_DP_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_DP_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77329,7 +77609,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_DynamMatr_set(PyObject *SWIGUNUSEDPARM
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->DynamMatr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77340,10 +77619,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_DynamMatr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_DynamMatr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77382,7 +77661,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_State_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->State = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77393,10 +77671,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_State_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_State_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77435,7 +77713,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_SamplesNum_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->SamplesNum = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77446,10 +77723,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_SamplesNum_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_SamplesNum_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77490,7 +77767,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_flSamples_set(PyObject *SWIGUNUSEDPARM
     arg2=&buffer2;
   }
   if (arg1) (arg1)->flSamples = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77501,10 +77777,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_flSamples_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  float **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_flSamples_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77545,7 +77821,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_flNewSamples_set(PyObject *SWIGUNUSEDP
     arg2=&buffer2;
   }
   if (arg1) (arg1)->flNewSamples = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77556,10 +77831,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_flNewSamples_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  float **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_flNewSamples_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77598,7 +77873,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_flConfidence_set(PyObject *SWIGUNUSEDP
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->flConfidence = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77609,10 +77883,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_flConfidence_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_flConfidence_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77651,7 +77925,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_flCumulative_set(PyObject *SWIGUNUSEDP
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->flCumulative = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77662,10 +77935,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_flCumulative_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_flCumulative_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77704,7 +77977,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_Temp_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->Temp = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77715,10 +77987,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_Temp_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_Temp_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77757,7 +78029,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_RandomSample_set(PyObject *SWIGUNUSEDP
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->RandomSample = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77768,10 +78039,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_RandomSample_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_RandomSample_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77810,7 +78081,6 @@ SWIGINTERN PyObject *_wrap_CvConDensation_RandS_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< CvRandState * >(argp2);
   if (arg1) (arg1)->RandS = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77821,10 +78091,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvConDensation_RandS_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvConDensation *arg1 = (CvConDensation *) 0 ;
-  CvRandState *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRandState *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvConDensation_RandS_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvConDensation, 0 |  0 );
@@ -77855,7 +78125,7 @@ SWIGINTERN PyObject *_wrap_delete_CvConDensation(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvConDensation * >(argp1);
   {
     try {
-      delete_CvConDensation(arg1);
+      delete_CvConDensation(arg1); 
     } 
     catch (...) 
     {
@@ -77871,7 +78141,7 @@ fail:
 
 SWIGINTERN PyObject *CvConDensation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvConDensation, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -77899,7 +78169,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_MP_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->MP = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77910,10 +78179,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_MP_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_MP_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -77952,7 +78221,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_DP_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->DP = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -77963,10 +78231,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_DP_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_DP_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78005,7 +78273,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_CP_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->CP = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78016,10 +78283,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_CP_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_CP_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78058,7 +78325,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_PosterState_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->PosterState = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78069,10 +78335,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_PosterState_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_PosterState_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78111,7 +78377,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_PriorState_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->PriorState = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78122,10 +78387,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_PriorState_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_PriorState_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78164,7 +78429,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_DynamMatr_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->DynamMatr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78175,10 +78439,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_DynamMatr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_DynamMatr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78217,7 +78481,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_MeasurementMatr_set(PyObject *SWIGUNUSEDPARM
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->MeasurementMatr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78228,10 +78491,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_MeasurementMatr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_MeasurementMatr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78270,7 +78533,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_MNCovariance_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->MNCovariance = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78281,10 +78543,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_MNCovariance_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_MNCovariance_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78323,7 +78585,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_PNCovariance_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->PNCovariance = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78334,10 +78595,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_PNCovariance_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_PNCovariance_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78376,7 +78637,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_KalmGainMatr_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->KalmGainMatr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78387,10 +78647,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_KalmGainMatr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_KalmGainMatr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78429,7 +78689,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_PriorErrorCovariance_set(PyObject *SWIGUNUSE
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->PriorErrorCovariance = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78440,10 +78699,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_PriorErrorCovariance_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_PriorErrorCovariance_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78482,7 +78741,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_PosterErrorCovariance_set(PyObject *SWIGUNUS
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->PosterErrorCovariance = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78493,10 +78751,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_PosterErrorCovariance_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_PosterErrorCovariance_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78535,7 +78793,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_Temp1_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->Temp1 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78546,10 +78803,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_Temp1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_Temp1_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78588,7 +78845,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_Temp2_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->Temp2 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -78599,10 +78855,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_Temp2_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_Temp2_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78638,7 +78894,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_state_pre_set(PyObject *SWIGUNUSEDPARM(self)
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->state_pre = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -78661,10 +78916,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_state_pre_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_state_pre_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78700,7 +78955,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_state_post_set(PyObject *SWIGUNUSEDPARM(self
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->state_post = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -78723,10 +78977,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_state_post_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_state_post_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78762,7 +79016,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_transition_matrix_set(PyObject *SWIGUNUSEDPA
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->transition_matrix = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -78785,10 +79038,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_transition_matrix_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_transition_matrix_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78824,7 +79077,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_control_matrix_set(PyObject *SWIGUNUSEDPARM(
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->control_matrix = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -78847,10 +79099,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_control_matrix_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_control_matrix_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78886,7 +79138,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_measurement_matrix_set(PyObject *SWIGUNUSEDP
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->measurement_matrix = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -78909,10 +79160,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_measurement_matrix_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_measurement_matrix_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -78948,7 +79199,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_process_noise_cov_set(PyObject *SWIGUNUSEDPA
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->process_noise_cov = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -78971,10 +79221,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_process_noise_cov_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_process_noise_cov_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79010,7 +79260,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_measurement_noise_cov_set(PyObject *SWIGUNUS
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->measurement_noise_cov = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79033,10 +79282,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_measurement_noise_cov_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_measurement_noise_cov_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79072,7 +79321,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_error_cov_pre_set(PyObject *SWIGUNUSEDPARM(s
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->error_cov_pre = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79095,10 +79343,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_error_cov_pre_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_error_cov_pre_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79134,7 +79382,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_gain_set(PyObject *SWIGUNUSEDPARM(self), PyO
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->gain = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79157,10 +79404,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_gain_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_gain_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79196,7 +79443,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_error_cov_post_set(PyObject *SWIGUNUSEDPARM(
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->error_cov_post = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79219,10 +79465,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_error_cov_post_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_error_cov_post_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79258,7 +79504,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_temp1_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->temp1 = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79281,10 +79526,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_temp1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_temp1_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79320,7 +79565,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_temp2_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->temp2 = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79343,10 +79587,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_temp2_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_temp2_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79382,7 +79626,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_temp3_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->temp3 = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79405,10 +79648,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_temp3_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_temp3_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79444,7 +79687,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_temp4_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->temp4 = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79467,10 +79709,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_temp4_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_temp4_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79506,7 +79748,6 @@ SWIGINTERN PyObject *_wrap_CvKalman_temp5_set(PyObject *SWIGUNUSEDPARM(self), Py
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->temp5 = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -79529,10 +79770,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKalman_temp5_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKalman_temp5_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -79563,7 +79804,7 @@ SWIGINTERN PyObject *_wrap_delete_CvKalman(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = reinterpret_cast< CvKalman * >(argp1);
   {
     try {
-      delete_CvKalman(arg1);
+      delete_CvKalman(arg1); 
     } 
     catch (...) 
     {
@@ -79579,7 +79820,7 @@ fail:
 
 SWIGINTERN PyObject *CvKalman_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvKalman, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -79607,7 +79848,6 @@ SWIGINTERN PyObject *_wrap_CvHaarFeature_tilted_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->tilted = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -79618,10 +79858,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarFeature_tilted_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarFeature *arg1 = (CvHaarFeature *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarFeature_tilted_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarFeature, 0 |  0 );
@@ -79640,10 +79880,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarFeature_rect_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarFeature *arg1 = (CvHaarFeature *) 0 ;
-  CvHaarFeature_rect *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvHaarFeature_rect *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarFeature_rect_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarFeature, 0 |  0 );
@@ -79695,7 +79935,7 @@ SWIGINTERN PyObject *_wrap_delete_CvHaarFeature(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvHaarFeature * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -79711,7 +79951,7 @@ fail:
 
 SWIGINTERN PyObject *CvHaarFeature_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvHaarFeature, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -79739,7 +79979,6 @@ SWIGINTERN PyObject *_wrap_CvHaarFeature_rect_r_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< CvRect * >(argp2);
   if (arg1) (arg1)->r = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -79750,10 +79989,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarFeature_rect_r_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarFeature_rect *arg1 = (CvHaarFeature_rect *) 0 ;
-  CvRect *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRect *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarFeature_rect_r_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarFeature_rect, 0 |  0 );
@@ -79792,7 +80031,6 @@ SWIGINTERN PyObject *_wrap_CvHaarFeature_rect_weight_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->weight = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -79803,10 +80041,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarFeature_rect_weight_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarFeature_rect *arg1 = (CvHaarFeature_rect *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarFeature_rect_weight_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarFeature_rect, 0 |  0 );
@@ -79858,7 +80096,7 @@ SWIGINTERN PyObject *_wrap_delete_CvHaarFeature_rect(PyObject *SWIGUNUSEDPARM(se
   arg1 = reinterpret_cast< CvHaarFeature_rect * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -79874,7 +80112,7 @@ fail:
 
 SWIGINTERN PyObject *CvHaarFeature_rect_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvHaarFeature_rect, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -79902,7 +80140,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifier_count_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -79913,10 +80150,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifier_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifier *arg1 = (CvHaarClassifier *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifier_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifier, 0 |  0 );
@@ -79955,7 +80192,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifier_haar_feature_set(PyObject *SWIGUNUSE
   }
   arg2 = reinterpret_cast< CvHaarFeature * >(argp2);
   if (arg1) (arg1)->haar_feature = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -79966,10 +80202,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifier_haar_feature_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifier *arg1 = (CvHaarClassifier *) 0 ;
-  CvHaarFeature *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvHaarFeature *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifier_haar_feature_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifier, 0 |  0 );
@@ -80008,7 +80244,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifier_threshold_set(PyObject *SWIGUNUSEDPA
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->threshold = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80019,10 +80254,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifier_threshold_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifier *arg1 = (CvHaarClassifier *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifier_threshold_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifier, 0 |  0 );
@@ -80061,7 +80296,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifier_left_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->left = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80072,10 +80306,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifier_left_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifier *arg1 = (CvHaarClassifier *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifier_left_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifier, 0 |  0 );
@@ -80114,7 +80348,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifier_right_set(PyObject *SWIGUNUSEDPARM(s
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->right = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80125,10 +80358,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifier_right_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifier *arg1 = (CvHaarClassifier *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifier_right_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifier, 0 |  0 );
@@ -80167,7 +80400,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifier_alpha_set(PyObject *SWIGUNUSEDPARM(s
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->alpha = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80178,10 +80410,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifier_alpha_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifier *arg1 = (CvHaarClassifier *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifier_alpha_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifier, 0 |  0 );
@@ -80233,7 +80465,7 @@ SWIGINTERN PyObject *_wrap_delete_CvHaarClassifier(PyObject *SWIGUNUSEDPARM(self
   arg1 = reinterpret_cast< CvHaarClassifier * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -80249,7 +80481,7 @@ fail:
 
 SWIGINTERN PyObject *CvHaarClassifier_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvHaarClassifier, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80277,7 +80509,6 @@ SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_count_set(PyObject *SWIGUNUSEDP
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80288,10 +80519,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarStageClassifier *arg1 = (CvHaarStageClassifier *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarStageClassifier_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarStageClassifier, 0 |  0 );
@@ -80330,7 +80561,6 @@ SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_threshold_set(PyObject *SWIGUNU
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->threshold = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80341,10 +80571,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_threshold_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarStageClassifier *arg1 = (CvHaarStageClassifier *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarStageClassifier_threshold_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarStageClassifier, 0 |  0 );
@@ -80383,7 +80613,6 @@ SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_classifier_set(PyObject *SWIGUN
   }
   arg2 = reinterpret_cast< CvHaarClassifier * >(argp2);
   if (arg1) (arg1)->classifier = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80394,10 +80623,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_classifier_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarStageClassifier *arg1 = (CvHaarStageClassifier *) 0 ;
-  CvHaarClassifier *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvHaarClassifier *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarStageClassifier_classifier_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarStageClassifier, 0 |  0 );
@@ -80436,7 +80665,6 @@ SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_next_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80447,10 +80675,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarStageClassifier *arg1 = (CvHaarStageClassifier *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarStageClassifier_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarStageClassifier, 0 |  0 );
@@ -80489,7 +80717,6 @@ SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_child_set(PyObject *SWIGUNUSEDP
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->child = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80500,10 +80727,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_child_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarStageClassifier *arg1 = (CvHaarStageClassifier *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarStageClassifier_child_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarStageClassifier, 0 |  0 );
@@ -80542,7 +80769,6 @@ SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_parent_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->parent = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80553,10 +80779,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarStageClassifier_parent_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarStageClassifier *arg1 = (CvHaarStageClassifier *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarStageClassifier_parent_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarStageClassifier, 0 |  0 );
@@ -80608,7 +80834,7 @@ SWIGINTERN PyObject *_wrap_delete_CvHaarStageClassifier(PyObject *SWIGUNUSEDPARM
   arg1 = reinterpret_cast< CvHaarStageClassifier * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -80624,7 +80850,7 @@ fail:
 
 SWIGINTERN PyObject *CvHaarStageClassifier_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvHaarStageClassifier, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80652,7 +80878,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_flags_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->flags = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80663,10 +80888,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_flags_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifierCascade_flags_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
@@ -80705,7 +80930,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_count_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80716,10 +80940,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifierCascade_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
@@ -80758,7 +80982,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_orig_window_size_set(PyObject
   }
   arg2 = reinterpret_cast< CvSize * >(argp2);
   if (arg1) (arg1)->orig_window_size = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80769,10 +80992,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_orig_window_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  CvSize *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSize *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifierCascade_orig_window_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
@@ -80811,7 +81034,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_real_window_size_set(PyObject
   }
   arg2 = reinterpret_cast< CvSize * >(argp2);
   if (arg1) (arg1)->real_window_size = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80822,10 +81044,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_real_window_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  CvSize *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSize *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifierCascade_real_window_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
@@ -80864,7 +81086,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_scale_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->scale = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80875,10 +81096,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_scale_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifierCascade_scale_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
@@ -80917,7 +81138,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_stage_classifier_set(PyObject
   }
   arg2 = reinterpret_cast< CvHaarStageClassifier * >(argp2);
   if (arg1) (arg1)->stage_classifier = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80928,10 +81148,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_stage_classifier_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  CvHaarStageClassifier *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvHaarStageClassifier *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifierCascade_stage_classifier_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
@@ -80970,7 +81190,6 @@ SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_hid_cascade_set(PyObject *SWI
   }
   arg2 = reinterpret_cast< CvHidHaarClassifierCascade * >(argp2);
   if (arg1) (arg1)->hid_cascade = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -80981,10 +81200,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvHaarClassifierCascade_hid_cascade_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
-  CvHidHaarClassifierCascade *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvHidHaarClassifierCascade *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvHaarClassifierCascade_hid_cascade_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
@@ -81015,7 +81234,7 @@ SWIGINTERN PyObject *_wrap_delete_CvHaarClassifierCascade(PyObject *SWIGUNUSEDPA
   arg1 = reinterpret_cast< CvHaarClassifierCascade * >(argp1);
   {
     try {
-      delete_CvHaarClassifierCascade(arg1);
+      delete_CvHaarClassifierCascade(arg1); 
     } 
     catch (...) 
     {
@@ -81031,7 +81250,7 @@ fail:
 
 SWIGINTERN PyObject *CvHaarClassifierCascade_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvHaarClassifierCascade, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81059,7 +81278,6 @@ SWIGINTERN PyObject *_wrap_CvAvgComp_rect_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< CvRect * >(argp2);
   if (arg1) (arg1)->rect = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -81070,10 +81288,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvAvgComp_rect_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvAvgComp *arg1 = (CvAvgComp *) 0 ;
-  CvRect *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRect *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvAvgComp_rect_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvAvgComp, 0 |  0 );
@@ -81112,7 +81330,6 @@ SWIGINTERN PyObject *_wrap_CvAvgComp_neighbors_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->neighbors = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -81123,10 +81340,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvAvgComp_neighbors_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvAvgComp *arg1 = (CvAvgComp *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvAvgComp_neighbors_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvAvgComp, 0 |  0 );
@@ -81178,7 +81395,7 @@ SWIGINTERN PyObject *_wrap_delete_CvAvgComp(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< CvAvgComp * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -81194,7 +81411,7 @@ fail:
 
 SWIGINTERN PyObject *CvAvgComp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvAvgComp, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81773,7 +81990,6 @@ SWIGINTERN PyObject *_wrap_cvCreatePyramid(PyObject *SWIGUNUSEDPARM(self), PyObj
   CvArr *arg5 = (CvArr *) 0 ;
   int arg6 = (int) 1 ;
   int arg7 = (int) CV_GAUSSIAN_5x5 ;
-  CvMat **result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -81793,6 +82009,7 @@ SWIGINTERN PyObject *_wrap_cvCreatePyramid(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvMat **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|OOOO:cvCreatePyramid",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
@@ -82684,7 +82901,6 @@ SWIGINTERN PyObject *_wrap_cvGetAffineTransform(PyObject *SWIGUNUSEDPARM(self),
   CvPoint2D32f *arg1 = (CvPoint2D32f *) 0 ;
   CvPoint2D32f *arg2 = (CvPoint2D32f *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -82693,6 +82909,7 @@ SWIGINTERN PyObject *_wrap_cvGetAffineTransform(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvGetAffineTransform",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
@@ -82742,7 +82959,6 @@ SWIGINTERN PyObject *_wrap_cv2DRotationMatrix(PyObject *SWIGUNUSEDPARM(self), Py
   double arg2 ;
   double arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvMat *result = 0 ;
   CvPoint2D32f temp1 ;
   double val2 ;
   int ecode2 = 0 ;
@@ -82753,6 +82969,7 @@ SWIGINTERN PyObject *_wrap_cv2DRotationMatrix(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cv2DRotationMatrix",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -82918,7 +83135,6 @@ SWIGINTERN PyObject *_wrap_cvGetPerspectiveTransform(PyObject *SWIGUNUSEDPARM(se
   CvPoint2D32f *arg1 = (CvPoint2D32f *) 0 ;
   CvPoint2D32f *arg2 = (CvPoint2D32f *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -82927,6 +83143,7 @@ SWIGINTERN PyObject *_wrap_cvGetPerspectiveTransform(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvGetPerspectiveTransform",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
@@ -83404,7 +83621,6 @@ SWIGINTERN PyObject *_wrap_cvCreateStructuringElementEx(PyObject *SWIGUNUSEDPARM
   int arg4 ;
   int arg5 ;
   int *arg6 = (int *) NULL ;
-  IplConvKernel *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -83423,6 +83639,7 @@ SWIGINTERN PyObject *_wrap_cvCreateStructuringElementEx(PyObject *SWIGUNUSEDPARM
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  IplConvKernel *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:cvCreateStructuringElementEx",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -83811,7 +84028,6 @@ SWIGINTERN PyObject *_wrap_cvGetSpatialMoment(PyObject *SWIGUNUSEDPARM(self), Py
   CvMoments *arg1 = (CvMoments *) 0 ;
   int arg2 ;
   int arg3 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -83821,6 +84037,7 @@ SWIGINTERN PyObject *_wrap_cvGetSpatialMoment(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvGetSpatialMoment",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -83859,7 +84076,6 @@ SWIGINTERN PyObject *_wrap_cvGetCentralMoment(PyObject *SWIGUNUSEDPARM(self), Py
   CvMoments *arg1 = (CvMoments *) 0 ;
   int arg2 ;
   int arg3 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -83869,6 +84085,7 @@ SWIGINTERN PyObject *_wrap_cvGetCentralMoment(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvGetCentralMoment",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -83907,7 +84124,6 @@ SWIGINTERN PyObject *_wrap_cvGetNormalizedCentralMoment(PyObject *SWIGUNUSEDPARM
   CvMoments *arg1 = (CvMoments *) 0 ;
   int arg2 ;
   int arg3 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -83917,6 +84133,7 @@ SWIGINTERN PyObject *_wrap_cvGetNormalizedCentralMoment(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvGetNormalizedCentralMoment",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMoments, 0 |  0 );
@@ -83995,7 +84212,6 @@ SWIGINTERN PyObject *_wrap_cvSampleLine(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvPoint arg3 ;
   void *arg4 = (void *) 0 ;
   int arg5 = (int) 8 ;
-  int result;
   bool freearg1 = false ;
   CvPoint temp2 ;
   CvPoint temp3 ;
@@ -84007,6 +84223,7 @@ SWIGINTERN PyObject *_wrap_cvSampleLine(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:cvSampleLine",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -84356,7 +84573,6 @@ SWIGINTERN PyObject *_wrap_cvCalcEMD2(PyObject *SWIGUNUSEDPARM(self), PyObject *
   CvArr *arg6 = (CvArr *) NULL ;
   float *arg7 = (float *) NULL ;
   void *arg8 = (void *) NULL ;
-  float result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   int val3 ;
@@ -84374,6 +84590,7 @@ SWIGINTERN PyObject *_wrap_cvCalcEMD2(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|OOOOO:cvCalcEMD2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
@@ -84499,7 +84716,6 @@ SWIGINTERN PyObject *_wrap_cvFindContoursUntyped(PyObject *SWIGUNUSEDPARM(self),
   int arg5 = (int) 1 ;
   int arg6 = (int) 2 ;
   CvPoint arg7 = (CvPoint) cvPoint(0,0) ;
-  int result;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -84517,6 +84733,7 @@ SWIGINTERN PyObject *_wrap_cvFindContoursUntyped(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   {
     arg3 = &seq3;
@@ -84621,7 +84838,6 @@ SWIGINTERN PyObject *_wrap_cvStartFindContours(PyObject *SWIGUNUSEDPARM(self), P
   int arg4 = (int) 1 ;
   int arg5 = (int) 2 ;
   CvPoint arg6 = (CvPoint) cvPoint(0,0) ;
-  CvContourScanner result;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -84638,6 +84854,7 @@ SWIGINTERN PyObject *_wrap_cvStartFindContours(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvContourScanner result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OOOO:cvStartFindContours",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -84725,10 +84942,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvFindNextContour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourScanner arg1 = (CvContourScanner) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvFindNextContour",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p__CvContourScanner, 0 |  0 );
@@ -84801,10 +85018,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvEndFindContours(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvContourScanner *arg1 = (CvContourScanner *) 0 ;
-  CvSeq *result = 0 ;
   void *vptr1 ;
   CvContourScanner buffer1 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvEndFindContours",&obj0)) SWIG_fail;
   {
@@ -84838,7 +85055,6 @@ SWIGINTERN PyObject *_wrap_cvApproxChainsUntyped(PyObject *SWIGUNUSEDPARM(self),
   double arg4 = (double) 0 ;
   int arg5 = (int) 0 ;
   int arg6 = (int) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -84856,6 +85072,7 @@ SWIGINTERN PyObject *_wrap_cvApproxChainsUntyped(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OOOO:cvApproxChainsUntyped",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -84962,10 +85179,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvReadChainPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvChainPtReader *arg1 = (CvChainPtReader *) 0 ;
-  CvPoint result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvReadChainPoint",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvChainPtReader, 0 |  0 );
@@ -85972,7 +86189,6 @@ SWIGINTERN PyObject *_wrap_cvEstimateRigidTransform(PyObject *SWIGUNUSEDPARM(sel
   CvArr *arg2 = (CvArr *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   int arg4 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -85982,6 +86198,7 @@ SWIGINTERN PyObject *_wrap_cvEstimateRigidTransform(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvEstimateRigidTransform",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -86248,7 +86465,6 @@ SWIGINTERN PyObject *_wrap_cvCalcGlobalOrientation(PyObject *SWIGUNUSEDPARM(self
   CvArr *arg3 = (CvArr *) 0 ;
   double arg4 ;
   double arg5 ;
-  double result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -86261,6 +86477,7 @@ SWIGINTERN PyObject *_wrap_cvCalcGlobalOrientation(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvCalcGlobalOrientation",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -86704,7 +86921,6 @@ SWIGINTERN PyObject *_wrap_cvCamShift(PyObject *SWIGUNUSEDPARM(self), PyObject *
   CvTermCriteria arg3 ;
   CvConnectedComp *arg4 = (CvConnectedComp *) 0 ;
   CvBox2D *arg5 = (CvBox2D *) NULL ;
-  int result;
   bool freearg1 = false ;
   CvRect temp2 ;
   CvTermCriteria temp3 ;
@@ -86717,6 +86933,7 @@ SWIGINTERN PyObject *_wrap_cvCamShift(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:cvCamShift",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -86812,7 +87029,6 @@ SWIGINTERN PyObject *_wrap_cvMeanShift(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvRect arg2 ;
   CvTermCriteria arg3 ;
   CvConnectedComp *arg4 = (CvConnectedComp *) 0 ;
-  int result;
   bool freearg1 = false ;
   CvRect temp2 ;
   CvTermCriteria temp3 ;
@@ -86822,6 +87038,7 @@ SWIGINTERN PyObject *_wrap_cvMeanShift(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvMeanShift",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -86909,7 +87126,6 @@ SWIGINTERN PyObject *_wrap_cvCreateConDensation(PyObject *SWIGUNUSEDPARM(self),
   int arg1 ;
   int arg2 ;
   int arg3 ;
-  CvConDensation *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -86919,6 +87135,7 @@ SWIGINTERN PyObject *_wrap_cvCreateConDensation(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvConDensation *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvCreateConDensation",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -87051,7 +87268,6 @@ SWIGINTERN PyObject *_wrap_cvCreateKalman(PyObject *SWIGUNUSEDPARM(self), PyObje
   int arg1 ;
   int arg2 ;
   int arg3 = (int) 0 ;
-  CvKalman *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -87061,6 +87277,7 @@ SWIGINTERN PyObject *_wrap_cvCreateKalman(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvKalman *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvCreateKalman",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -87100,12 +87317,12 @@ SWIGINTERN PyObject *_wrap_cvKalmanPredict(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
   CvMat *arg2 = (CvMat *) NULL ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvKalmanPredict",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -87150,12 +87367,12 @@ SWIGINTERN PyObject *_wrap_cvKalmanCorrect(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject *resultobj = 0;
   CvKalman *arg1 = (CvKalman *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvKalmanCorrect",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKalman, 0 |  0 );
@@ -87254,7 +87471,6 @@ SWIGINTERN PyObject *_wrap_cvCreateSubdiv2D(PyObject *SWIGUNUSEDPARM(self), PyOb
   int arg3 ;
   int arg4 ;
   CvMemStorage *arg5 = (CvMemStorage *) 0 ;
-  CvSubdiv2D *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -87270,6 +87486,7 @@ SWIGINTERN PyObject *_wrap_cvCreateSubdiv2D(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvSubdiv2D *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvCreateSubdiv2D",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -87317,12 +87534,12 @@ SWIGINTERN PyObject *_wrap_cvCreateSubdivDelaunay2D(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   CvRect arg1 ;
   CvMemStorage *arg2 = (CvMemStorage *) 0 ;
-  CvSubdiv2D *result = 0 ;
   CvRect temp1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSubdiv2D *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvCreateSubdivDelaunay2D",&obj0,&obj1)) SWIG_fail;
   {
@@ -87371,12 +87588,12 @@ SWIGINTERN PyObject *_wrap_cvSubdivDelaunay2DInsert(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
   CvPoint2D32f arg2 ;
-  CvSubdiv2DPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   CvPoint2D32f temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSubdiv2DPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvSubdivDelaunay2DInsert",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -87427,7 +87644,6 @@ SWIGINTERN PyObject *_wrap_cvSubdiv2DLocate(PyObject *SWIGUNUSEDPARM(self), PyOb
   CvPoint2D32f arg2 ;
   CvSubdiv2DEdge *arg3 = (CvSubdiv2DEdge *) 0 ;
   CvSubdiv2DPoint **arg4 = (CvSubdiv2DPoint **) NULL ;
-  CvSubdiv2DPointLocation result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   CvPoint2D32f temp2 ;
@@ -87435,6 +87651,7 @@ SWIGINTERN PyObject *_wrap_cvSubdiv2DLocate(PyObject *SWIGUNUSEDPARM(self), PyOb
   CvSubdiv2DPoint *tmpVertex3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSubdiv2DPointLocation result;
   
   {
     arg3 = &tmpEdge3;
@@ -87561,12 +87778,12 @@ SWIGINTERN PyObject *_wrap_cvFindNearestPoint2D(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvSubdiv2D *arg1 = (CvSubdiv2D *) 0 ;
   CvPoint2D32f arg2 ;
-  CvSubdiv2DPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   CvPoint2D32f temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSubdiv2DPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvFindNearestPoint2D",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2D, 0 |  0 );
@@ -87614,11 +87831,11 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSubdiv2DNextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge arg1 ;
-  CvSubdiv2DEdge result;
   CvSubdiv2DEdge_Wrapper *wrapper1 ;
   CvQuadEdge2D *qedge1 ;
   void *vptr1 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvSubdiv2DNextEdge",&obj0)) SWIG_fail;
   {
@@ -87658,7 +87875,6 @@ SWIGINTERN PyObject *_wrap_cvSubdiv2DRotateEdge(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvSubdiv2DEdge arg1 ;
   int arg2 ;
-  CvSubdiv2DEdge result;
   CvSubdiv2DEdge_Wrapper *wrapper1 ;
   CvQuadEdge2D *qedge1 ;
   void *vptr1 ;
@@ -87666,6 +87882,7 @@ SWIGINTERN PyObject *_wrap_cvSubdiv2DRotateEdge(PyObject *SWIGUNUSEDPARM(self),
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSubdiv2DEdge result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvSubdiv2DRotateEdge",&obj0,&obj1)) SWIG_fail;
   {
@@ -87709,11 +87926,11 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSubdiv2DSymEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge arg1 ;
-  CvSubdiv2DEdge result;
   CvSubdiv2DEdge_Wrapper *wrapper1 ;
   CvQuadEdge2D *qedge1 ;
   void *vptr1 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvSubdiv2DSymEdge",&obj0)) SWIG_fail;
   {
@@ -87753,7 +87970,6 @@ SWIGINTERN PyObject *_wrap_cvSubdiv2DGetEdge(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   CvSubdiv2DEdge arg1 ;
   CvNextEdgeType arg2 ;
-  CvSubdiv2DEdge result;
   CvSubdiv2DEdge_Wrapper *wrapper1 ;
   CvQuadEdge2D *qedge1 ;
   void *vptr1 ;
@@ -87761,6 +87977,7 @@ SWIGINTERN PyObject *_wrap_cvSubdiv2DGetEdge(PyObject *SWIGUNUSEDPARM(self), PyO
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSubdiv2DEdge result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvSubdiv2DGetEdge",&obj0,&obj1)) SWIG_fail;
   {
@@ -87804,11 +88021,11 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSubdiv2DEdgeOrg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge arg1 ;
-  CvSubdiv2DPoint *result = 0 ;
   CvSubdiv2DEdge_Wrapper *wrapper1 ;
   CvQuadEdge2D *qedge1 ;
   void *vptr1 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvSubdiv2DEdgeOrg",&obj0)) SWIG_fail;
   {
@@ -87844,11 +88061,11 @@ fail:
 SWIGINTERN PyObject *_wrap_cvSubdiv2DEdgeDst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge arg1 ;
-  CvSubdiv2DPoint *result = 0 ;
   CvSubdiv2DEdge_Wrapper *wrapper1 ;
   CvQuadEdge2D *qedge1 ;
   void *vptr1 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvSubdiv2DEdgeDst",&obj0)) SWIG_fail;
   {
@@ -87886,13 +88103,13 @@ SWIGINTERN PyObject *_wrap_cvTriangleArea(PyObject *SWIGUNUSEDPARM(self), PyObje
   CvPoint2D32f arg1 ;
   CvPoint2D32f arg2 ;
   CvPoint2D32f arg3 ;
-  double result;
   CvPoint2D32f temp1 ;
   CvPoint2D32f temp2 ;
   CvPoint2D32f temp3 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvTriangleArea",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -87983,7 +88200,6 @@ SWIGINTERN PyObject *_wrap_cvFindDominantPoints(PyObject *SWIGUNUSEDPARM(self),
   double arg5 = (double) 0 ;
   double arg6 = (double) 0 ;
   double arg7 = (double) 0 ;
-  CvSeq *result = 0 ;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -88004,6 +88220,7 @@ SWIGINTERN PyObject *_wrap_cvFindDominantPoints(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OOOOO:cvFindDominantPoints",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
@@ -88081,7 +88298,6 @@ SWIGINTERN PyObject *_wrap_cvArcLength(PyObject *SWIGUNUSEDPARM(self), PyObject
   void *arg1 = (void *) 0 ;
   CvSlice arg2 = (CvSlice) cvSlice(0, 0x3fffffff) ;
   int arg3 = (int) -1 ;
-  double result;
   int res1 ;
   CvSlice temp2 ;
   int val3 ;
@@ -88089,6 +88305,7 @@ SWIGINTERN PyObject *_wrap_cvArcLength(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OO:cvArcLength",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -88145,12 +88362,12 @@ SWIGINTERN PyObject *_wrap_cvBoundingRect(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   int arg2 = (int) 0 ;
-  CvRect result;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvRect result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvBoundingRect",&obj0,&obj1)) SWIG_fail;
   {
@@ -88197,11 +88414,11 @@ SWIGINTERN PyObject *_wrap_cvContourArea(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   CvSlice arg2 = (CvSlice) cvSlice(0, 0x3fffffff) ;
-  double result;
   bool freearg1 = false ;
   CvSlice temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvContourArea",&obj0,&obj1)) SWIG_fail;
   {
@@ -88264,12 +88481,12 @@ SWIGINTERN PyObject *_wrap_cvMinAreaRect2(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
   CvMemStorage *arg2 = (CvMemStorage *) NULL ;
-  CvBox2D result;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvBox2D result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvMinAreaRect2",&obj0,&obj1)) SWIG_fail;
   {
@@ -88317,11 +88534,11 @@ SWIGINTERN PyObject *_wrap_cvMinEnclosingCircle(PyObject *SWIGUNUSEDPARM(self),
   CvArr *arg1 = (CvArr *) 0 ;
   CvPoint2D32f *arg2 = (CvPoint2D32f *) 0 ;
   float *arg3 = (float *) 0 ;
-  int result;
   bool freearg1 = false ;
   CvPoint2D32f *tmp_center2 ;
   float tmp_radius2 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   {
     tmp_center2 = (CvPoint2D32f *) malloc(sizeof(CvPoint2D32f));
@@ -88377,7 +88594,6 @@ SWIGINTERN PyObject *_wrap_cvMatchShapes(PyObject *SWIGUNUSEDPARM(self), PyObjec
   void *arg2 = (void *) 0 ;
   int arg3 ;
   double arg4 = (double) 0 ;
-  double result;
   int res1 ;
   int res2 ;
   int val3 ;
@@ -88388,6 +88604,7 @@ SWIGINTERN PyObject *_wrap_cvMatchShapes(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:cvMatchShapes",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -88431,7 +88648,6 @@ SWIGINTERN PyObject *_wrap_cvCreateContourTree(PyObject *SWIGUNUSEDPARM(self), P
   CvSeq *arg1 = (CvSeq *) 0 ;
   CvMemStorage *arg2 = (CvMemStorage *) 0 ;
   double arg3 ;
-  CvContourTree *result = 0 ;
   void *ptr1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -88440,6 +88656,7 @@ SWIGINTERN PyObject *_wrap_cvCreateContourTree(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvContourTree *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvCreateContourTree",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -88487,7 +88704,6 @@ SWIGINTERN PyObject *_wrap_cvContourFromContourTreeUntyped(PyObject *SWIGUNUSEDP
   CvContourTree *arg1 = (CvContourTree *) 0 ;
   CvMemStorage *arg2 = (CvMemStorage *) 0 ;
   CvTermCriteria arg3 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -88496,6 +88712,7 @@ SWIGINTERN PyObject *_wrap_cvContourFromContourTreeUntyped(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvContourFromContourTreeUntyped",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -88551,7 +88768,6 @@ SWIGINTERN PyObject *_wrap_cvMatchContourTrees(PyObject *SWIGUNUSEDPARM(self), P
   CvContourTree *arg2 = (CvContourTree *) 0 ;
   int arg3 ;
   double arg4 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -88564,6 +88780,7 @@ SWIGINTERN PyObject *_wrap_cvMatchContourTrees(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvMatchContourTrees",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvContourTree, 0 |  0 );
@@ -88651,9 +88868,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCheckContourConvexity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  int result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCheckContourConvexity",&obj0)) SWIG_fail;
   {
@@ -88694,7 +88911,6 @@ SWIGINTERN PyObject *_wrap_cvConvexityDefectsUntyped(PyObject *SWIGUNUSEDPARM(se
   CvArr *arg1 = (CvArr *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   CvMemStorage *arg3 = (CvMemStorage *) NULL ;
-  CvSeq *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   void *argp3 = 0 ;
@@ -88702,6 +88918,7 @@ SWIGINTERN PyObject *_wrap_cvConvexityDefectsUntyped(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvConvexityDefectsUntyped",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -88764,9 +88981,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvFitEllipse2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvArr *arg1 = (CvArr *) 0 ;
-  CvBox2D result;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvBox2D result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvFitEllipse2",&obj0)) SWIG_fail;
   {
@@ -88806,13 +89023,13 @@ SWIGINTERN PyObject *_wrap_cvMaxRect(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject *resultobj = 0;
   CvRect *arg1 = (CvRect *) 0 ;
   CvRect *arg2 = (CvRect *) 0 ;
-  CvRect result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvRect result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvMaxRect",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRect, 0 |  0 );
@@ -88906,7 +89123,6 @@ SWIGINTERN PyObject *_wrap_cvPointSeqFromMat(PyObject *SWIGUNUSEDPARM(self), PyO
   CvArr *arg2 = (CvArr *) 0 ;
   CvContour *arg3 = (CvContour *) 0 ;
   CvSeqBlock *arg4 = (CvSeqBlock *) 0 ;
-  CvSeq *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   bool freearg2 = false ;
@@ -88918,6 +89134,7 @@ SWIGINTERN PyObject *_wrap_cvPointSeqFromMat(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvPointSeqFromMat",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -88973,7 +89190,6 @@ SWIGINTERN PyObject *_wrap_cvPointPolygonTest(PyObject *SWIGUNUSEDPARM(self), Py
   CvArr *arg1 = (CvArr *) 0 ;
   CvPoint2D32f arg2 ;
   int arg3 ;
-  double result;
   bool freearg1 = false ;
   CvPoint2D32f temp2 ;
   int val3 ;
@@ -88981,6 +89197,7 @@ SWIGINTERN PyObject *_wrap_cvPointPolygonTest(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvPointPolygonTest",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -89049,7 +89266,6 @@ SWIGINTERN PyObject *_wrap_cvCreateHist(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg3 ;
   float **arg4 = (float **) NULL ;
   int arg5 = (int) 1 ;
-  CvHistogram *result = 0 ;
   int val3 ;
   int ecode3 = 0 ;
   int val5 ;
@@ -89058,6 +89274,7 @@ SWIGINTERN PyObject *_wrap_cvCreateHist(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvHistogram *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OO:cvCreateHist",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -89225,7 +89442,6 @@ SWIGINTERN PyObject *_wrap_cvMakeHistHeaderForArray(PyObject *SWIGUNUSEDPARM(sel
   float *arg4 = (float *) 0 ;
   float **arg5 = (float **) NULL ;
   int arg6 = (int) 1 ;
-  CvHistogram *result = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
   void *argp4 = 0 ;
@@ -89237,6 +89453,7 @@ SWIGINTERN PyObject *_wrap_cvMakeHistHeaderForArray(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvHistogram *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:cvMakeHistHeaderForArray",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -89503,7 +89720,6 @@ SWIGINTERN PyObject *_wrap_cvCompareHist(PyObject *SWIGUNUSEDPARM(self), PyObjec
   CvHistogram *arg1 = (CvHistogram *) 0 ;
   CvHistogram *arg2 = (CvHistogram *) 0 ;
   int arg3 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -89513,6 +89729,7 @@ SWIGINTERN PyObject *_wrap_cvCompareHist(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvCompareHist",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHistogram, 0 |  0 );
@@ -90451,7 +90668,6 @@ SWIGINTERN PyObject *_wrap_cvThreshold(PyObject *SWIGUNUSEDPARM(self), PyObject
   double arg3 ;
   double arg4 ;
   int arg5 ;
-  double result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   double val3 ;
@@ -90465,6 +90681,7 @@ SWIGINTERN PyObject *_wrap_cvThreshold(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvThreshold",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -91552,7 +91769,6 @@ SWIGINTERN PyObject *_wrap_cvHoughLinesUntyped(PyObject *SWIGUNUSEDPARM(self), P
   int arg6 ;
   double arg7 = (double) 0 ;
   double arg8 = (double) 0 ;
-  CvSeq *result = 0 ;
   bool freearg1 = false ;
   int res2 ;
   int val3 ;
@@ -91575,6 +91791,7 @@ SWIGINTERN PyObject *_wrap_cvHoughLinesUntyped(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO|OO:cvHoughLinesUntyped",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
@@ -91659,7 +91876,6 @@ SWIGINTERN PyObject *_wrap_cvHoughCirclesUntyped(PyObject *SWIGUNUSEDPARM(self),
   double arg7 = (double) 100 ;
   int arg8 = (int) 0 ;
   int arg9 = (int) 0 ;
-  CvSeq *result = 0 ;
   bool freearg1 = false ;
   int res2 ;
   int val3 ;
@@ -91685,6 +91901,7 @@ SWIGINTERN PyObject *_wrap_cvHoughCirclesUntyped(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|OOOO:cvHoughCirclesUntyped",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
@@ -91855,9 +92072,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCreateKDTree(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  CvFeatureTree *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvFeatureTree *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCreateKDTree",&obj0)) SWIG_fail;
   {
@@ -91897,7 +92114,6 @@ SWIGINTERN PyObject *_wrap_cvCreateSpillTree(PyObject *SWIGUNUSEDPARM(self), PyO
   int arg2 = (int) (int)50 ;
   double arg3 = (double) (double).7 ;
   double arg4 = (double) (double).1 ;
-  CvFeatureTree *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -91909,6 +92125,7 @@ SWIGINTERN PyObject *_wrap_cvCreateSpillTree(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvFeatureTree *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|OOO:cvCreateSpillTree",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -92069,7 +92286,6 @@ SWIGINTERN PyObject *_wrap_cvFindFeaturesBoxed(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -92079,6 +92295,7 @@ SWIGINTERN PyObject *_wrap_cvFindFeaturesBoxed(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvFindFeaturesBoxed",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvFeatureTree, 0 |  0 );
@@ -92157,10 +92374,9 @@ SWIGINTERN PyObject *_wrap_cvCreateLSH(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg2 ;
   int arg3 = (int) 10 ;
   int arg4 = (int) 10 ;
-  int arg5 = (int) ((6) +(((1) -1) << 3)) ;
+  int arg5 = (int) (((6) &((1 << 3) -1)) +(((1) -1) << 3)) ;
   double arg6 = (double) 4 ;
   int64 arg7 = (int64) -1 ;
-  CvLSH *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -92182,6 +92398,7 @@ SWIGINTERN PyObject *_wrap_cvCreateLSH(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvLSH *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OOOOO:cvCreateLSH",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvLSHOperations, 0 |  0 );
@@ -92251,10 +92468,9 @@ SWIGINTERN PyObject *_wrap_cvCreateMemoryLSH(PyObject *SWIGUNUSEDPARM(self), PyO
   int arg2 ;
   int arg3 = (int) 10 ;
   int arg4 = (int) 10 ;
-  int arg5 = (int) ((6) +(((1) -1) << 3)) ;
+  int arg5 = (int) (((6) &((1 << 3) -1)) +(((1) -1) << 3)) ;
   double arg6 = (double) 4 ;
   int64 arg7 = (int64) -1 ;
-  CvLSH *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -92276,6 +92492,7 @@ SWIGINTERN PyObject *_wrap_cvCreateMemoryLSH(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvLSH *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|OOOOO:cvCreateMemoryLSH",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -92371,10 +92588,10 @@ fail:
 SWIGINTERN PyObject *_wrap_LSHSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvLSH *arg1 = (CvLSH *) 0 ;
-  unsigned int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  unsigned int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:LSHSize",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvLSH, 0 |  0 );
@@ -92590,7 +92807,6 @@ SWIGINTERN PyObject *_wrap_CvSURFPoint_pt_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< CvPoint2D32f * >(argp2);
   if (arg1) (arg1)->pt = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -92601,10 +92817,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFPoint_pt_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFPoint *arg1 = (CvSURFPoint *) 0 ;
-  CvPoint2D32f *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFPoint_pt_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFPoint, 0 |  0 );
@@ -92643,7 +92859,6 @@ SWIGINTERN PyObject *_wrap_CvSURFPoint_laplacian_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->laplacian = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -92654,10 +92869,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFPoint_laplacian_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFPoint *arg1 = (CvSURFPoint *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFPoint_laplacian_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFPoint, 0 |  0 );
@@ -92696,7 +92911,6 @@ SWIGINTERN PyObject *_wrap_CvSURFPoint_size_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -92707,10 +92921,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFPoint_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFPoint *arg1 = (CvSURFPoint *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFPoint_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFPoint, 0 |  0 );
@@ -92749,7 +92963,6 @@ SWIGINTERN PyObject *_wrap_CvSURFPoint_dir_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->dir = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -92760,10 +92973,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFPoint_dir_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFPoint *arg1 = (CvSURFPoint *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFPoint_dir_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFPoint, 0 |  0 );
@@ -92802,7 +93015,6 @@ SWIGINTERN PyObject *_wrap_CvSURFPoint_hessian_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->hessian = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -92813,10 +93025,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFPoint_hessian_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFPoint *arg1 = (CvSURFPoint *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFPoint_hessian_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFPoint, 0 |  0 );
@@ -92868,7 +93080,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSURFPoint(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvSURFPoint * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -92884,7 +93096,7 @@ fail:
 
 SWIGINTERN PyObject *CvSURFPoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSURFPoint, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -92896,7 +93108,6 @@ SWIGINTERN PyObject *_wrap_cvSURFPoint(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg3 ;
   float arg4 = (float) 0 ;
   float arg5 = (float) 0 ;
-  CvSURFPoint result;
   CvPoint2D32f temp1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -92911,6 +93122,7 @@ SWIGINTERN PyObject *_wrap_cvSURFPoint(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvSURFPoint result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:cvSURFPoint",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -92997,7 +93209,6 @@ SWIGINTERN PyObject *_wrap_CvSURFParams_extended_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->extended = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93008,10 +93219,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFParams_extended_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFParams *arg1 = (CvSURFParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFParams_extended_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFParams, 0 |  0 );
@@ -93050,7 +93261,6 @@ SWIGINTERN PyObject *_wrap_CvSURFParams_hessianThreshold_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->hessianThreshold = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93061,10 +93271,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFParams_hessianThreshold_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFParams *arg1 = (CvSURFParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFParams_hessianThreshold_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFParams, 0 |  0 );
@@ -93103,7 +93313,6 @@ SWIGINTERN PyObject *_wrap_CvSURFParams_nOctaves_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nOctaves = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93114,10 +93323,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFParams_nOctaves_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFParams *arg1 = (CvSURFParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFParams_nOctaves_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFParams, 0 |  0 );
@@ -93156,7 +93365,6 @@ SWIGINTERN PyObject *_wrap_CvSURFParams_nOctaveLayers_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nOctaveLayers = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93167,10 +93375,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSURFParams_nOctaveLayers_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSURFParams *arg1 = (CvSURFParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSURFParams_nOctaveLayers_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSURFParams, 0 |  0 );
@@ -93222,7 +93430,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSURFParams(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvSURFParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -93238,7 +93446,7 @@ fail:
 
 SWIGINTERN PyObject *CvSURFParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSURFParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -93247,13 +93455,13 @@ SWIGINTERN PyObject *_wrap_cvSURFParams(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   double arg1 ;
   int arg2 = (int) 0 ;
-  CvSURFParams result;
   double val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSURFParams result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvSURFParams",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -93441,7 +93649,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_delta_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->delta = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93452,10 +93659,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_delta_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_delta_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93494,7 +93701,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_maxArea_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->maxArea = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93505,10 +93711,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_maxArea_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_maxArea_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93547,7 +93753,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_minArea_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->minArea = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93558,10 +93763,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_minArea_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_minArea_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93600,7 +93805,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_maxVariation_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->maxVariation = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93611,10 +93815,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_maxVariation_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_maxVariation_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93653,7 +93857,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_minDiversity_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->minDiversity = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93664,10 +93867,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_minDiversity_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_minDiversity_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93706,7 +93909,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_maxEvolution_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->maxEvolution = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93717,10 +93919,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_maxEvolution_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_maxEvolution_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93759,7 +93961,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_areaThreshold_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->areaThreshold = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93770,10 +93971,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_areaThreshold_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_areaThreshold_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93812,7 +94013,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_minMargin_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->minMargin = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93823,10 +94023,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_minMargin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_minMargin_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93865,7 +94065,6 @@ SWIGINTERN PyObject *_wrap_CvMSERParams_edgeBlurSize_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->edgeBlurSize = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -93876,10 +94075,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMSERParams_edgeBlurSize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMSERParams *arg1 = (CvMSERParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMSERParams_edgeBlurSize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMSERParams, 0 |  0 );
@@ -93931,7 +94130,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMSERParams(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvMSERParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -93947,7 +94146,7 @@ fail:
 
 SWIGINTERN PyObject *CvMSERParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMSERParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -93957,13 +94156,12 @@ SWIGINTERN PyObject *_wrap_cvMSERParams(PyObject *SWIGUNUSEDPARM(self), PyObject
   int arg1 = (int) 5 ;
   int arg2 = (int) 60 ;
   int arg3 = (int) 14400 ;
-  float arg4 = (float) .25f ;
-  float arg5 = (float) .2f ;
+  float arg4 = (float) .25 ;
+  float arg5 = (float) .2 ;
   int arg6 = (int) 200 ;
   double arg7 = (double) 1.01 ;
   double arg8 = (double) .003 ;
   int arg9 = (int) 5 ;
-  CvMSERParams result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -93991,6 +94189,7 @@ SWIGINTERN PyObject *_wrap_cvMSERParams(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  CvMSERParams result;
   
   if (!PyArg_ParseTuple(args,(char *)"|OOOOOOOOO:cvMSERParams",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   if (obj0) {
@@ -94192,7 +94391,6 @@ SWIGINTERN PyObject *_wrap_CvStarKeypoint_pt_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvPoint * >(argp2);
   if (arg1) (arg1)->pt = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -94203,10 +94401,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStarKeypoint_pt_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStarKeypoint_pt_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
@@ -94245,7 +94443,6 @@ SWIGINTERN PyObject *_wrap_CvStarKeypoint_size_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -94256,10 +94453,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStarKeypoint_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStarKeypoint_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
@@ -94298,7 +94495,6 @@ SWIGINTERN PyObject *_wrap_CvStarKeypoint_response_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->response = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -94309,10 +94505,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStarKeypoint_response_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStarKeypoint *arg1 = (CvStarKeypoint *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStarKeypoint_response_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStarKeypoint, 0 |  0 );
@@ -94364,7 +94560,7 @@ SWIGINTERN PyObject *_wrap_delete_CvStarKeypoint(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvStarKeypoint * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -94380,7 +94576,7 @@ fail:
 
 SWIGINTERN PyObject *CvStarKeypoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvStarKeypoint, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -94390,7 +94586,6 @@ SWIGINTERN PyObject *_wrap_cvStarKeypoint(PyObject *SWIGUNUSEDPARM(self), PyObje
   CvPoint arg1 ;
   int arg2 ;
   float arg3 ;
-  CvStarKeypoint result;
   CvPoint temp1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -94399,6 +94594,7 @@ SWIGINTERN PyObject *_wrap_cvStarKeypoint(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvStarKeypoint result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvStarKeypoint",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -94471,7 +94667,6 @@ SWIGINTERN PyObject *_wrap_CvStarDetectorParams_maxSize_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->maxSize = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -94482,10 +94677,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStarDetectorParams_maxSize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStarDetectorParams_maxSize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
@@ -94524,7 +94719,6 @@ SWIGINTERN PyObject *_wrap_CvStarDetectorParams_responseThreshold_set(PyObject *
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->responseThreshold = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -94535,10 +94729,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStarDetectorParams_responseThreshold_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStarDetectorParams_responseThreshold_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
@@ -94577,7 +94771,6 @@ SWIGINTERN PyObject *_wrap_CvStarDetectorParams_lineThresholdProjected_set(PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->lineThresholdProjected = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -94588,10 +94781,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStarDetectorParams_lineThresholdProjected_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStarDetectorParams_lineThresholdProjected_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
@@ -94630,7 +94823,6 @@ SWIGINTERN PyObject *_wrap_CvStarDetectorParams_lineThresholdBinarized_set(PyObj
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->lineThresholdBinarized = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -94641,10 +94833,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStarDetectorParams_lineThresholdBinarized_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStarDetectorParams_lineThresholdBinarized_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
@@ -94683,7 +94875,6 @@ SWIGINTERN PyObject *_wrap_CvStarDetectorParams_suppressNonmaxSize_set(PyObject
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->suppressNonmaxSize = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -94694,10 +94885,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStarDetectorParams_suppressNonmaxSize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStarDetectorParams *arg1 = (CvStarDetectorParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStarDetectorParams_suppressNonmaxSize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStarDetectorParams, 0 |  0 );
@@ -94749,7 +94940,7 @@ SWIGINTERN PyObject *_wrap_delete_CvStarDetectorParams(PyObject *SWIGUNUSEDPARM(
   arg1 = reinterpret_cast< CvStarDetectorParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -94765,7 +94956,7 @@ fail:
 
 SWIGINTERN PyObject *CvStarDetectorParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvStarDetectorParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -94777,7 +94968,6 @@ SWIGINTERN PyObject *_wrap_cvStarDetectorParams(PyObject *SWIGUNUSEDPARM(self),
   int arg3 = (int) 10 ;
   int arg4 = (int) 8 ;
   int arg5 = (int) 5 ;
-  CvStarDetectorParams result;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -94793,6 +94983,7 @@ SWIGINTERN PyObject *_wrap_cvStarDetectorParams(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvStarDetectorParams result;
   
   if (!PyArg_ParseTuple(args,(char *)"|OOOOO:cvStarDetectorParams",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   if (obj0) {
@@ -94851,7 +95042,6 @@ SWIGINTERN PyObject *_wrap_cvGetStarKeypoints(PyObject *SWIGUNUSEDPARM(self), Py
   CvArr *arg1 = (CvArr *) 0 ;
   CvMemStorage *arg2 = (CvMemStorage *) 0 ;
   CvStarDetectorParams arg3 = (CvStarDetectorParams) cvStarDetectorParams() ;
-  CvSeq *result = 0 ;
   bool freearg1 = false ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -94860,6 +95050,7 @@ SWIGINTERN PyObject *_wrap_cvGetStarKeypoints(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvGetStarKeypoints",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -94919,13 +95110,13 @@ SWIGINTERN PyObject *_wrap_cvLoadHaarClassifierCascade(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   CvSize arg2 ;
-  CvHaarClassifierCascade *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   CvSize temp2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvHaarClassifierCascade *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvLoadHaarClassifierCascade",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -95075,7 +95266,6 @@ SWIGINTERN PyObject *_wrap_cvRunHaarClassifierCascade(PyObject *SWIGUNUSEDPARM(s
   CvHaarClassifierCascade *arg1 = (CvHaarClassifierCascade *) 0 ;
   CvPoint arg2 ;
   int arg3 = (int) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   CvPoint temp2 ;
@@ -95084,11 +95274,12 @@ SWIGINTERN PyObject *_wrap_cvRunHaarClassifierCascade(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvRunHaarClassifierCascade",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvHaarClassifierCascade, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRunHaarClassifierCascade" "', argument " "1"" of type '" "CvHaarClassifierCascade *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvRunHaarClassifierCascade" "', argument " "1"" of type '" "CvHaarClassifierCascade const *""'"); 
   }
   arg1 = reinterpret_cast< CvHaarClassifierCascade * >(argp1);
   {
@@ -95121,7 +95312,7 @@ SWIGINTERN PyObject *_wrap_cvRunHaarClassifierCascade(PyObject *SWIGUNUSEDPARM(s
   }
   {
     try {
-      result = (int)cvRunHaarClassifierCascade(arg1,arg2,arg3); 
+      result = (int)cvRunHaarClassifierCascade((CvHaarClassifierCascade const *)arg1,arg2,arg3); 
     } 
     catch (...) 
     {
@@ -95596,13 +95787,13 @@ SWIGINTERN PyObject *_wrap_cvRodrigues2(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvRodrigues2",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -95676,7 +95867,6 @@ SWIGINTERN PyObject *_wrap_cvFindHomography(PyObject *SWIGUNUSEDPARM(self), PyOb
   int arg4 = (int) 0 ;
   double arg5 = (double) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -95690,6 +95880,7 @@ SWIGINTERN PyObject *_wrap_cvFindHomography(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   {
     arg3 = cvCreateMat(3,3,CV_64FC1);
@@ -96722,20 +96913,24 @@ SWIGINTERN PyObject *_wrap_cvFindExtrinsicCameraParams2(PyObject *SWIGUNUSEDPARM
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
+  int arg7 = (int) 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
   bool freearg4 = false ;
   bool freearg5 = false ;
   bool freearg6 = false ;
+  int val7 ;
+  int ecode7 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:cvFindExtrinsicCameraParams2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:cvFindExtrinsicCameraParams2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     arg1 = (CvMat*)PyObject_to_CvArr(obj0, &freearg1);
   }
@@ -96754,9 +96949,16 @@ SWIGINTERN PyObject *_wrap_cvFindExtrinsicCameraParams2(PyObject *SWIGUNUSEDPARM
   {
     arg6 = (CvMat*)PyObject_to_CvArr(obj5, &freearg6);
   }
+  if (obj6) {
+    ecode7 = SWIG_AsVal_int(obj6, &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "cvFindExtrinsicCameraParams2" "', argument " "7"" of type '" "int""'");
+    } 
+    arg7 = static_cast< int >(val7);
+  }
   {
     try {
-      cvFindExtrinsicCameraParams2((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6); 
+      cvFindExtrinsicCameraParams2((CvMat const *)arg1,(CvMat const *)arg2,(CvMat const *)arg3,(CvMat const *)arg4,arg5,arg6,arg7); 
     } 
     catch (...) 
     {
@@ -96976,7 +97178,6 @@ SWIGINTERN PyObject *_wrap_cvFindChessboardCorners(PyObject *SWIGUNUSEDPARM(self
   CvPoint2D32f *arg3 = (CvPoint2D32f *) 0 ;
   int *arg4 = (int *) NULL ;
   int arg5 = (int) 1+2 ;
-  int result;
   int res1 ;
   CvSize *pattern_size2 ;
   CvPoint2D32f *tmp_corners2 ;
@@ -96986,6 +97187,7 @@ SWIGINTERN PyObject *_wrap_cvFindChessboardCorners(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvFindChessboardCorners",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -98078,7 +98280,6 @@ SWIGINTERN PyObject *_wrap_cvStereoRectifyUncalibrated(PyObject *SWIGUNUSEDPARM(
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   double arg7 = (double) 5 ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -98094,6 +98295,7 @@ SWIGINTERN PyObject *_wrap_cvStereoRectifyUncalibrated(PyObject *SWIGUNUSEDPARM(
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:cvStereoRectifyUncalibrated",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
@@ -98219,13 +98421,13 @@ SWIGINTERN PyObject *_wrap_cvCreatePOSITObject(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   CvPoint3D32f *arg1 = (CvPoint3D32f *) 0 ;
   int arg2 ;
-  CvPOSITObject *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvPOSITObject *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvCreatePOSITObject",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPoint3D32f, 0 |  0 );
@@ -98378,7 +98580,6 @@ SWIGINTERN PyObject *_wrap_cvRANSACUpdateNumIters(PyObject *SWIGUNUSEDPARM(self)
   double arg2 ;
   int arg3 ;
   int arg4 ;
-  int result;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -98391,6 +98592,7 @@ SWIGINTERN PyObject *_wrap_cvRANSACUpdateNumIters(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:cvRANSACUpdateNumIters",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -98494,7 +98696,6 @@ SWIGINTERN PyObject *_wrap_cvFindFundamentalMat(PyObject *SWIGUNUSEDPARM(self),
   double arg5 = (double) 3. ;
   double arg6 = (double) 0.99 ;
   CvMat *arg7 = (CvMat *) NULL ;
-  int result;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -98512,6 +98713,7 @@ SWIGINTERN PyObject *_wrap_cvFindFundamentalMat(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO|OOOO:cvFindFundamentalMat",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
@@ -98939,7 +99141,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilterType_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->preFilterType = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -98950,10 +99151,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilterType_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_preFilterType_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -98992,7 +99193,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilterSize_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->preFilterSize = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99003,10 +99203,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilterSize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_preFilterSize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99045,7 +99245,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilterCap_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->preFilterCap = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99056,10 +99255,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilterCap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_preFilterCap_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99098,7 +99297,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_SADWindowSize_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->SADWindowSize = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99109,10 +99307,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_SADWindowSize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_SADWindowSize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99151,7 +99349,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_minDisparity_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->minDisparity = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99162,10 +99359,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_minDisparity_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_minDisparity_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99204,7 +99401,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_numberOfDisparities_set(PyObject *SWI
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->numberOfDisparities = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99215,10 +99411,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_numberOfDisparities_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_numberOfDisparities_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99257,7 +99453,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_textureThreshold_set(PyObject *SWIGUN
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->textureThreshold = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99268,10 +99463,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_textureThreshold_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_textureThreshold_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99310,7 +99505,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_uniquenessRatio_set(PyObject *SWIGUNU
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->uniquenessRatio = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99321,10 +99515,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_uniquenessRatio_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_uniquenessRatio_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99363,7 +99557,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_speckleWindowSize_set(PyObject *SWIGU
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->speckleWindowSize = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99374,10 +99567,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_speckleWindowSize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_speckleWindowSize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99416,7 +99609,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_speckleRange_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->speckleRange = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99427,10 +99619,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_speckleRange_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_speckleRange_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99469,7 +99661,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_trySmallerWindows_set(PyObject *SWIGU
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->trySmallerWindows = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -99480,10 +99671,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_trySmallerWindows_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_trySmallerWindows_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99519,7 +99710,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilteredImg0_set(PyObject *SWIGUNU
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->preFilteredImg0 = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -99542,10 +99732,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilteredImg0_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_preFilteredImg0_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99581,7 +99771,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilteredImg1_set(PyObject *SWIGUNU
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->preFilteredImg1 = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -99604,10 +99793,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_preFilteredImg1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_preFilteredImg1_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99643,7 +99832,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_slidingSumBuf_set(PyObject *SWIGUNUSE
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->slidingSumBuf = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -99666,10 +99854,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_slidingSumBuf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_slidingSumBuf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99705,7 +99893,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_dbmin_set(PyObject *SWIGUNUSEDPARM(se
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->dbmin = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -99728,10 +99915,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_dbmin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_dbmin_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99767,7 +99954,6 @@ SWIGINTERN PyObject *_wrap_CvStereoBMState_dbmax_set(PyObject *SWIGUNUSEDPARM(se
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->dbmax = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -99790,10 +99976,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoBMState_dbmax_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoBMState *arg1 = (CvStereoBMState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoBMState_dbmax_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoBMState, 0 |  0 );
@@ -99845,7 +100031,7 @@ SWIGINTERN PyObject *_wrap_delete_CvStereoBMState(PyObject *SWIGUNUSEDPARM(self)
   arg1 = reinterpret_cast< CvStereoBMState * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -99861,7 +100047,7 @@ fail:
 
 SWIGINTERN PyObject *CvStereoBMState_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvStereoBMState, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99870,13 +100056,13 @@ SWIGINTERN PyObject *_wrap_cvCreateStereoBMState(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   int arg1 = (int) 0 ;
   int arg2 = (int) 0 ;
-  CvStereoBMState *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvStereoBMState *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"|OO:cvCreateStereoBMState",&obj0,&obj1)) SWIG_fail;
   if (obj0) {
@@ -100050,7 +100236,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_Ithreshold_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->Ithreshold = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100061,10 +100246,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_Ithreshold_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_Ithreshold_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100103,7 +100288,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_interactionRadius_set(PyObject *SWIGU
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->interactionRadius = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100114,10 +100298,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_interactionRadius_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_interactionRadius_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100156,7 +100340,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_K_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->K = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100167,10 +100350,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_K_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_K_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100209,7 +100392,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState__lambda_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->lambda = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100220,10 +100402,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState__lambda_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState__lambda_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100262,7 +100444,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_lambda1_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->lambda1 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100273,10 +100454,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_lambda1_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_lambda1_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100315,7 +100496,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_lambda2_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->lambda2 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100326,10 +100506,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_lambda2_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_lambda2_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100368,7 +100548,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_occlusionCost_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->occlusionCost = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100379,10 +100558,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_occlusionCost_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_occlusionCost_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100421,7 +100600,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_minDisparity_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->minDisparity = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100432,10 +100610,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_minDisparity_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_minDisparity_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100474,7 +100652,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_numberOfDisparities_set(PyObject *SWI
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->numberOfDisparities = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100485,10 +100662,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_numberOfDisparities_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_numberOfDisparities_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100527,7 +100704,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_maxIters_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->maxIters = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -100538,10 +100714,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_maxIters_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_maxIters_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100577,7 +100753,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_left_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->left = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -100600,10 +100775,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_left_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_left_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100639,7 +100814,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_right_set(PyObject *SWIGUNUSEDPARM(se
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->right = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -100662,10 +100836,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_right_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_right_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100701,7 +100875,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_dispLeft_set(PyObject *SWIGUNUSEDPARM
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->dispLeft = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -100724,10 +100897,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_dispLeft_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_dispLeft_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100763,7 +100936,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_dispRight_set(PyObject *SWIGUNUSEDPAR
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->dispRight = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -100786,10 +100958,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_dispRight_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_dispRight_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100825,7 +100997,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_ptrLeft_set(PyObject *SWIGUNUSEDPARM(
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->ptrLeft = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -100848,10 +101019,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_ptrLeft_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_ptrLeft_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100887,7 +101058,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_ptrRight_set(PyObject *SWIGUNUSEDPARM
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->ptrRight = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -100910,10 +101080,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_ptrRight_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_ptrRight_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -100949,7 +101119,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_vtxBuf_set(PyObject *SWIGUNUSEDPARM(s
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->vtxBuf = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -100972,10 +101141,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_vtxBuf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_vtxBuf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -101011,7 +101180,6 @@ SWIGINTERN PyObject *_wrap_CvStereoGCState_edgeBuf_set(PyObject *SWIGUNUSEDPARM(
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->edgeBuf = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -101034,10 +101202,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvStereoGCState_edgeBuf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvStereoGCState *arg1 = (CvStereoGCState *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvStereoGCState_edgeBuf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvStereoGCState, 0 |  0 );
@@ -101089,7 +101257,7 @@ SWIGINTERN PyObject *_wrap_delete_CvStereoGCState(PyObject *SWIGUNUSEDPARM(self)
   arg1 = reinterpret_cast< CvStereoGCState * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -101105,7 +101273,7 @@ fail:
 
 SWIGINTERN PyObject *CvStereoGCState_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvStereoGCState, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101114,13 +101282,13 @@ SWIGINTERN PyObject *_wrap_cvCreateStereoGCState(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
-  CvStereoGCState *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvStereoGCState *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvCreateStereoGCState",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -101402,7 +101570,7 @@ SWIGINTERN PyObject *_wrap_delete_CvLSH(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< CvLSH * >(argp1);
   {
     try {
-      delete_CvLSH(arg1);
+      delete_CvLSH(arg1); 
     } 
     catch (...) 
     {
@@ -101418,14 +101586,14 @@ fail:
 
 SWIGINTERN PyObject *CvLSH_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvLSH, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvTuple_CvPoint_2_val_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<CvPoint,2 > *arg1 = (CvTuple<CvPoint,2 > *) 0 ;
+  CvTuple< CvPoint,2 > *arg1 = (CvTuple< CvPoint,2 > *) 0 ;
   CvPoint *arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -101435,11 +101603,11 @@ SWIGINTERN PyObject *_wrap_CvTuple_CvPoint_2_val_set(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvTuple_CvPoint_2_val_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTCvPoint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_CvPoint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_CvPoint_2_val_set" "', argument " "1"" of type '" "CvTuple<CvPoint,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_CvPoint_2_val_set" "', argument " "1"" of type '" "CvTuple< CvPoint,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<CvPoint,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< CvPoint,2 > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvPoint, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvTuple_CvPoint_2_val_set" "', argument " "2"" of type '" "CvPoint [2]""'"); 
@@ -101462,18 +101630,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_CvPoint_2_val_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<CvPoint,2 > *arg1 = (CvTuple<CvPoint,2 > *) 0 ;
-  CvPoint *result = 0 ;
+  CvTuple< CvPoint,2 > *arg1 = (CvTuple< CvPoint,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTuple_CvPoint_2_val_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTCvPoint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_CvPoint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_CvPoint_2_val_get" "', argument " "1"" of type '" "CvTuple<CvPoint,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_CvPoint_2_val_get" "', argument " "1"" of type '" "CvTuple< CvPoint,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<CvPoint,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< CvPoint,2 > * >(argp1);
   result = (CvPoint *)(CvPoint *) ((arg1)->val);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvPoint, 0 |  0 );
   return resultobj;
@@ -101484,7 +101652,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_CvPoint_2___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<CvPoint,2 > *arg1 = (CvTuple<CvPoint,2 > *) 0 ;
+  CvTuple< CvPoint,2 > *arg1 = (CvTuple< CvPoint,2 > *) 0 ;
   int arg2 ;
   CvPoint *arg3 = (CvPoint *) 0 ;
   void *argp1 = 0 ;
@@ -101498,11 +101666,11 @@ SWIGINTERN PyObject *_wrap_CvTuple_CvPoint_2___setitem__(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvTuple_CvPoint_2___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTCvPoint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_CvPoint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_CvPoint_2___setitem__" "', argument " "1"" of type '" "CvTuple<CvPoint,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_CvPoint_2___setitem__" "', argument " "1"" of type '" "CvTuple< CvPoint,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<CvPoint,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< CvPoint,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTuple_CvPoint_2___setitem__" "', argument " "2"" of type '" "int""'");
@@ -101531,22 +101699,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_CvPoint_2___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<CvPoint,2 > *arg1 = (CvTuple<CvPoint,2 > *) 0 ;
+  CvTuple< CvPoint,2 > *arg1 = (CvTuple< CvPoint,2 > *) 0 ;
   int arg2 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvTuple_CvPoint_2___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTCvPoint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_CvPoint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_CvPoint_2___getitem__" "', argument " "1"" of type '" "CvTuple<CvPoint,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_CvPoint_2___getitem__" "', argument " "1"" of type '" "CvTuple< CvPoint,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<CvPoint,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< CvPoint,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTuple_CvPoint_2___getitem__" "', argument " "2"" of type '" "int""'");
@@ -101554,10 +101722,7 @@ SWIGINTERN PyObject *_wrap_CvTuple_CvPoint_2___getitem__(PyObject *SWIGUNUSEDPAR
   arg2 = static_cast< int >(val2);
   {
     try {
-      {
-        CvPoint const &_result_ref = (arg1)->__getitem__(arg2);
-        result = (CvPoint *) &_result_ref;
-      } 
+      result = (CvPoint *) &(arg1)->__getitem__(arg2); 
     } 
     catch (...) 
     {
@@ -101573,19 +101738,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvTuple_CvPoint_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<CvPoint,2 > *result = 0 ;
+  CvTuple< CvPoint,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvTuple_CvPoint_2")) SWIG_fail;
   {
     try {
-      result = (CvTuple<CvPoint,2 > *)new CvTuple<CvPoint,2 >(); 
+      result = (CvTuple< CvPoint,2 > *)new CvTuple< CvPoint,2 >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTCvPoint_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_CvPoint_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -101594,20 +101759,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvTuple_CvPoint_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<CvPoint,2 > *arg1 = (CvTuple<CvPoint,2 > *) 0 ;
+  CvTuple< CvPoint,2 > *arg1 = (CvTuple< CvPoint,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvTuple_CvPoint_2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTCvPoint_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_CvPoint_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTuple_CvPoint_2" "', argument " "1"" of type '" "CvTuple<CvPoint,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTuple_CvPoint_2" "', argument " "1"" of type '" "CvTuple< CvPoint,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<CvPoint,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< CvPoint,2 > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -101623,14 +101788,14 @@ fail:
 
 SWIGINTERN PyObject *CvTuple_CvPoint_2_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTupleTCvPoint_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTupleT_CvPoint_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvTuple_float_2_val_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,2 > *arg1 = (CvTuple<float,2 > *) 0 ;
+  CvTuple< float,2 > *arg1 = (CvTuple< float,2 > *) 0 ;
   float *arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -101640,11 +101805,11 @@ SWIGINTERN PyObject *_wrap_CvTuple_float_2_val_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvTuple_float_2_val_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_2_val_set" "', argument " "1"" of type '" "CvTuple<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_2_val_set" "', argument " "1"" of type '" "CvTuple< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,2 > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_float, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvTuple_float_2_val_set" "', argument " "2"" of type '" "float [2]""'"); 
@@ -101667,18 +101832,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_float_2_val_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,2 > *arg1 = (CvTuple<float,2 > *) 0 ;
-  float *result = 0 ;
+  CvTuple< float,2 > *arg1 = (CvTuple< float,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTuple_float_2_val_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_2_val_get" "', argument " "1"" of type '" "CvTuple<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_2_val_get" "', argument " "1"" of type '" "CvTuple< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,2 > * >(argp1);
   result = (float *)(float *) ((arg1)->val);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
   return resultobj;
@@ -101689,7 +101854,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_float_2___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,2 > *arg1 = (CvTuple<float,2 > *) 0 ;
+  CvTuple< float,2 > *arg1 = (CvTuple< float,2 > *) 0 ;
   int arg2 ;
   float *arg3 = (float *) 0 ;
   void *argp1 = 0 ;
@@ -101703,11 +101868,11 @@ SWIGINTERN PyObject *_wrap_CvTuple_float_2___setitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvTuple_float_2___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_2___setitem__" "', argument " "1"" of type '" "CvTuple<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_2___setitem__" "', argument " "1"" of type '" "CvTuple< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTuple_float_2___setitem__" "', argument " "2"" of type '" "int""'");
@@ -101736,22 +101901,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_float_2___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,2 > *arg1 = (CvTuple<float,2 > *) 0 ;
+  CvTuple< float,2 > *arg1 = (CvTuple< float,2 > *) 0 ;
   int arg2 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvTuple_float_2___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_2___getitem__" "', argument " "1"" of type '" "CvTuple<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_2___getitem__" "', argument " "1"" of type '" "CvTuple< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTuple_float_2___getitem__" "', argument " "2"" of type '" "int""'");
@@ -101759,10 +101924,7 @@ SWIGINTERN PyObject *_wrap_CvTuple_float_2___getitem__(PyObject *SWIGUNUSEDPARM(
   arg2 = static_cast< int >(val2);
   {
     try {
-      {
-        float const &_result_ref = (arg1)->__getitem__(arg2);
-        result = (float *) &_result_ref;
-      } 
+      result = (float *) &(arg1)->__getitem__(arg2); 
     } 
     catch (...) 
     {
@@ -101778,19 +101940,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvTuple_float_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,2 > *result = 0 ;
+  CvTuple< float,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvTuple_float_2")) SWIG_fail;
   {
     try {
-      result = (CvTuple<float,2 > *)new CvTuple<float,2 >(); 
+      result = (CvTuple< float,2 > *)new CvTuple< float,2 >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTfloat_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_float_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -101799,20 +101961,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvTuple_float_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,2 > *arg1 = (CvTuple<float,2 > *) 0 ;
+  CvTuple< float,2 > *arg1 = (CvTuple< float,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvTuple_float_2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTuple_float_2" "', argument " "1"" of type '" "CvTuple<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTuple_float_2" "', argument " "1"" of type '" "CvTuple< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,2 > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -101828,14 +101990,14 @@ fail:
 
 SWIGINTERN PyObject *CvTuple_float_2_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTupleTfloat_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTupleT_float_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvTuple_float_3_val_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,3 > *arg1 = (CvTuple<float,3 > *) 0 ;
+  CvTuple< float,3 > *arg1 = (CvTuple< float,3 > *) 0 ;
   float *arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -101845,11 +102007,11 @@ SWIGINTERN PyObject *_wrap_CvTuple_float_3_val_set(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvTuple_float_3_val_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_3_val_set" "', argument " "1"" of type '" "CvTuple<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_3_val_set" "', argument " "1"" of type '" "CvTuple< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,3 > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_float, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvTuple_float_3_val_set" "', argument " "2"" of type '" "float [2]""'"); 
@@ -101872,18 +102034,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_float_3_val_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,3 > *arg1 = (CvTuple<float,3 > *) 0 ;
-  float *result = 0 ;
+  CvTuple< float,3 > *arg1 = (CvTuple< float,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTuple_float_3_val_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_3_val_get" "', argument " "1"" of type '" "CvTuple<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_3_val_get" "', argument " "1"" of type '" "CvTuple< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,3 > * >(argp1);
   result = (float *)(float *) ((arg1)->val);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
   return resultobj;
@@ -101894,7 +102056,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_float_3___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,3 > *arg1 = (CvTuple<float,3 > *) 0 ;
+  CvTuple< float,3 > *arg1 = (CvTuple< float,3 > *) 0 ;
   int arg2 ;
   float *arg3 = (float *) 0 ;
   void *argp1 = 0 ;
@@ -101908,11 +102070,11 @@ SWIGINTERN PyObject *_wrap_CvTuple_float_3___setitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvTuple_float_3___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_3___setitem__" "', argument " "1"" of type '" "CvTuple<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_3___setitem__" "', argument " "1"" of type '" "CvTuple< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,3 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTuple_float_3___setitem__" "', argument " "2"" of type '" "int""'");
@@ -101941,22 +102103,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvTuple_float_3___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,3 > *arg1 = (CvTuple<float,3 > *) 0 ;
+  CvTuple< float,3 > *arg1 = (CvTuple< float,3 > *) 0 ;
   int arg2 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvTuple_float_3___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_3___getitem__" "', argument " "1"" of type '" "CvTuple<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvTuple_float_3___getitem__" "', argument " "1"" of type '" "CvTuple< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,3 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvTuple_float_3___getitem__" "', argument " "2"" of type '" "int""'");
@@ -101964,10 +102126,7 @@ SWIGINTERN PyObject *_wrap_CvTuple_float_3___getitem__(PyObject *SWIGUNUSEDPARM(
   arg2 = static_cast< int >(val2);
   {
     try {
-      {
-        float const &_result_ref = (arg1)->__getitem__(arg2);
-        result = (float *) &_result_ref;
-      } 
+      result = (float *) &(arg1)->__getitem__(arg2); 
     } 
     catch (...) 
     {
@@ -101983,19 +102142,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvTuple_float_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,3 > *result = 0 ;
+  CvTuple< float,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvTuple_float_3")) SWIG_fail;
   {
     try {
-      result = (CvTuple<float,3 > *)new CvTuple<float,3 >(); 
+      result = (CvTuple< float,3 > *)new CvTuple< float,3 >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTfloat_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_float_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -102004,20 +102163,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvTuple_float_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTuple<float,3 > *arg1 = (CvTuple<float,3 > *) 0 ;
+  CvTuple< float,3 > *arg1 = (CvTuple< float,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvTuple_float_3",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleTfloat_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTupleT_float_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTuple_float_3" "', argument " "1"" of type '" "CvTuple<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvTuple_float_3" "', argument " "1"" of type '" "CvTuple< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTuple<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< CvTuple< float,3 > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -102033,17 +102192,17 @@ fail:
 
 SWIGINTERN PyObject *CvTuple_float_3_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTupleTfloat_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTupleT_float_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvPoint > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvPoint > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvPoint_cast",&obj0)) SWIG_fail;
   {
@@ -102062,14 +102221,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_cast(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     try {
-      result = (CvTypedSeq<CvPoint > *)CvTypedSeq<CvPoint >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvPoint > *)CvTypedSeq< CvPoint >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvPoint_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvPoint_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -102078,22 +102237,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint > *arg1 = (CvTypedSeq<CvPoint > *) 0 ;
+  CvTypedSeq< CvPoint > *arg1 = (CvTypedSeq< CvPoint > *) 0 ;
   int arg2 ;
-  CvPoint *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvPoint___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvPoint___getitem__" "', argument " "2"" of type '" "int""'");
@@ -102117,7 +102276,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint > *arg1 = (CvTypedSeq<CvPoint > *) 0 ;
+  CvTypedSeq< CvPoint > *arg1 = (CvTypedSeq< CvPoint > *) 0 ;
   int arg2 ;
   CvPoint *arg3 = (CvPoint *) 0 ;
   void *argp1 = 0 ;
@@ -102131,11 +102290,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint___setitem__(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_CvPoint___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvPoint___setitem__" "', argument " "2"" of type '" "int""'");
@@ -102164,7 +102323,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint > *arg1 = (CvTypedSeq<CvPoint > *) 0 ;
+  CvTypedSeq< CvPoint > *arg1 = (CvTypedSeq< CvPoint > *) 0 ;
   CvPoint *arg2 = (CvPoint *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -102174,11 +102333,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_append(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvPoint_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_append" "', argument " "1"" of type '" "CvTypedSeq<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_append" "', argument " "1"" of type '" "CvTypedSeq< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvPoint, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_CvPoint_append" "', argument " "2"" of type '" "CvPoint *""'"); 
@@ -102202,18 +102361,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint > *arg1 = (CvTypedSeq<CvPoint > *) 0 ;
-  CvPoint *result = 0 ;
+  CvTypedSeq< CvPoint > *arg1 = (CvTypedSeq< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvPoint_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_pop" "', argument " "1"" of type '" "CvTypedSeq<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_pop" "', argument " "1"" of type '" "CvTypedSeq< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint > * >(argp1);
   {
     try {
       result = (CvPoint *)(arg1)->pop(); 
@@ -102232,19 +102391,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_CvPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint > *result = 0 ;
+  CvTypedSeq< CvPoint > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_CvPoint")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvPoint > *)new CvTypedSeq<CvPoint >(); 
+      result = (CvTypedSeq< CvPoint > *)new CvTypedSeq< CvPoint >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvPoint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvPoint_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -102253,20 +102412,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_CvPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint > *arg1 = (CvTypedSeq<CvPoint > *) 0 ;
+  CvTypedSeq< CvPoint > *arg1 = (CvTypedSeq< CvPoint > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_CvPoint",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvPoint" "', argument " "1"" of type '" "CvTypedSeq<CvPoint > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvPoint" "', argument " "1"" of type '" "CvTypedSeq< CvPoint > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -102282,17 +102441,17 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_CvPoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvPoint_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvPoint_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint2D32f_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvPoint2D32f > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvPoint2D32f > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvPoint2D32f_cast",&obj0)) SWIG_fail;
   {
@@ -102311,14 +102470,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint2D32f_cast(PyObject *SWIGUNUSEDPARM(self
   }
   {
     try {
-      result = (CvTypedSeq<CvPoint2D32f > *)CvTypedSeq<CvPoint2D32f >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvPoint2D32f > *)CvTypedSeq< CvPoint2D32f >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -102327,22 +102486,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint2D32f___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint2D32f > *arg1 = (CvTypedSeq<CvPoint2D32f > *) 0 ;
+  CvTypedSeq< CvPoint2D32f > *arg1 = (CvTypedSeq< CvPoint2D32f > *) 0 ;
   int arg2 ;
-  CvPoint2D32f *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvPoint2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvPoint2D32f___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint2D32f___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvPoint2D32f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint2D32f___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvPoint2D32f > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint2D32f > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint2D32f > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvPoint2D32f___getitem__" "', argument " "2"" of type '" "int""'");
@@ -102366,7 +102525,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint2D32f___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint2D32f > *arg1 = (CvTypedSeq<CvPoint2D32f > *) 0 ;
+  CvTypedSeq< CvPoint2D32f > *arg1 = (CvTypedSeq< CvPoint2D32f > *) 0 ;
   int arg2 ;
   CvPoint2D32f *arg3 = (CvPoint2D32f *) 0 ;
   void *argp1 = 0 ;
@@ -102380,11 +102539,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint2D32f___setitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_CvPoint2D32f___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint2D32f___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvPoint2D32f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint2D32f___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvPoint2D32f > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint2D32f > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint2D32f > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvPoint2D32f___setitem__" "', argument " "2"" of type '" "int""'");
@@ -102413,7 +102572,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint2D32f_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint2D32f > *arg1 = (CvTypedSeq<CvPoint2D32f > *) 0 ;
+  CvTypedSeq< CvPoint2D32f > *arg1 = (CvTypedSeq< CvPoint2D32f > *) 0 ;
   CvPoint2D32f *arg2 = (CvPoint2D32f *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -102423,11 +102582,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint2D32f_append(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvPoint2D32f_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint2D32f_append" "', argument " "1"" of type '" "CvTypedSeq<CvPoint2D32f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint2D32f_append" "', argument " "1"" of type '" "CvTypedSeq< CvPoint2D32f > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint2D32f > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint2D32f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvPoint2D32f, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_CvPoint2D32f_append" "', argument " "2"" of type '" "CvPoint2D32f *""'"); 
@@ -102451,18 +102610,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint2D32f_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint2D32f > *arg1 = (CvTypedSeq<CvPoint2D32f > *) 0 ;
-  CvPoint2D32f *result = 0 ;
+  CvTypedSeq< CvPoint2D32f > *arg1 = (CvTypedSeq< CvPoint2D32f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvPoint2D32f *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvPoint2D32f_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint2D32f_pop" "', argument " "1"" of type '" "CvTypedSeq<CvPoint2D32f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint2D32f_pop" "', argument " "1"" of type '" "CvTypedSeq< CvPoint2D32f > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint2D32f > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint2D32f > * >(argp1);
   {
     try {
       result = (CvPoint2D32f *)(arg1)->pop(); 
@@ -102481,19 +102640,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_CvPoint2D32f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint2D32f > *result = 0 ;
+  CvTypedSeq< CvPoint2D32f > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_CvPoint2D32f")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvPoint2D32f > *)new CvTypedSeq<CvPoint2D32f >(); 
+      result = (CvTypedSeq< CvPoint2D32f > *)new CvTypedSeq< CvPoint2D32f >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -102502,20 +102661,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_CvPoint2D32f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvPoint2D32f > *arg1 = (CvTypedSeq<CvPoint2D32f > *) 0 ;
+  CvTypedSeq< CvPoint2D32f > *arg1 = (CvTypedSeq< CvPoint2D32f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_CvPoint2D32f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvPoint2D32f" "', argument " "1"" of type '" "CvTypedSeq<CvPoint2D32f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvPoint2D32f" "', argument " "1"" of type '" "CvTypedSeq< CvPoint2D32f > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvPoint2D32f > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvPoint2D32f > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -102531,17 +102690,17 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_CvPoint2D32f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvRect_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvRect > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvRect > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvRect_cast",&obj0)) SWIG_fail;
   {
@@ -102560,14 +102719,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvRect_cast(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   {
     try {
-      result = (CvTypedSeq<CvRect > *)CvTypedSeq<CvRect >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvRect > *)CvTypedSeq< CvRect >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -102576,22 +102735,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvRect___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvRect > *arg1 = (CvTypedSeq<CvRect > *) 0 ;
+  CvTypedSeq< CvRect > *arg1 = (CvTypedSeq< CvRect > *) 0 ;
   int arg2 ;
-  CvRect *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvRect *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvRect___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvRect___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvRect > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvRect___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvRect > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvRect > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvRect > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvRect___getitem__" "', argument " "2"" of type '" "int""'");
@@ -102615,7 +102774,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvRect___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvRect > *arg1 = (CvTypedSeq<CvRect > *) 0 ;
+  CvTypedSeq< CvRect > *arg1 = (CvTypedSeq< CvRect > *) 0 ;
   int arg2 ;
   CvRect *arg3 = (CvRect *) 0 ;
   void *argp1 = 0 ;
@@ -102629,11 +102788,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvRect___setitem__(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_CvRect___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvRect___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvRect > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvRect___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvRect > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvRect > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvRect > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvRect___setitem__" "', argument " "2"" of type '" "int""'");
@@ -102662,7 +102821,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvRect_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvRect > *arg1 = (CvTypedSeq<CvRect > *) 0 ;
+  CvTypedSeq< CvRect > *arg1 = (CvTypedSeq< CvRect > *) 0 ;
   CvRect *arg2 = (CvRect *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -102672,11 +102831,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvRect_append(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvRect_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvRect_append" "', argument " "1"" of type '" "CvTypedSeq<CvRect > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvRect_append" "', argument " "1"" of type '" "CvTypedSeq< CvRect > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvRect > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvRect > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvRect, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_CvRect_append" "', argument " "2"" of type '" "CvRect *""'"); 
@@ -102700,18 +102859,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvRect_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvRect > *arg1 = (CvTypedSeq<CvRect > *) 0 ;
-  CvRect *result = 0 ;
+  CvTypedSeq< CvRect > *arg1 = (CvTypedSeq< CvRect > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRect *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvRect_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvRect_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvRect_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvRect_pop" "', argument " "1"" of type '" "CvTypedSeq<CvRect > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvRect_pop" "', argument " "1"" of type '" "CvTypedSeq< CvRect > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvRect > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvRect > * >(argp1);
   {
     try {
       result = (CvRect *)(arg1)->pop(); 
@@ -102730,19 +102889,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_CvRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvRect > *result = 0 ;
+  CvTypedSeq< CvRect > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_CvRect")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvRect > *)new CvTypedSeq<CvRect >(); 
+      result = (CvTypedSeq< CvRect > *)new CvTypedSeq< CvRect >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvRect_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvRect_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -102751,20 +102910,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_CvRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvRect > *arg1 = (CvTypedSeq<CvRect > *) 0 ;
+  CvTypedSeq< CvRect > *arg1 = (CvTypedSeq< CvRect > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_CvRect",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvRect_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvRect_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvRect" "', argument " "1"" of type '" "CvTypedSeq<CvRect > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvRect" "', argument " "1"" of type '" "CvTypedSeq< CvRect > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvRect > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvRect > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -102780,17 +102939,17 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_CvRect_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvRect_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvRect_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvSeq_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvSeq * > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvSeq * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvSeq_cast",&obj0)) SWIG_fail;
   {
@@ -102809,14 +102968,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvSeq_cast(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     try {
-      result = (CvTypedSeq<CvSeq * > *)CvTypedSeq<CvSeq * >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvSeq * > *)CvTypedSeq< CvSeq * >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvSeq_p_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -102825,22 +102984,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvSeq___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvSeq * > *arg1 = (CvTypedSeq<CvSeq * > *) 0 ;
+  CvTypedSeq< CvSeq * > *arg1 = (CvTypedSeq< CvSeq * > *) 0 ;
   int arg2 ;
-  CvSeq **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSeq **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvSeq___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvSeq_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvSeq___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvSeq * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvSeq___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvSeq * > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvSeq * > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvSeq * > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvSeq___getitem__" "', argument " "2"" of type '" "int""'");
@@ -102864,7 +103023,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvSeq___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvSeq * > *arg1 = (CvTypedSeq<CvSeq * > *) 0 ;
+  CvTypedSeq< CvSeq * > *arg1 = (CvTypedSeq< CvSeq * > *) 0 ;
   int arg2 ;
   CvSeq **arg3 = (CvSeq **) 0 ;
   void *argp1 = 0 ;
@@ -102878,11 +103037,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvSeq___setitem__(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_CvSeq___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvSeq_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvSeq___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvSeq * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvSeq___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvSeq * > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvSeq * > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvSeq * > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvSeq___setitem__" "', argument " "2"" of type '" "int""'");
@@ -102913,7 +103072,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvSeq_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvSeq * > *arg1 = (CvTypedSeq<CvSeq * > *) 0 ;
+  CvTypedSeq< CvSeq * > *arg1 = (CvTypedSeq< CvSeq * > *) 0 ;
   CvSeq **arg2 = (CvSeq **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -102923,11 +103082,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvSeq_append(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvSeq_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvSeq_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvSeq_append" "', argument " "1"" of type '" "CvTypedSeq<CvSeq * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvSeq_append" "', argument " "1"" of type '" "CvTypedSeq< CvSeq * > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvSeq * > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvSeq * > * >(argp1);
   {
     if ((SWIG_ConvertPtr(obj1, &vptr2, SWIGTYPE_p_CvSeq, 1)) == -1){
       SWIG_fail;
@@ -102953,18 +103112,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvSeq_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvSeq * > *arg1 = (CvTypedSeq<CvSeq * > *) 0 ;
-  CvSeq **result = 0 ;
+  CvTypedSeq< CvSeq * > *arg1 = (CvTypedSeq< CvSeq * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvSeq_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvSeq_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvSeq_pop" "', argument " "1"" of type '" "CvTypedSeq<CvSeq * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvSeq_pop" "', argument " "1"" of type '" "CvTypedSeq< CvSeq * > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvSeq * > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvSeq * > * >(argp1);
   {
     try {
       result = (CvSeq **)(arg1)->pop(); 
@@ -102983,19 +103142,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_CvSeq(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvSeq * > *result = 0 ;
+  CvTypedSeq< CvSeq * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_CvSeq")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvSeq * > *)new CvTypedSeq<CvSeq * >(); 
+      result = (CvTypedSeq< CvSeq * > *)new CvTypedSeq< CvSeq * >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvSeq_p_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103004,20 +103163,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_CvSeq(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvSeq * > *arg1 = (CvTypedSeq<CvSeq * > *) 0 ;
+  CvTypedSeq< CvSeq * > *arg1 = (CvTypedSeq< CvSeq * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_CvSeq",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvSeq_p_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvSeq" "', argument " "1"" of type '" "CvTypedSeq<CvSeq * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvSeq" "', argument " "1"" of type '" "CvTypedSeq< CvSeq * > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvSeq * > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvSeq * > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -103033,17 +103192,17 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_CvSeq_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvSeq_p_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvQuadEdge2D_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvQuadEdge2D > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvQuadEdge2D > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvQuadEdge2D_cast",&obj0)) SWIG_fail;
   {
@@ -103062,14 +103221,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvQuadEdge2D_cast(PyObject *SWIGUNUSEDPARM(self
   }
   {
     try {
-      result = (CvTypedSeq<CvQuadEdge2D > *)CvTypedSeq<CvQuadEdge2D >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvQuadEdge2D > *)CvTypedSeq< CvQuadEdge2D >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103078,22 +103237,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvQuadEdge2D___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvQuadEdge2D > *arg1 = (CvTypedSeq<CvQuadEdge2D > *) 0 ;
+  CvTypedSeq< CvQuadEdge2D > *arg1 = (CvTypedSeq< CvQuadEdge2D > *) 0 ;
   int arg2 ;
-  CvQuadEdge2D *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvQuadEdge2D *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvQuadEdge2D___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvQuadEdge2D___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvQuadEdge2D > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvQuadEdge2D___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvQuadEdge2D > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvQuadEdge2D > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvQuadEdge2D > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvQuadEdge2D___getitem__" "', argument " "2"" of type '" "int""'");
@@ -103117,7 +103276,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvQuadEdge2D___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvQuadEdge2D > *arg1 = (CvTypedSeq<CvQuadEdge2D > *) 0 ;
+  CvTypedSeq< CvQuadEdge2D > *arg1 = (CvTypedSeq< CvQuadEdge2D > *) 0 ;
   int arg2 ;
   CvQuadEdge2D *arg3 = (CvQuadEdge2D *) 0 ;
   void *argp1 = 0 ;
@@ -103131,11 +103290,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvQuadEdge2D___setitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_CvQuadEdge2D___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvQuadEdge2D___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvQuadEdge2D > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvQuadEdge2D___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvQuadEdge2D > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvQuadEdge2D > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvQuadEdge2D > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvQuadEdge2D___setitem__" "', argument " "2"" of type '" "int""'");
@@ -103164,7 +103323,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvQuadEdge2D_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvQuadEdge2D > *arg1 = (CvTypedSeq<CvQuadEdge2D > *) 0 ;
+  CvTypedSeq< CvQuadEdge2D > *arg1 = (CvTypedSeq< CvQuadEdge2D > *) 0 ;
   CvQuadEdge2D *arg2 = (CvQuadEdge2D *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -103174,11 +103333,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvQuadEdge2D_append(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvQuadEdge2D_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvQuadEdge2D_append" "', argument " "1"" of type '" "CvTypedSeq<CvQuadEdge2D > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvQuadEdge2D_append" "', argument " "1"" of type '" "CvTypedSeq< CvQuadEdge2D > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvQuadEdge2D > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvQuadEdge2D > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvQuadEdge2D, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_CvQuadEdge2D_append" "', argument " "2"" of type '" "CvQuadEdge2D *""'"); 
@@ -103202,18 +103361,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvQuadEdge2D_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvQuadEdge2D > *arg1 = (CvTypedSeq<CvQuadEdge2D > *) 0 ;
-  CvQuadEdge2D *result = 0 ;
+  CvTypedSeq< CvQuadEdge2D > *arg1 = (CvTypedSeq< CvQuadEdge2D > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvQuadEdge2D *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvQuadEdge2D_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvQuadEdge2D_pop" "', argument " "1"" of type '" "CvTypedSeq<CvQuadEdge2D > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvQuadEdge2D_pop" "', argument " "1"" of type '" "CvTypedSeq< CvQuadEdge2D > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvQuadEdge2D > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvQuadEdge2D > * >(argp1);
   {
     try {
       result = (CvQuadEdge2D *)(arg1)->pop(); 
@@ -103232,19 +103391,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_CvQuadEdge2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvQuadEdge2D > *result = 0 ;
+  CvTypedSeq< CvQuadEdge2D > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_CvQuadEdge2D")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvQuadEdge2D > *)new CvTypedSeq<CvQuadEdge2D >(); 
+      result = (CvTypedSeq< CvQuadEdge2D > *)new CvTypedSeq< CvQuadEdge2D >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103253,20 +103412,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_CvQuadEdge2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvQuadEdge2D > *arg1 = (CvTypedSeq<CvQuadEdge2D > *) 0 ;
+  CvTypedSeq< CvQuadEdge2D > *arg1 = (CvTypedSeq< CvQuadEdge2D > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_CvQuadEdge2D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvQuadEdge2D" "', argument " "1"" of type '" "CvTypedSeq<CvQuadEdge2D > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvQuadEdge2D" "', argument " "1"" of type '" "CvTypedSeq< CvQuadEdge2D > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvQuadEdge2D > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvQuadEdge2D > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -103282,17 +103441,17 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_CvQuadEdge2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvConnectedComp_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvConnectedComp > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvConnectedComp > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvConnectedComp_cast",&obj0)) SWIG_fail;
   {
@@ -103311,14 +103470,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvConnectedComp_cast(PyObject *SWIGUNUSEDPARM(s
   }
   {
     try {
-      result = (CvTypedSeq<CvConnectedComp > *)CvTypedSeq<CvConnectedComp >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvConnectedComp > *)CvTypedSeq< CvConnectedComp >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103327,22 +103486,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvConnectedComp___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvConnectedComp > *arg1 = (CvTypedSeq<CvConnectedComp > *) 0 ;
+  CvTypedSeq< CvConnectedComp > *arg1 = (CvTypedSeq< CvConnectedComp > *) 0 ;
   int arg2 ;
-  CvConnectedComp *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvConnectedComp *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvConnectedComp___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvConnectedComp___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvConnectedComp > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvConnectedComp___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvConnectedComp > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvConnectedComp > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvConnectedComp > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvConnectedComp___getitem__" "', argument " "2"" of type '" "int""'");
@@ -103366,7 +103525,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvConnectedComp___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvConnectedComp > *arg1 = (CvTypedSeq<CvConnectedComp > *) 0 ;
+  CvTypedSeq< CvConnectedComp > *arg1 = (CvTypedSeq< CvConnectedComp > *) 0 ;
   int arg2 ;
   CvConnectedComp *arg3 = (CvConnectedComp *) 0 ;
   void *argp1 = 0 ;
@@ -103380,11 +103539,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvConnectedComp___setitem__(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_CvConnectedComp___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvConnectedComp___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvConnectedComp > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvConnectedComp___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvConnectedComp > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvConnectedComp > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvConnectedComp > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvConnectedComp___setitem__" "', argument " "2"" of type '" "int""'");
@@ -103413,7 +103572,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvConnectedComp_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvConnectedComp > *arg1 = (CvTypedSeq<CvConnectedComp > *) 0 ;
+  CvTypedSeq< CvConnectedComp > *arg1 = (CvTypedSeq< CvConnectedComp > *) 0 ;
   CvConnectedComp *arg2 = (CvConnectedComp *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -103423,11 +103582,11 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvConnectedComp_append(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvConnectedComp_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvConnectedComp_append" "', argument " "1"" of type '" "CvTypedSeq<CvConnectedComp > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvConnectedComp_append" "', argument " "1"" of type '" "CvTypedSeq< CvConnectedComp > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvConnectedComp > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvConnectedComp > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvConnectedComp, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_CvConnectedComp_append" "', argument " "2"" of type '" "CvConnectedComp *""'"); 
@@ -103451,18 +103610,18 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvConnectedComp_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvConnectedComp > *arg1 = (CvTypedSeq<CvConnectedComp > *) 0 ;
-  CvConnectedComp *result = 0 ;
+  CvTypedSeq< CvConnectedComp > *arg1 = (CvTypedSeq< CvConnectedComp > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvConnectedComp *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvConnectedComp_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvConnectedComp_pop" "', argument " "1"" of type '" "CvTypedSeq<CvConnectedComp > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvConnectedComp_pop" "', argument " "1"" of type '" "CvTypedSeq< CvConnectedComp > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvConnectedComp > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvConnectedComp > * >(argp1);
   {
     try {
       result = (CvConnectedComp *)(arg1)->pop(); 
@@ -103481,19 +103640,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_CvConnectedComp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvConnectedComp > *result = 0 ;
+  CvTypedSeq< CvConnectedComp > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_CvConnectedComp")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvConnectedComp > *)new CvTypedSeq<CvConnectedComp >(); 
+      result = (CvTypedSeq< CvConnectedComp > *)new CvTypedSeq< CvConnectedComp >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103502,20 +103661,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_CvConnectedComp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvConnectedComp > *arg1 = (CvTypedSeq<CvConnectedComp > *) 0 ;
+  CvTypedSeq< CvConnectedComp > *arg1 = (CvTypedSeq< CvConnectedComp > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_CvConnectedComp",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvConnectedComp" "', argument " "1"" of type '" "CvTypedSeq<CvConnectedComp > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvConnectedComp" "', argument " "1"" of type '" "CvTypedSeq< CvConnectedComp > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvConnectedComp > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvConnectedComp > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -103531,17 +103690,17 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_CvConnectedComp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvTuple<CvPoint,2 > > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvTuple< CvPoint,2 > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvPoint_2_cast",&obj0)) SWIG_fail;
   {
@@ -103560,14 +103719,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2_cast(PyObject *SWIGUNUSEDPARM(self),
   }
   {
     try {
-      result = (CvTypedSeq<CvTuple<CvPoint,2 > > *)CvTypedSeq<CvTuple<CvPoint,2 > >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvTuple< CvPoint,2 > > *)CvTypedSeq< CvTuple< CvPoint,2 > >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103576,22 +103735,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<CvPoint,2 > > *arg1 = (CvTypedSeq<CvTuple<CvPoint,2 > > *) 0 ;
+  CvTypedSeq< CvTuple< CvPoint,2 > > *arg1 = (CvTypedSeq< CvTuple< CvPoint,2 > > *) 0 ;
   int arg2 ;
-  CvTuple<CvPoint,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvTuple< CvPoint,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvPoint_2___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_2___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<CvPoint,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_2___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< CvPoint,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<CvPoint,2 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< CvPoint,2 > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvPoint_2___getitem__" "', argument " "2"" of type '" "int""'");
@@ -103599,14 +103758,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2___getitem__(PyObject *SWIGUNUSEDPARM(
   arg2 = static_cast< int >(val2);
   {
     try {
-      result = (CvTuple<CvPoint,2 > *)(arg1)->__getitem__(arg2); 
+      result = (CvTuple< CvPoint,2 > *)(arg1)->__getitem__(arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTCvPoint_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_CvPoint_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103615,9 +103774,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<CvPoint,2 > > *arg1 = (CvTypedSeq<CvTuple<CvPoint,2 > > *) 0 ;
+  CvTypedSeq< CvTuple< CvPoint,2 > > *arg1 = (CvTypedSeq< CvTuple< CvPoint,2 > > *) 0 ;
   int arg2 ;
-  CvTuple<CvPoint,2 > *arg3 = (CvTuple<CvPoint,2 > *) 0 ;
+  CvTuple< CvPoint,2 > *arg3 = (CvTuple< CvPoint,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -103629,21 +103788,21 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2___setitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_CvPoint_2___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_2___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<CvPoint,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_2___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< CvPoint,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<CvPoint,2 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< CvPoint,2 > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_CvPoint_2___setitem__" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_CvTupleTCvPoint_2_t, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_CvTupleT_CvPoint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvSeq_CvPoint_2___setitem__" "', argument " "3"" of type '" "CvTuple<CvPoint,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvSeq_CvPoint_2___setitem__" "', argument " "3"" of type '" "CvTuple< CvPoint,2 > *""'"); 
   }
-  arg3 = reinterpret_cast< CvTuple<CvPoint,2 > * >(argp3);
+  arg3 = reinterpret_cast< CvTuple< CvPoint,2 > * >(argp3);
   {
     try {
       (arg1)->__setitem__(arg2,arg3); 
@@ -103662,8 +103821,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<CvPoint,2 > > *arg1 = (CvTypedSeq<CvTuple<CvPoint,2 > > *) 0 ;
-  CvTuple<CvPoint,2 > *arg2 = (CvTuple<CvPoint,2 > *) 0 ;
+  CvTypedSeq< CvTuple< CvPoint,2 > > *arg1 = (CvTypedSeq< CvTuple< CvPoint,2 > > *) 0 ;
+  CvTuple< CvPoint,2 > *arg2 = (CvTuple< CvPoint,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -103672,16 +103831,16 @@ SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2_append(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_CvPoint_2_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_2_append" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<CvPoint,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_2_append" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< CvPoint,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<CvPoint,2 > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTupleTCvPoint_2_t, 0 |  0 );
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< CvPoint,2 > > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTupleT_CvPoint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_CvPoint_2_append" "', argument " "2"" of type '" "CvTuple<CvPoint,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_CvPoint_2_append" "', argument " "2"" of type '" "CvTuple< CvPoint,2 > *""'"); 
   }
-  arg2 = reinterpret_cast< CvTuple<CvPoint,2 > * >(argp2);
+  arg2 = reinterpret_cast< CvTuple< CvPoint,2 > * >(argp2);
   {
     try {
       (arg1)->append(arg2); 
@@ -103700,28 +103859,28 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_CvPoint_2_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<CvPoint,2 > > *arg1 = (CvTypedSeq<CvTuple<CvPoint,2 > > *) 0 ;
-  CvTuple<CvPoint,2 > *result = 0 ;
+  CvTypedSeq< CvTuple< CvPoint,2 > > *arg1 = (CvTypedSeq< CvTuple< CvPoint,2 > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTuple< CvPoint,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_CvPoint_2_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_2_pop" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<CvPoint,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_CvPoint_2_pop" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< CvPoint,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<CvPoint,2 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< CvPoint,2 > > * >(argp1);
   {
     try {
-      result = (CvTuple<CvPoint,2 > *)(arg1)->pop(); 
+      result = (CvTuple< CvPoint,2 > *)(arg1)->pop(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTCvPoint_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_CvPoint_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103730,19 +103889,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_CvPoint_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<CvPoint,2 > > *result = 0 ;
+  CvTypedSeq< CvTuple< CvPoint,2 > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_CvPoint_2")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvTuple<CvPoint,2 > > *)new CvTypedSeq<CvTuple<CvPoint,2 > >(); 
+      result = (CvTypedSeq< CvTuple< CvPoint,2 > > *)new CvTypedSeq< CvTuple< CvPoint,2 > >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103751,20 +103910,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_CvPoint_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<CvPoint,2 > > *arg1 = (CvTypedSeq<CvTuple<CvPoint,2 > > *) 0 ;
+  CvTypedSeq< CvTuple< CvPoint,2 > > *arg1 = (CvTypedSeq< CvTuple< CvPoint,2 > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_CvPoint_2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvPoint_2" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<CvPoint,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_CvPoint_2" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< CvPoint,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<CvPoint,2 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< CvPoint,2 > > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -103780,17 +103939,17 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_CvPoint_2_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_2_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvTuple<float,2 > > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvTuple< float,2 > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_float_2_cast",&obj0)) SWIG_fail;
   {
@@ -103809,14 +103968,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_float_2_cast(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     try {
-      result = (CvTypedSeq<CvTuple<float,2 > > *)CvTypedSeq<CvTuple<float,2 > >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvTuple< float,2 > > *)CvTypedSeq< CvTuple< float,2 > >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103825,22 +103984,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_2___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,2 > > *arg1 = (CvTypedSeq<CvTuple<float,2 > > *) 0 ;
+  CvTypedSeq< CvTuple< float,2 > > *arg1 = (CvTypedSeq< CvTuple< float,2 > > *) 0 ;
   int arg2 ;
-  CvTuple<float,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvTuple< float,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_float_2___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_2___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_2___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,2 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,2 > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_float_2___getitem__" "', argument " "2"" of type '" "int""'");
@@ -103848,14 +104007,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_float_2___getitem__(PyObject *SWIGUNUSEDPARM(se
   arg2 = static_cast< int >(val2);
   {
     try {
-      result = (CvTuple<float,2 > *)(arg1)->__getitem__(arg2); 
+      result = (CvTuple< float,2 > *)(arg1)->__getitem__(arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTfloat_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_float_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103864,9 +104023,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_2___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,2 > > *arg1 = (CvTypedSeq<CvTuple<float,2 > > *) 0 ;
+  CvTypedSeq< CvTuple< float,2 > > *arg1 = (CvTypedSeq< CvTuple< float,2 > > *) 0 ;
   int arg2 ;
-  CvTuple<float,2 > *arg3 = (CvTuple<float,2 > *) 0 ;
+  CvTuple< float,2 > *arg3 = (CvTuple< float,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -103878,21 +104037,21 @@ SWIGINTERN PyObject *_wrap_CvSeq_float_2___setitem__(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_float_2___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_2___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_2___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,2 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,2 > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_float_2___setitem__" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_CvTupleTfloat_2_t, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_CvTupleT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvSeq_float_2___setitem__" "', argument " "3"" of type '" "CvTuple<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvSeq_float_2___setitem__" "', argument " "3"" of type '" "CvTuple< float,2 > *""'"); 
   }
-  arg3 = reinterpret_cast< CvTuple<float,2 > * >(argp3);
+  arg3 = reinterpret_cast< CvTuple< float,2 > * >(argp3);
   {
     try {
       (arg1)->__setitem__(arg2,arg3); 
@@ -103911,8 +104070,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_2_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,2 > > *arg1 = (CvTypedSeq<CvTuple<float,2 > > *) 0 ;
-  CvTuple<float,2 > *arg2 = (CvTuple<float,2 > *) 0 ;
+  CvTypedSeq< CvTuple< float,2 > > *arg1 = (CvTypedSeq< CvTuple< float,2 > > *) 0 ;
+  CvTuple< float,2 > *arg2 = (CvTuple< float,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -103921,16 +104080,16 @@ SWIGINTERN PyObject *_wrap_CvSeq_float_2_append(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_float_2_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_2_append" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_2_append" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,2 > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTupleTfloat_2_t, 0 |  0 );
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,2 > > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTupleT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_float_2_append" "', argument " "2"" of type '" "CvTuple<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_float_2_append" "', argument " "2"" of type '" "CvTuple< float,2 > *""'"); 
   }
-  arg2 = reinterpret_cast< CvTuple<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< CvTuple< float,2 > * >(argp2);
   {
     try {
       (arg1)->append(arg2); 
@@ -103949,28 +104108,28 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_2_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,2 > > *arg1 = (CvTypedSeq<CvTuple<float,2 > > *) 0 ;
-  CvTuple<float,2 > *result = 0 ;
+  CvTypedSeq< CvTuple< float,2 > > *arg1 = (CvTypedSeq< CvTuple< float,2 > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTuple< float,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_float_2_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_2_pop" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_2_pop" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,2 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,2 > > * >(argp1);
   {
     try {
-      result = (CvTuple<float,2 > *)(arg1)->pop(); 
+      result = (CvTuple< float,2 > *)(arg1)->pop(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTfloat_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_float_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -103979,19 +104138,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_float_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,2 > > *result = 0 ;
+  CvTypedSeq< CvTuple< float,2 > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_float_2")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvTuple<float,2 > > *)new CvTypedSeq<CvTuple<float,2 > >(); 
+      result = (CvTypedSeq< CvTuple< float,2 > > *)new CvTypedSeq< CvTuple< float,2 > >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -104000,20 +104159,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_float_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,2 > > *arg1 = (CvTypedSeq<CvTuple<float,2 > > *) 0 ;
+  CvTypedSeq< CvTuple< float,2 > > *arg1 = (CvTypedSeq< CvTuple< float,2 > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_float_2",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_float_2" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,2 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_float_2" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,2 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,2 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,2 > > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -104029,17 +104188,17 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_float_2_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_3_cast(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSeq *arg1 = (CvSeq *) 0 ;
-  CvTypedSeq<CvTuple<float,3 > > *result = 0 ;
   void *ptr1 ;
   PyObject * obj0 = 0 ;
+  CvTypedSeq< CvTuple< float,3 > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_float_3_cast",&obj0)) SWIG_fail;
   {
@@ -104058,14 +104217,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_float_3_cast(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     try {
-      result = (CvTypedSeq<CvTuple<float,3 > > *)CvTypedSeq<CvTuple<float,3 > >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
+      result = (CvTypedSeq< CvTuple< float,3 > > *)CvTypedSeq< CvTuple< float,3 > >::SWIGTEMPLATEDISAMBIGUATOR cast(arg1); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -104074,22 +104233,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_3___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,3 > > *arg1 = (CvTypedSeq<CvTuple<float,3 > > *) 0 ;
+  CvTypedSeq< CvTuple< float,3 > > *arg1 = (CvTypedSeq< CvTuple< float,3 > > *) 0 ;
   int arg2 ;
-  CvTuple<float,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvTuple< float,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_float_3___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_3___getitem__" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,3 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_3___getitem__" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,3 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,3 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,3 > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_float_3___getitem__" "', argument " "2"" of type '" "int""'");
@@ -104097,14 +104256,14 @@ SWIGINTERN PyObject *_wrap_CvSeq_float_3___getitem__(PyObject *SWIGUNUSEDPARM(se
   arg2 = static_cast< int >(val2);
   {
     try {
-      result = (CvTuple<float,3 > *)(arg1)->__getitem__(arg2); 
+      result = (CvTuple< float,3 > *)(arg1)->__getitem__(arg2); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTfloat_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_float_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -104113,9 +104272,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_3___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,3 > > *arg1 = (CvTypedSeq<CvTuple<float,3 > > *) 0 ;
+  CvTypedSeq< CvTuple< float,3 > > *arg1 = (CvTypedSeq< CvTuple< float,3 > > *) 0 ;
   int arg2 ;
-  CvTuple<float,3 > *arg3 = (CvTuple<float,3 > *) 0 ;
+  CvTuple< float,3 > *arg3 = (CvTuple< float,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -104127,21 +104286,21 @@ SWIGINTERN PyObject *_wrap_CvSeq_float_3___setitem__(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSeq_float_3___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_3___setitem__" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,3 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_3___setitem__" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,3 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,3 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,3 > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CvSeq_float_3___setitem__" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_CvTupleTfloat_3_t, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_CvTupleT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvSeq_float_3___setitem__" "', argument " "3"" of type '" "CvTuple<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CvSeq_float_3___setitem__" "', argument " "3"" of type '" "CvTuple< float,3 > *""'"); 
   }
-  arg3 = reinterpret_cast< CvTuple<float,3 > * >(argp3);
+  arg3 = reinterpret_cast< CvTuple< float,3 > * >(argp3);
   {
     try {
       (arg1)->__setitem__(arg2,arg3); 
@@ -104160,8 +104319,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_3_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,3 > > *arg1 = (CvTypedSeq<CvTuple<float,3 > > *) 0 ;
-  CvTuple<float,3 > *arg2 = (CvTuple<float,3 > *) 0 ;
+  CvTypedSeq< CvTuple< float,3 > > *arg1 = (CvTypedSeq< CvTuple< float,3 > > *) 0 ;
+  CvTuple< float,3 > *arg2 = (CvTuple< float,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -104170,16 +104329,16 @@ SWIGINTERN PyObject *_wrap_CvSeq_float_3_append(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSeq_float_3_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_3_append" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,3 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_3_append" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,3 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,3 > > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTupleTfloat_3_t, 0 |  0 );
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,3 > > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CvTupleT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_float_3_append" "', argument " "2"" of type '" "CvTuple<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CvSeq_float_3_append" "', argument " "2"" of type '" "CvTuple< float,3 > *""'"); 
   }
-  arg2 = reinterpret_cast< CvTuple<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< CvTuple< float,3 > * >(argp2);
   {
     try {
       (arg1)->append(arg2); 
@@ -104198,28 +104357,28 @@ fail:
 
 SWIGINTERN PyObject *_wrap_CvSeq_float_3_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,3 > > *arg1 = (CvTypedSeq<CvTuple<float,3 > > *) 0 ;
-  CvTuple<float,3 > *result = 0 ;
+  CvTypedSeq< CvTuple< float,3 > > *arg1 = (CvTypedSeq< CvTuple< float,3 > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTuple< float,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSeq_float_3_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_3_pop" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,3 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSeq_float_3_pop" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,3 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,3 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,3 > > * >(argp1);
   {
     try {
-      result = (CvTuple<float,3 > *)(arg1)->pop(); 
+      result = (CvTuple< float,3 > *)(arg1)->pop(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleTfloat_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTupleT_float_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -104228,19 +104387,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_CvSeq_float_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,3 > > *result = 0 ;
+  CvTypedSeq< CvTuple< float,3 > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_CvSeq_float_3")) SWIG_fail;
   {
     try {
-      result = (CvTypedSeq<CvTuple<float,3 > > *)new CvTypedSeq<CvTuple<float,3 > >(); 
+      result = (CvTypedSeq< CvTuple< float,3 > > *)new CvTypedSeq< CvTuple< float,3 > >(); 
     } 
     catch (...) 
     {
       SWIG_fail;
     } 
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -104249,20 +104408,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_CvSeq_float_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  CvTypedSeq<CvTuple<float,3 > > *arg1 = (CvTypedSeq<CvTuple<float,3 > > *) 0 ;
+  CvTypedSeq< CvTuple< float,3 > > *arg1 = (CvTypedSeq< CvTuple< float,3 > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_CvSeq_float_3",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_float_3" "', argument " "1"" of type '" "CvTypedSeq<CvTuple<float,3 > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvSeq_float_3" "', argument " "1"" of type '" "CvTypedSeq< CvTuple< float,3 > > *""'"); 
   }
-  arg1 = reinterpret_cast< CvTypedSeq<CvTuple<float,3 > > * >(argp1);
+  arg1 = reinterpret_cast< CvTypedSeq< CvTuple< float,3 > > * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -104278,8 +104437,8 @@ fail:
 
 SWIGINTERN PyObject *CvSeq_float_3_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -104291,7 +104450,6 @@ SWIGINTERN PyObject *_wrap_SendErrorToPython(PyObject *SWIGUNUSEDPARM(self), PyO
   char *arg4 = (char *) 0 ;
   int arg5 ;
   void *arg6 = (void *) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   int res2 ;
@@ -104312,6 +104470,7 @@ SWIGINTERN PyObject *_wrap_SendErrorToPython(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:SendErrorToPython",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
 
 
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_CvRNG_Wrapper", _wrap_new_CvRNG_Wrapper, METH_VARARGS, NULL},
-        { (char *)"CvRNG_Wrapper_ptr", _wrap_CvRNG_Wrapper_ptr, METH_VARARGS, NULL},
-        { (char *)"CvRNG_Wrapper_ref", _wrap_CvRNG_Wrapper_ref, METH_VARARGS, NULL},
-        { (char *)"CvRNG_Wrapper___eq__", _wrap_CvRNG_Wrapper___eq__, METH_VARARGS, NULL},
-        { (char *)"CvRNG_Wrapper___ne__", _wrap_CvRNG_Wrapper___ne__, METH_VARARGS, NULL},
-        { (char *)"delete_CvRNG_Wrapper", _wrap_delete_CvRNG_Wrapper, METH_VARARGS, NULL},
+        { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
+        { (char *)"new_CvRNG_Wrapper", _wrap_new_CvRNG_Wrapper, METH_VARARGS, (char *)"new_CvRNG_Wrapper(CvRNG val) -> CvRNG_Wrapper"},
+        { (char *)"CvRNG_Wrapper_ptr", _wrap_CvRNG_Wrapper_ptr, METH_VARARGS, (char *)"CvRNG_Wrapper_ptr(CvRNG_Wrapper self) -> CvRNG"},
+        { (char *)"CvRNG_Wrapper_ref", _wrap_CvRNG_Wrapper_ref, METH_VARARGS, (char *)"CvRNG_Wrapper_ref(CvRNG_Wrapper self) -> CvRNG"},
+        { (char *)"CvRNG_Wrapper___eq__", _wrap_CvRNG_Wrapper___eq__, METH_VARARGS, (char *)"CvRNG_Wrapper___eq__(CvRNG_Wrapper self, CvRNG_Wrapper x) -> bool"},
+        { (char *)"CvRNG_Wrapper___ne__", _wrap_CvRNG_Wrapper___ne__, METH_VARARGS, (char *)"CvRNG_Wrapper___ne__(CvRNG_Wrapper self, CvRNG_Wrapper x) -> bool"},
+        { (char *)"delete_CvRNG_Wrapper", _wrap_delete_CvRNG_Wrapper, METH_VARARGS, (char *)"delete_CvRNG_Wrapper(CvRNG_Wrapper self)"},
         { (char *)"CvRNG_Wrapper_swigregister", CvRNG_Wrapper_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_CvSubdiv2DEdge_Wrapper", _wrap_new_CvSubdiv2DEdge_Wrapper, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DEdge_Wrapper_ptr", _wrap_CvSubdiv2DEdge_Wrapper_ptr, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DEdge_Wrapper_ref", _wrap_CvSubdiv2DEdge_Wrapper_ref, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DEdge_Wrapper___eq__", _wrap_CvSubdiv2DEdge_Wrapper___eq__, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DEdge_Wrapper___ne__", _wrap_CvSubdiv2DEdge_Wrapper___ne__, METH_VARARGS, NULL},
-        { (char *)"delete_CvSubdiv2DEdge_Wrapper", _wrap_delete_CvSubdiv2DEdge_Wrapper, METH_VARARGS, NULL},
+        { (char *)"new_CvSubdiv2DEdge_Wrapper", _wrap_new_CvSubdiv2DEdge_Wrapper, METH_VARARGS, (char *)"new_CvSubdiv2DEdge_Wrapper(CvSubdiv2DEdge val) -> CvSubdiv2DEdge_Wrapper"},
+        { (char *)"CvSubdiv2DEdge_Wrapper_ptr", _wrap_CvSubdiv2DEdge_Wrapper_ptr, METH_VARARGS, (char *)"CvSubdiv2DEdge_Wrapper_ptr(CvSubdiv2DEdge_Wrapper self) -> CvSubdiv2DEdge"},
+        { (char *)"CvSubdiv2DEdge_Wrapper_ref", _wrap_CvSubdiv2DEdge_Wrapper_ref, METH_VARARGS, (char *)"CvSubdiv2DEdge_Wrapper_ref(CvSubdiv2DEdge_Wrapper self) -> CvSubdiv2DEdge"},
+        { (char *)"CvSubdiv2DEdge_Wrapper___eq__", _wrap_CvSubdiv2DEdge_Wrapper___eq__, METH_VARARGS, (char *)"CvSubdiv2DEdge_Wrapper___eq__(CvSubdiv2DEdge_Wrapper self, CvSubdiv2DEdge_Wrapper x) -> bool"},
+        { (char *)"CvSubdiv2DEdge_Wrapper___ne__", _wrap_CvSubdiv2DEdge_Wrapper___ne__, METH_VARARGS, (char *)"CvSubdiv2DEdge_Wrapper___ne__(CvSubdiv2DEdge_Wrapper self, CvSubdiv2DEdge_Wrapper x) -> bool"},
+        { (char *)"delete_CvSubdiv2DEdge_Wrapper", _wrap_delete_CvSubdiv2DEdge_Wrapper, METH_VARARGS, (char *)"delete_CvSubdiv2DEdge_Wrapper(CvSubdiv2DEdge_Wrapper self)"},
         { (char *)"CvSubdiv2DEdge_Wrapper_swigregister", CvSubdiv2DEdge_Wrapper_swigregister, METH_VARARGS, NULL},
-        { (char *)"delete_PySwigIterator", _wrap_delete_PySwigIterator, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_value", _wrap_PySwigIterator_value, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_incr", _wrap_PySwigIterator_incr, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_decr", _wrap_PySwigIterator_decr, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_distance", _wrap_PySwigIterator_distance, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_equal", _wrap_PySwigIterator_equal, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_copy", _wrap_PySwigIterator_copy, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_next", _wrap_PySwigIterator_next, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_previous", _wrap_PySwigIterator_previous, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_advance", _wrap_PySwigIterator_advance, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator___eq__", _wrap_PySwigIterator___eq__, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator___ne__", _wrap_PySwigIterator___ne__, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator___iadd__", _wrap_PySwigIterator___iadd__, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator___isub__", _wrap_PySwigIterator___isub__, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator___add__", _wrap_PySwigIterator___add__, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator___sub__", _wrap_PySwigIterator___sub__, METH_VARARGS, NULL},
-        { (char *)"PySwigIterator_swigregister", PySwigIterator_swigregister, METH_VARARGS, NULL},
-        { (char *)"FloatVector_iterator", _wrap_FloatVector_iterator, METH_VARARGS, NULL},
-        { (char *)"FloatVector___nonzero__", _wrap_FloatVector___nonzero__, METH_VARARGS, NULL},
-        { (char *)"FloatVector___len__", _wrap_FloatVector___len__, METH_VARARGS, NULL},
-        { (char *)"FloatVector_pop", _wrap_FloatVector_pop, METH_VARARGS, NULL},
-        { (char *)"FloatVector___getslice__", _wrap_FloatVector___getslice__, METH_VARARGS, NULL},
-        { (char *)"FloatVector___setslice__", _wrap_FloatVector___setslice__, METH_VARARGS, NULL},
-        { (char *)"FloatVector___delslice__", _wrap_FloatVector___delslice__, METH_VARARGS, NULL},
-        { (char *)"FloatVector___delitem__", _wrap_FloatVector___delitem__, METH_VARARGS, NULL},
-        { (char *)"FloatVector___getitem__", _wrap_FloatVector___getitem__, METH_VARARGS, NULL},
-        { (char *)"FloatVector___setitem__", _wrap_FloatVector___setitem__, METH_VARARGS, NULL},
-        { (char *)"FloatVector_append", _wrap_FloatVector_append, METH_VARARGS, NULL},
-        { (char *)"FloatVector_empty", _wrap_FloatVector_empty, METH_VARARGS, NULL},
-        { (char *)"FloatVector_size", _wrap_FloatVector_size, METH_VARARGS, NULL},
-        { (char *)"FloatVector_clear", _wrap_FloatVector_clear, METH_VARARGS, NULL},
-        { (char *)"FloatVector_swap", _wrap_FloatVector_swap, METH_VARARGS, NULL},
-        { (char *)"FloatVector_get_allocator", _wrap_FloatVector_get_allocator, METH_VARARGS, NULL},
-        { (char *)"FloatVector_begin", _wrap_FloatVector_begin, METH_VARARGS, NULL},
-        { (char *)"FloatVector_end", _wrap_FloatVector_end, METH_VARARGS, NULL},
-        { (char *)"FloatVector_rbegin", _wrap_FloatVector_rbegin, METH_VARARGS, NULL},
-        { (char *)"FloatVector_rend", _wrap_FloatVector_rend, METH_VARARGS, NULL},
-        { (char *)"FloatVector_pop_back", _wrap_FloatVector_pop_back, METH_VARARGS, NULL},
-        { (char *)"FloatVector_erase", _wrap_FloatVector_erase, METH_VARARGS, NULL},
-        { (char *)"new_FloatVector", _wrap_new_FloatVector, METH_VARARGS, NULL},
-        { (char *)"FloatVector_push_back", _wrap_FloatVector_push_back, METH_VARARGS, NULL},
-        { (char *)"FloatVector_front", _wrap_FloatVector_front, METH_VARARGS, NULL},
-        { (char *)"FloatVector_back", _wrap_FloatVector_back, METH_VARARGS, NULL},
-        { (char *)"FloatVector_assign", _wrap_FloatVector_assign, METH_VARARGS, NULL},
-        { (char *)"FloatVector_resize", _wrap_FloatVector_resize, METH_VARARGS, NULL},
-        { (char *)"FloatVector_insert", _wrap_FloatVector_insert, METH_VARARGS, NULL},
-        { (char *)"FloatVector_reserve", _wrap_FloatVector_reserve, METH_VARARGS, NULL},
-        { (char *)"FloatVector_capacity", _wrap_FloatVector_capacity, METH_VARARGS, NULL},
-        { (char *)"delete_FloatVector", _wrap_delete_FloatVector, METH_VARARGS, NULL},
+        { (char *)"delete_SwigPyIterator", _wrap_delete_SwigPyIterator, METH_VARARGS, (char *)"delete_SwigPyIterator(SwigPyIterator self)"},
+        { (char *)"SwigPyIterator_value", _wrap_SwigPyIterator_value, METH_VARARGS, (char *)"SwigPyIterator_value(SwigPyIterator self) -> PyObject"},
+        { (char *)"SwigPyIterator_incr", _wrap_SwigPyIterator_incr, METH_VARARGS, (char *)"\n"
+               "incr(size_t n = 1) -> SwigPyIterator\n"
+               "SwigPyIterator_incr(SwigPyIterator self) -> SwigPyIterator\n"
+               ""},
+        { (char *)"SwigPyIterator_decr", _wrap_SwigPyIterator_decr, METH_VARARGS, (char *)"\n"
+               "decr(size_t n = 1) -> SwigPyIterator\n"
+               "SwigPyIterator_decr(SwigPyIterator self) -> SwigPyIterator\n"
+               ""},
+        { (char *)"SwigPyIterator_distance", _wrap_SwigPyIterator_distance, METH_VARARGS, (char *)"SwigPyIterator_distance(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t"},
+        { (char *)"SwigPyIterator_equal", _wrap_SwigPyIterator_equal, METH_VARARGS, (char *)"SwigPyIterator_equal(SwigPyIterator self, SwigPyIterator x) -> bool"},
+        { (char *)"SwigPyIterator_copy", _wrap_SwigPyIterator_copy, METH_VARARGS, (char *)"SwigPyIterator_copy(SwigPyIterator self) -> SwigPyIterator"},
+        { (char *)"SwigPyIterator_next", _wrap_SwigPyIterator_next, METH_VARARGS, (char *)"SwigPyIterator_next(SwigPyIterator self) -> PyObject"},
+        { (char *)"SwigPyIterator___next__", _wrap_SwigPyIterator___next__, METH_VARARGS, (char *)"SwigPyIterator___next__(SwigPyIterator self) -> PyObject"},
+        { (char *)"SwigPyIterator_previous", _wrap_SwigPyIterator_previous, METH_VARARGS, (char *)"SwigPyIterator_previous(SwigPyIterator self) -> PyObject"},
+        { (char *)"SwigPyIterator_advance", _wrap_SwigPyIterator_advance, METH_VARARGS, (char *)"SwigPyIterator_advance(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+        { (char *)"SwigPyIterator___eq__", _wrap_SwigPyIterator___eq__, METH_VARARGS, (char *)"SwigPyIterator___eq__(SwigPyIterator self, SwigPyIterator x) -> bool"},
+        { (char *)"SwigPyIterator___ne__", _wrap_SwigPyIterator___ne__, METH_VARARGS, (char *)"SwigPyIterator___ne__(SwigPyIterator self, SwigPyIterator x) -> bool"},
+        { (char *)"SwigPyIterator___iadd__", _wrap_SwigPyIterator___iadd__, METH_VARARGS, (char *)"SwigPyIterator___iadd__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+        { (char *)"SwigPyIterator___isub__", _wrap_SwigPyIterator___isub__, METH_VARARGS, (char *)"SwigPyIterator___isub__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+        { (char *)"SwigPyIterator___add__", _wrap_SwigPyIterator___add__, METH_VARARGS, (char *)"SwigPyIterator___add__(SwigPyIterator self, ptrdiff_t n) -> SwigPyIterator"},
+        { (char *)"SwigPyIterator___sub__", _wrap_SwigPyIterator___sub__, METH_VARARGS, (char *)"\n"
+               "__sub__(ptrdiff_t n) -> SwigPyIterator\n"
+               "SwigPyIterator___sub__(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t\n"
+               ""},
+        { (char *)"SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_VARARGS, NULL},
+        { (char *)"FloatVector_iterator", _wrap_FloatVector_iterator, METH_VARARGS, (char *)"FloatVector_iterator(FloatVector self) -> SwigPyIterator"},
+        { (char *)"FloatVector___nonzero__", _wrap_FloatVector___nonzero__, METH_VARARGS, (char *)"FloatVector___nonzero__(FloatVector self) -> bool"},
+        { (char *)"FloatVector___bool__", _wrap_FloatVector___bool__, METH_VARARGS, (char *)"FloatVector___bool__(FloatVector self) -> bool"},
+        { (char *)"FloatVector___len__", _wrap_FloatVector___len__, METH_VARARGS, (char *)"FloatVector___len__(FloatVector self) -> size_type"},
+        { (char *)"FloatVector_pop", _wrap_FloatVector_pop, METH_VARARGS, (char *)"FloatVector_pop(FloatVector self) -> value_type"},
+        { (char *)"FloatVector___getslice__", _wrap_FloatVector___getslice__, METH_VARARGS, (char *)"FloatVector___getslice__(FloatVector self, difference_type i, difference_type j) -> FloatVector"},
+        { (char *)"FloatVector___setslice__", _wrap_FloatVector___setslice__, METH_VARARGS, (char *)"\n"
+               "FloatVector___setslice__(FloatVector self, difference_type i, difference_type j, \n"
+               "    FloatVector v)\n"
+               ""},
+        { (char *)"FloatVector___delslice__", _wrap_FloatVector___delslice__, METH_VARARGS, (char *)"FloatVector___delslice__(FloatVector self, difference_type i, difference_type j)"},
+        { (char *)"FloatVector___delitem__", _wrap_FloatVector___delitem__, METH_VARARGS, (char *)"\n"
+               "__delitem__(difference_type i)\n"
+               "FloatVector___delitem__(FloatVector self, PySliceObject slice)\n"
+               ""},
+        { (char *)"FloatVector___getitem__", _wrap_FloatVector___getitem__, METH_VARARGS, (char *)"\n"
+               "__getitem__(PySliceObject slice) -> FloatVector\n"
+               "FloatVector___getitem__(FloatVector self, difference_type i) -> value_type\n"
+               ""},
+        { (char *)"FloatVector___setitem__", _wrap_FloatVector___setitem__, METH_VARARGS, (char *)"\n"
+               "__setitem__(PySliceObject slice, FloatVector v)\n"
+               "FloatVector___setitem__(FloatVector self, difference_type i, value_type x)\n"
+               ""},
+        { (char *)"FloatVector_append", _wrap_FloatVector_append, METH_VARARGS, (char *)"FloatVector_append(FloatVector self, value_type x)"},
+        { (char *)"FloatVector_empty", _wrap_FloatVector_empty, METH_VARARGS, (char *)"FloatVector_empty(FloatVector self) -> bool"},
+        { (char *)"FloatVector_size", _wrap_FloatVector_size, METH_VARARGS, (char *)"FloatVector_size(FloatVector self) -> size_type"},
+        { (char *)"FloatVector_clear", _wrap_FloatVector_clear, METH_VARARGS, (char *)"FloatVector_clear(FloatVector self)"},
+        { (char *)"FloatVector_swap", _wrap_FloatVector_swap, METH_VARARGS, (char *)"FloatVector_swap(FloatVector self, FloatVector v)"},
+        { (char *)"FloatVector_get_allocator", _wrap_FloatVector_get_allocator, METH_VARARGS, (char *)"FloatVector_get_allocator(FloatVector self) -> allocator_type"},
+        { (char *)"FloatVector_begin", _wrap_FloatVector_begin, METH_VARARGS, (char *)"FloatVector_begin(FloatVector self) -> const_iterator"},
+        { (char *)"FloatVector_end", _wrap_FloatVector_end, METH_VARARGS, (char *)"FloatVector_end(FloatVector self) -> const_iterator"},
+        { (char *)"FloatVector_rbegin", _wrap_FloatVector_rbegin, METH_VARARGS, (char *)"FloatVector_rbegin(FloatVector self) -> const_reverse_iterator"},
+        { (char *)"FloatVector_rend", _wrap_FloatVector_rend, METH_VARARGS, (char *)"FloatVector_rend(FloatVector self) -> const_reverse_iterator"},
+        { (char *)"FloatVector_pop_back", _wrap_FloatVector_pop_back, METH_VARARGS, (char *)"FloatVector_pop_back(FloatVector self)"},
+        { (char *)"FloatVector_erase", _wrap_FloatVector_erase, METH_VARARGS, (char *)"\n"
+               "erase(iterator pos) -> iterator\n"
+               "FloatVector_erase(FloatVector self, iterator first, iterator last) -> iterator\n"
+               ""},
+        { (char *)"new_FloatVector", _wrap_new_FloatVector, METH_VARARGS, (char *)"\n"
+               "FloatVector()\n"
+               "FloatVector(FloatVector arg0)\n"
+               "FloatVector(size_type size)\n"
+               "new_FloatVector(size_type size, value_type value) -> FloatVector\n"
+               ""},
+        { (char *)"FloatVector_push_back", _wrap_FloatVector_push_back, METH_VARARGS, (char *)"FloatVector_push_back(FloatVector self, value_type x)"},
+        { (char *)"FloatVector_front", _wrap_FloatVector_front, METH_VARARGS, (char *)"FloatVector_front(FloatVector self) -> value_type"},
+        { (char *)"FloatVector_back", _wrap_FloatVector_back, METH_VARARGS, (char *)"FloatVector_back(FloatVector self) -> value_type"},
+        { (char *)"FloatVector_assign", _wrap_FloatVector_assign, METH_VARARGS, (char *)"FloatVector_assign(FloatVector self, size_type n, value_type x)"},
+        { (char *)"FloatVector_resize", _wrap_FloatVector_resize, METH_VARARGS, (char *)"\n"
+               "resize(size_type new_size)\n"
+               "FloatVector_resize(FloatVector self, size_type new_size, value_type x)\n"
+               ""},
+        { (char *)"FloatVector_insert", _wrap_FloatVector_insert, METH_VARARGS, (char *)"\n"
+               "insert(iterator pos, value_type x) -> iterator\n"
+               "FloatVector_insert(FloatVector self, iterator pos, size_type n, value_type x)\n"
+               ""},
+        { (char *)"FloatVector_reserve", _wrap_FloatVector_reserve, METH_VARARGS, (char *)"FloatVector_reserve(FloatVector self, size_type n)"},
+        { (char *)"FloatVector_capacity", _wrap_FloatVector_capacity, METH_VARARGS, (char *)"FloatVector_capacity(FloatVector self) -> size_type"},
+        { (char *)"delete_FloatVector", _wrap_delete_FloatVector, METH_VARARGS, (char *)"delete_FloatVector(FloatVector self)"},
         { (char *)"FloatVector_swigregister", FloatVector_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_iterator", _wrap_CvPointVector_iterator, METH_VARARGS, NULL},
-        { (char *)"CvPointVector___nonzero__", _wrap_CvPointVector___nonzero__, METH_VARARGS, NULL},
-        { (char *)"CvPointVector___len__", _wrap_CvPointVector___len__, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_pop", _wrap_CvPointVector_pop, METH_VARARGS, NULL},
-        { (char *)"CvPointVector___getslice__", _wrap_CvPointVector___getslice__, METH_VARARGS, NULL},
-        { (char *)"CvPointVector___setslice__", _wrap_CvPointVector___setslice__, METH_VARARGS, NULL},
-        { (char *)"CvPointVector___delslice__", _wrap_CvPointVector___delslice__, METH_VARARGS, NULL},
-        { (char *)"CvPointVector___delitem__", _wrap_CvPointVector___delitem__, METH_VARARGS, NULL},
-        { (char *)"CvPointVector___getitem__", _wrap_CvPointVector___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvPointVector___setitem__", _wrap_CvPointVector___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_append", _wrap_CvPointVector_append, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_empty", _wrap_CvPointVector_empty, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_size", _wrap_CvPointVector_size, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_clear", _wrap_CvPointVector_clear, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_swap", _wrap_CvPointVector_swap, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_get_allocator", _wrap_CvPointVector_get_allocator, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_begin", _wrap_CvPointVector_begin, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_end", _wrap_CvPointVector_end, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_rbegin", _wrap_CvPointVector_rbegin, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_rend", _wrap_CvPointVector_rend, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_pop_back", _wrap_CvPointVector_pop_back, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_erase", _wrap_CvPointVector_erase, METH_VARARGS, NULL},
-        { (char *)"new_CvPointVector", _wrap_new_CvPointVector, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_push_back", _wrap_CvPointVector_push_back, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_front", _wrap_CvPointVector_front, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_back", _wrap_CvPointVector_back, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_assign", _wrap_CvPointVector_assign, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_resize", _wrap_CvPointVector_resize, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_insert", _wrap_CvPointVector_insert, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_reserve", _wrap_CvPointVector_reserve, METH_VARARGS, NULL},
-        { (char *)"CvPointVector_capacity", _wrap_CvPointVector_capacity, METH_VARARGS, NULL},
-        { (char *)"delete_CvPointVector", _wrap_delete_CvPointVector, METH_VARARGS, NULL},
+        { (char *)"CvPointVector_iterator", _wrap_CvPointVector_iterator, METH_VARARGS, (char *)"CvPointVector_iterator(CvPointVector self) -> SwigPyIterator"},
+        { (char *)"CvPointVector___nonzero__", _wrap_CvPointVector___nonzero__, METH_VARARGS, (char *)"CvPointVector___nonzero__(CvPointVector self) -> bool"},
+        { (char *)"CvPointVector___bool__", _wrap_CvPointVector___bool__, METH_VARARGS, (char *)"CvPointVector___bool__(CvPointVector self) -> bool"},
+        { (char *)"CvPointVector___len__", _wrap_CvPointVector___len__, METH_VARARGS, (char *)"CvPointVector___len__(CvPointVector self) -> size_type"},
+        { (char *)"CvPointVector_pop", _wrap_CvPointVector_pop, METH_VARARGS, (char *)"CvPointVector_pop(CvPointVector self) -> value_type"},
+        { (char *)"CvPointVector___getslice__", _wrap_CvPointVector___getslice__, METH_VARARGS, (char *)"CvPointVector___getslice__(CvPointVector self, difference_type i, difference_type j) -> CvPointVector"},
+        { (char *)"CvPointVector___setslice__", _wrap_CvPointVector___setslice__, METH_VARARGS, (char *)"\n"
+               "CvPointVector___setslice__(CvPointVector self, difference_type i, difference_type j, \n"
+               "    CvPointVector v)\n"
+               ""},
+        { (char *)"CvPointVector___delslice__", _wrap_CvPointVector___delslice__, METH_VARARGS, (char *)"CvPointVector___delslice__(CvPointVector self, difference_type i, difference_type j)"},
+        { (char *)"CvPointVector___delitem__", _wrap_CvPointVector___delitem__, METH_VARARGS, (char *)"\n"
+               "__delitem__(difference_type i)\n"
+               "CvPointVector___delitem__(CvPointVector self, PySliceObject slice)\n"
+               ""},
+        { (char *)"CvPointVector___getitem__", _wrap_CvPointVector___getitem__, METH_VARARGS, (char *)"\n"
+               "__getitem__(PySliceObject slice) -> CvPointVector\n"
+               "CvPointVector___getitem__(CvPointVector self, difference_type i) -> value_type\n"
+               ""},
+        { (char *)"CvPointVector___setitem__", _wrap_CvPointVector___setitem__, METH_VARARGS, (char *)"\n"
+               "__setitem__(PySliceObject slice, CvPointVector v)\n"
+               "CvPointVector___setitem__(CvPointVector self, difference_type i, value_type x)\n"
+               ""},
+        { (char *)"CvPointVector_append", _wrap_CvPointVector_append, METH_VARARGS, (char *)"CvPointVector_append(CvPointVector self, value_type x)"},
+        { (char *)"CvPointVector_empty", _wrap_CvPointVector_empty, METH_VARARGS, (char *)"CvPointVector_empty(CvPointVector self) -> bool"},
+        { (char *)"CvPointVector_size", _wrap_CvPointVector_size, METH_VARARGS, (char *)"CvPointVector_size(CvPointVector self) -> size_type"},
+        { (char *)"CvPointVector_clear", _wrap_CvPointVector_clear, METH_VARARGS, (char *)"CvPointVector_clear(CvPointVector self)"},
+        { (char *)"CvPointVector_swap", _wrap_CvPointVector_swap, METH_VARARGS, (char *)"CvPointVector_swap(CvPointVector self, CvPointVector v)"},
+        { (char *)"CvPointVector_get_allocator", _wrap_CvPointVector_get_allocator, METH_VARARGS, (char *)"CvPointVector_get_allocator(CvPointVector self) -> allocator_type"},
+        { (char *)"CvPointVector_begin", _wrap_CvPointVector_begin, METH_VARARGS, (char *)"CvPointVector_begin(CvPointVector self) -> const_iterator"},
+        { (char *)"CvPointVector_end", _wrap_CvPointVector_end, METH_VARARGS, (char *)"CvPointVector_end(CvPointVector self) -> const_iterator"},
+        { (char *)"CvPointVector_rbegin", _wrap_CvPointVector_rbegin, METH_VARARGS, (char *)"CvPointVector_rbegin(CvPointVector self) -> const_reverse_iterator"},
+        { (char *)"CvPointVector_rend", _wrap_CvPointVector_rend, METH_VARARGS, (char *)"CvPointVector_rend(CvPointVector self) -> const_reverse_iterator"},
+        { (char *)"CvPointVector_pop_back", _wrap_CvPointVector_pop_back, METH_VARARGS, (char *)"CvPointVector_pop_back(CvPointVector self)"},
+        { (char *)"CvPointVector_erase", _wrap_CvPointVector_erase, METH_VARARGS, (char *)"\n"
+               "erase(iterator pos) -> iterator\n"
+               "CvPointVector_erase(CvPointVector self, iterator first, iterator last) -> iterator\n"
+               ""},
+        { (char *)"new_CvPointVector", _wrap_new_CvPointVector, METH_VARARGS, (char *)"\n"
+               "CvPointVector()\n"
+               "CvPointVector(CvPointVector arg0)\n"
+               "CvPointVector(size_type size)\n"
+               "new_CvPointVector(size_type size, value_type value) -> CvPointVector\n"
+               ""},
+        { (char *)"CvPointVector_push_back", _wrap_CvPointVector_push_back, METH_VARARGS, (char *)"CvPointVector_push_back(CvPointVector self, value_type x)"},
+        { (char *)"CvPointVector_front", _wrap_CvPointVector_front, METH_VARARGS, (char *)"CvPointVector_front(CvPointVector self) -> value_type"},
+        { (char *)"CvPointVector_back", _wrap_CvPointVector_back, METH_VARARGS, (char *)"CvPointVector_back(CvPointVector self) -> value_type"},
+        { (char *)"CvPointVector_assign", _wrap_CvPointVector_assign, METH_VARARGS, (char *)"CvPointVector_assign(CvPointVector self, size_type n, value_type x)"},
+        { (char *)"CvPointVector_resize", _wrap_CvPointVector_resize, METH_VARARGS, (char *)"\n"
+               "resize(size_type new_size)\n"
+               "CvPointVector_resize(CvPointVector self, size_type new_size, value_type x)\n"
+               ""},
+        { (char *)"CvPointVector_insert", _wrap_CvPointVector_insert, METH_VARARGS, (char *)"\n"
+               "insert(iterator pos, value_type x) -> iterator\n"
+               "CvPointVector_insert(CvPointVector self, iterator pos, size_type n, value_type x)\n"
+               ""},
+        { (char *)"CvPointVector_reserve", _wrap_CvPointVector_reserve, METH_VARARGS, (char *)"CvPointVector_reserve(CvPointVector self, size_type n)"},
+        { (char *)"CvPointVector_capacity", _wrap_CvPointVector_capacity, METH_VARARGS, (char *)"CvPointVector_capacity(CvPointVector self) -> size_type"},
+        { (char *)"delete_CvPointVector", _wrap_delete_CvPointVector, METH_VARARGS, (char *)"delete_CvPointVector(CvPointVector self)"},
         { (char *)"CvPointVector_swigregister", CvPointVector_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvCvtSeqToArray", _wrap_cvCvtSeqToArray, METH_VARARGS, NULL},
-        { (char *)"cvHaarDetectObjects", _wrap_cvHaarDetectObjects, METH_VARARGS, NULL},
-        { (char *)"cvSegmentMotion", _wrap_cvSegmentMotion, METH_VARARGS, NULL},
-        { (char *)"cvApproxPoly", _wrap_cvApproxPoly, METH_VARARGS, NULL},
-        { (char *)"cvConvexHull2", _wrap_cvConvexHull2, METH_VARARGS, NULL},
-        { (char *)"cvSnakeImage", _wrap_cvSnakeImage, METH_VARARGS, NULL},
-        { (char *)"cvFree", _wrap_cvFree, METH_VARARGS, NULL},
-        { (char *)"CV_READ_CHAIN_POINT", _wrap_CV_READ_CHAIN_POINT, METH_VARARGS, NULL},
-        { (char *)"CV_MAT_ELEM_PTR", _wrap_CV_MAT_ELEM_PTR, METH_VARARGS, NULL},
-        { (char *)"CV_MAT_ELEM_PTR_FAST", _wrap_CV_MAT_ELEM_PTR_FAST, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_VAL", _wrap_CV_NODE_VAL, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IDX", _wrap_CV_NODE_IDX, METH_VARARGS, NULL},
-        { (char *)"CV_SUBDIV2D_NEXT_EDGE", _wrap_CV_SUBDIV2D_NEXT_EDGE, METH_VARARGS, NULL},
-        { (char *)"CV_SWAP", _wrap_CV_SWAP, METH_VARARGS, NULL},
-        { (char *)"CV_IMIN", _wrap_CV_IMIN, METH_VARARGS, NULL},
-        { (char *)"CV_IMAX", _wrap_CV_IMAX, METH_VARARGS, NULL},
-        { (char *)"CV_IABS", _wrap_CV_IABS, METH_VARARGS, NULL},
-        { (char *)"CV_CMP", _wrap_CV_CMP, METH_VARARGS, NULL},
-        { (char *)"CV_SIGN", _wrap_CV_SIGN, METH_VARARGS, NULL},
-        { (char *)"cvInvSqrt", _wrap_cvInvSqrt, METH_VARARGS, NULL},
-        { (char *)"cvSqrt", _wrap_cvSqrt, METH_VARARGS, NULL},
-        { (char *)"CV_IS_IMAGE_HDR", _wrap_CV_IS_IMAGE_HDR, METH_VARARGS, NULL},
-        { (char *)"CV_IS_IMAGE", _wrap_CV_IS_IMAGE, METH_VARARGS, NULL},
-        { (char *)"CV_MAKETYPE", _wrap_CV_MAKETYPE, METH_VARARGS, NULL},
-        { (char *)"CV_8UC", _wrap_CV_8UC, METH_VARARGS, NULL},
-        { (char *)"CV_8SC", _wrap_CV_8SC, METH_VARARGS, NULL},
-        { (char *)"CV_16UC", _wrap_CV_16UC, METH_VARARGS, NULL},
-        { (char *)"CV_16SC", _wrap_CV_16SC, METH_VARARGS, NULL},
-        { (char *)"CV_32SC", _wrap_CV_32SC, METH_VARARGS, NULL},
-        { (char *)"CV_32FC", _wrap_CV_32FC, METH_VARARGS, NULL},
-        { (char *)"CV_64FC", _wrap_CV_64FC, METH_VARARGS, NULL},
-        { (char *)"CV_MAT_CN", _wrap_CV_MAT_CN, METH_VARARGS, NULL},
-        { (char *)"CV_MAT_DEPTH", _wrap_CV_MAT_DEPTH, METH_VARARGS, NULL},
-        { (char *)"CV_MAT_TYPE", _wrap_CV_MAT_TYPE, METH_VARARGS, NULL},
-        { (char *)"CV_IS_MAT_CONT", _wrap_CV_IS_MAT_CONT, METH_VARARGS, NULL},
-        { (char *)"CV_IS_TEMP_MAT", _wrap_CV_IS_TEMP_MAT, METH_VARARGS, NULL},
-        { (char *)"CV_IS_MAT_HDR", _wrap_CV_IS_MAT_HDR, METH_VARARGS, NULL},
-        { (char *)"CV_IS_MAT", _wrap_CV_IS_MAT, METH_VARARGS, NULL},
-        { (char *)"CV_IS_MASK_ARR", _wrap_CV_IS_MASK_ARR, METH_VARARGS, NULL},
-        { (char *)"CV_ARE_TYPES_EQ", _wrap_CV_ARE_TYPES_EQ, METH_VARARGS, NULL},
-        { (char *)"CV_ARE_CNS_EQ", _wrap_CV_ARE_CNS_EQ, METH_VARARGS, NULL},
-        { (char *)"CV_ARE_DEPTHS_EQ", _wrap_CV_ARE_DEPTHS_EQ, METH_VARARGS, NULL},
-        { (char *)"CV_ARE_SIZES_EQ", _wrap_CV_ARE_SIZES_EQ, METH_VARARGS, NULL},
-        { (char *)"CV_IS_MAT_CONST", _wrap_CV_IS_MAT_CONST, METH_VARARGS, NULL},
-        { (char *)"CV_ELEM_SIZE1", _wrap_CV_ELEM_SIZE1, METH_VARARGS, NULL},
-        { (char *)"CV_ELEM_SIZE", _wrap_CV_ELEM_SIZE, METH_VARARGS, NULL},
-        { (char *)"CV_IS_MATND_HDR", _wrap_CV_IS_MATND_HDR, METH_VARARGS, NULL},
-        { (char *)"CV_IS_MATND", _wrap_CV_IS_MATND, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SPARSE_MAT_HDR", _wrap_CV_IS_SPARSE_MAT_HDR, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SPARSE_MAT", _wrap_CV_IS_SPARSE_MAT, METH_VARARGS, NULL},
-        { (char *)"CV_IS_HIST", _wrap_CV_IS_HIST, METH_VARARGS, NULL},
-        { (char *)"CV_IS_UNIFORM_HIST", _wrap_CV_IS_UNIFORM_HIST, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SPARSE_HIST", _wrap_CV_IS_SPARSE_HIST, METH_VARARGS, NULL},
-        { (char *)"CV_HIST_HAS_RANGES", _wrap_CV_HIST_HAS_RANGES, METH_VARARGS, NULL},
-        { (char *)"CV_IS_STORAGE", _wrap_CV_IS_STORAGE, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SET_ELEM", _wrap_CV_IS_SET_ELEM, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ", _wrap_CV_IS_SEQ, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SET", _wrap_CV_IS_SET, METH_VARARGS, NULL},
-        { (char *)"CV_SEQ_ELTYPE", _wrap_CV_SEQ_ELTYPE, METH_VARARGS, NULL},
-        { (char *)"CV_SEQ_KIND", _wrap_CV_SEQ_KIND, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_INDEX", _wrap_CV_IS_SEQ_INDEX, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_CURVE", _wrap_CV_IS_SEQ_CURVE, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_CLOSED", _wrap_CV_IS_SEQ_CLOSED, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_CONVEX", _wrap_CV_IS_SEQ_CONVEX, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_HOLE", _wrap_CV_IS_SEQ_HOLE, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_SIMPLE", _wrap_CV_IS_SEQ_SIMPLE, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_POINT_SET", _wrap_CV_IS_SEQ_POINT_SET, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_POINT_SUBSET", _wrap_CV_IS_SEQ_POINT_SUBSET, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_POLYLINE", _wrap_CV_IS_SEQ_POLYLINE, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_POLYGON", _wrap_CV_IS_SEQ_POLYGON, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_CHAIN", _wrap_CV_IS_SEQ_CHAIN, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_CONTOUR", _wrap_CV_IS_SEQ_CONTOUR, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_CHAIN_CONTOUR", _wrap_CV_IS_SEQ_CHAIN_CONTOUR, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SEQ_POLYGON_TREE", _wrap_CV_IS_SEQ_POLYGON_TREE, METH_VARARGS, NULL},
-        { (char *)"CV_IS_GRAPH", _wrap_CV_IS_GRAPH, METH_VARARGS, NULL},
-        { (char *)"CV_IS_GRAPH_ORIENTED", _wrap_CV_IS_GRAPH_ORIENTED, METH_VARARGS, NULL},
-        { (char *)"CV_IS_SUBDIV2D", _wrap_CV_IS_SUBDIV2D, METH_VARARGS, NULL},
-        { (char *)"CV_WRITE_SEQ_ELEM_VAR", _wrap_CV_WRITE_SEQ_ELEM_VAR, METH_VARARGS, NULL},
-        { (char *)"CV_WRITE_SEQ_ELEM", _wrap_CV_WRITE_SEQ_ELEM, METH_VARARGS, NULL},
-        { (char *)"CV_NEXT_SEQ_ELEM", _wrap_CV_NEXT_SEQ_ELEM, METH_VARARGS, NULL},
-        { (char *)"CV_PREV_SEQ_ELEM", _wrap_CV_PREV_SEQ_ELEM, METH_VARARGS, NULL},
-        { (char *)"CV_READ_SEQ_ELEM", _wrap_CV_READ_SEQ_ELEM, METH_VARARGS, NULL},
-        { (char *)"CV_REV_READ_SEQ_ELEM", _wrap_CV_REV_READ_SEQ_ELEM, METH_VARARGS, NULL},
-        { (char *)"CV_CURRENT_POINT", _wrap_CV_CURRENT_POINT, METH_VARARGS, NULL},
-        { (char *)"CV_PREV_POINT", _wrap_CV_PREV_POINT, METH_VARARGS, NULL},
-        { (char *)"CV_READ_EDGE", _wrap_CV_READ_EDGE, METH_VARARGS, NULL},
-        { (char *)"CV_NEXT_GRAPH_EDGE", _wrap_CV_NEXT_GRAPH_EDGE, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_TYPE", _wrap_CV_NODE_TYPE, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_INT", _wrap_CV_NODE_IS_INT, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_REAL", _wrap_CV_NODE_IS_REAL, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_STRING", _wrap_CV_NODE_IS_STRING, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_SEQ", _wrap_CV_NODE_IS_SEQ, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_MAP", _wrap_CV_NODE_IS_MAP, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_COLLECTION", _wrap_CV_NODE_IS_COLLECTION, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_FLOW", _wrap_CV_NODE_IS_FLOW, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_EMPTY", _wrap_CV_NODE_IS_EMPTY, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_IS_USER", _wrap_CV_NODE_IS_USER, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_HAS_NAME", _wrap_CV_NODE_HAS_NAME, METH_VARARGS, NULL},
-        { (char *)"CV_NODE_SEQ_IS_SIMPLE", _wrap_CV_NODE_SEQ_IS_SIMPLE, METH_VARARGS, NULL},
-        { (char *)"cvReshapeND", _wrap_cvReshapeND, METH_VARARGS, NULL},
-        { (char *)"cvConvert", _wrap_cvConvert, METH_VARARGS, NULL},
-        { (char *)"cvAXPY", _wrap_cvAXPY, METH_VARARGS, NULL},
-        { (char *)"cvAbs", _wrap_cvAbs, METH_VARARGS, NULL},
-        { (char *)"cvMatMulAdd", _wrap_cvMatMulAdd, METH_VARARGS, NULL},
-        { (char *)"cvMatMul", _wrap_cvMatMul, METH_VARARGS, NULL},
-        { (char *)"cvGetGraphVtx", _wrap_cvGetGraphVtx, METH_VARARGS, NULL},
-        { (char *)"cvGraphVtxIdx", _wrap_cvGraphVtxIdx, METH_VARARGS, NULL},
-        { (char *)"cvGraphEdgeIdx", _wrap_cvGraphEdgeIdx, METH_VARARGS, NULL},
-        { (char *)"cvGraphGetVtxCount", _wrap_cvGraphGetVtxCount, METH_VARARGS, NULL},
-        { (char *)"cvGraphGetEdgeCount", _wrap_cvGraphGetEdgeCount, METH_VARARGS, NULL},
-        { (char *)"CV_IS_GRAPH_VERTEX_VISITED", _wrap_CV_IS_GRAPH_VERTEX_VISITED, METH_VARARGS, NULL},
-        { (char *)"CV_IS_GRAPH_EDGE_VISITED", _wrap_CV_IS_GRAPH_EDGE_VISITED, METH_VARARGS, NULL},
-        { (char *)"CV_RGB", _wrap_CV_RGB, METH_VARARGS, NULL},
-        { (char *)"CV_NEXT_LINE_POINT", _wrap_CV_NEXT_LINE_POINT, METH_VARARGS, NULL},
-        { (char *)"CV_INIT_3X3_DELTAS", _wrap_CV_INIT_3X3_DELTAS, METH_VARARGS, NULL},
-        { (char *)"CV_IS_HAAR_CLASSIFIER", _wrap_CV_IS_HAAR_CLASSIFIER, METH_VARARGS, NULL},
-        { (char *)"cvContourPerimeter", _wrap_cvContourPerimeter, METH_VARARGS, NULL},
-        { (char *)"cvCalcBackProject", _wrap_cvCalcBackProject, METH_VARARGS, NULL},
-        { (char *)"cvCalcBackProjectPatch", _wrap_cvCalcBackProjectPatch, METH_VARARGS, NULL},
-        { (char *)"cvCreateImage", _wrap_cvCreateImage, METH_VARARGS, NULL},
-        { (char *)"cvCloneImage", _wrap_cvCloneImage, METH_VARARGS, NULL},
-        { (char *)"Cv32suf_i_set", _wrap_Cv32suf_i_set, METH_VARARGS, NULL},
-        { (char *)"Cv32suf_i_get", _wrap_Cv32suf_i_get, METH_VARARGS, NULL},
-        { (char *)"Cv32suf_u_set", _wrap_Cv32suf_u_set, METH_VARARGS, NULL},
-        { (char *)"Cv32suf_u_get", _wrap_Cv32suf_u_get, METH_VARARGS, NULL},
-        { (char *)"Cv32suf_f_set", _wrap_Cv32suf_f_set, METH_VARARGS, NULL},
-        { (char *)"Cv32suf_f_get", _wrap_Cv32suf_f_get, METH_VARARGS, NULL},
-        { (char *)"new_Cv32suf", _wrap_new_Cv32suf, METH_VARARGS, NULL},
-        { (char *)"delete_Cv32suf", _wrap_delete_Cv32suf, METH_VARARGS, NULL},
+        { (char *)"cvCvtSeqToArray", _wrap_cvCvtSeqToArray, METH_VARARGS, (char *)"\n"
+               "cvCvtSeqToArray(CvSeq seq, CvArr elements, CvSlice slice = CV_WHOLE_SEQ) -> CvArr\n"
+               "cvCvtSeqToArray(CvSeq seq, CvArr elements) -> CvArr\n"
+               ""},
+        { (char *)"cvHaarDetectObjects", _wrap_cvHaarDetectObjects, METH_VARARGS, (char *)"\n"
+               "cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage, \n"
+               "    double scale_factor = 1.1, int min_neighbors = 3, \n"
+               "    int flags = 0, CvSize min_size = cvSize(0,0)) -> CvSeq_CvRect\n"
+               "cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage, \n"
+               "    double scale_factor = 1.1, int min_neighbors = 3, \n"
+               "    int flags = 0) -> CvSeq_CvRect\n"
+               "cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage, \n"
+               "    double scale_factor = 1.1, int min_neighbors = 3) -> CvSeq_CvRect\n"
+               "cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage, \n"
+               "    double scale_factor = 1.1) -> CvSeq_CvRect\n"
+               "cvHaarDetectObjects(CvArr image, CvHaarClassifierCascade cascade, CvMemStorage storage) -> CvSeq_CvRect\n"
+               ""},
+        { (char *)"cvSegmentMotion", _wrap_cvSegmentMotion, METH_VARARGS, (char *)"\n"
+               "cvSegmentMotion(CvArr mhi, CvArr seg_mask, CvMemStorage storage, double timestamp, \n"
+               "    double seg_thresh) -> CvSeq_CvConnectedComp\n"
+               ""},
+        { (char *)"cvApproxPoly", _wrap_cvApproxPoly, METH_VARARGS, (char *)"\n"
+               "cvApproxPoly(void src_seq, int header_size, CvMemStorage storage, \n"
+               "    int method, double parameter, int parameter2 = 0) -> CvSeq_CvPoint\n"
+               "cvApproxPoly(void src_seq, int header_size, CvMemStorage storage, \n"
+               "    int method, double parameter) -> CvSeq_CvPoint\n"
+               ""},
+        { (char *)"cvConvexHull2", _wrap_cvConvexHull2, METH_VARARGS, (char *)"\n"
+               "cvConvexHull2(CvArr points, int orientation = CV_CLOCKWISE, int return_points = 0) -> CvMat\n"
+               "cvConvexHull2(CvArr points, int orientation = CV_CLOCKWISE) -> CvMat\n"
+               "cvConvexHull2(CvArr points) -> CvMat\n"
+               ""},
+        { (char *)"cvSnakeImage", _wrap_cvSnakeImage, METH_VARARGS, (char *)"\n"
+               "cvSnakeImage(CvMat image, CvPointVector points, FloatVector alpha, \n"
+               "    FloatVector beta, FloatVector gamma, CvSize win, \n"
+               "    CvTermCriteria criteria, int calc_gradient = 1) -> CvPointVector\n"
+               "cvSnakeImage(CvMat image, CvPointVector points, FloatVector alpha, \n"
+               "    FloatVector beta, FloatVector gamma, CvSize win, \n"
+               "    CvTermCriteria criteria) -> CvPointVector\n"
+               ""},
+        { (char *)"cvFree", _wrap_cvFree, METH_VARARGS, (char *)"cvFree(void ptr)"},
+        { (char *)"CV_READ_CHAIN_POINT", _wrap_CV_READ_CHAIN_POINT, METH_VARARGS, (char *)"CV_READ_CHAIN_POINT(CvPoint _pt, CvChainPtReader reader)"},
+        { (char *)"CV_MAT_ELEM_PTR", _wrap_CV_MAT_ELEM_PTR, METH_VARARGS, (char *)"CV_MAT_ELEM_PTR(CvMat mat, int row, int col) -> void"},
+        { (char *)"CV_MAT_ELEM_PTR_FAST", _wrap_CV_MAT_ELEM_PTR_FAST, METH_VARARGS, (char *)"CV_MAT_ELEM_PTR_FAST(CvMat mat, int row, int col, int pix_size) -> void"},
+        { (char *)"CV_NODE_VAL", _wrap_CV_NODE_VAL, METH_VARARGS, (char *)"CV_NODE_VAL(CvSparseMat mat, CvSparseNode node) -> void"},
+        { (char *)"CV_NODE_IDX", _wrap_CV_NODE_IDX, METH_VARARGS, (char *)"CV_NODE_IDX(CvSparseMat mat, CvSparseNode node) -> int"},
+        { (char *)"CV_SUBDIV2D_NEXT_EDGE", _wrap_CV_SUBDIV2D_NEXT_EDGE, METH_VARARGS, (char *)"CV_SUBDIV2D_NEXT_EDGE(CvSubdiv2DEdge edge) -> CvQuadEdge2D"},
+        { (char *)"CV_SWAP", _wrap_CV_SWAP, METH_VARARGS, (char *)"CV_SWAP(int a, int b, int t)"},
+        { (char *)"CV_IMIN", _wrap_CV_IMIN, METH_VARARGS, (char *)"CV_IMIN(int a, int b) -> int"},
+        { (char *)"CV_IMAX", _wrap_CV_IMAX, METH_VARARGS, (char *)"CV_IMAX(int a, int b) -> int"},
+        { (char *)"CV_IABS", _wrap_CV_IABS, METH_VARARGS, (char *)"CV_IABS(int a) -> int"},
+        { (char *)"CV_CMP", _wrap_CV_CMP, METH_VARARGS, (char *)"CV_CMP(int a, int b)"},
+        { (char *)"CV_SIGN", _wrap_CV_SIGN, METH_VARARGS, (char *)"CV_SIGN(int a)"},
+        { (char *)"cvInvSqrt", _wrap_cvInvSqrt, METH_VARARGS, (char *)"cvInvSqrt(double value)"},
+        { (char *)"cvSqrt", _wrap_cvSqrt, METH_VARARGS, (char *)"cvSqrt(double value)"},
+        { (char *)"CV_IS_IMAGE_HDR", _wrap_CV_IS_IMAGE_HDR, METH_VARARGS, (char *)"CV_IS_IMAGE_HDR(CvArr img) -> int"},
+        { (char *)"CV_IS_IMAGE", _wrap_CV_IS_IMAGE, METH_VARARGS, (char *)"CV_IS_IMAGE(CvArr img) -> int"},
+        { (char *)"CV_MAT_DEPTH", _wrap_CV_MAT_DEPTH, METH_VARARGS, (char *)"CV_MAT_DEPTH(int flags) -> int"},
+        { (char *)"CV_MAKETYPE", _wrap_CV_MAKETYPE, METH_VARARGS, (char *)"CV_MAKETYPE(int depth, int cn) -> int"},
+        { (char *)"CV_8UC", _wrap_CV_8UC, METH_VARARGS, (char *)"CV_8UC(int n) -> int"},
+        { (char *)"CV_8SC", _wrap_CV_8SC, METH_VARARGS, (char *)"CV_8SC(int n) -> int"},
+        { (char *)"CV_16UC", _wrap_CV_16UC, METH_VARARGS, (char *)"CV_16UC(int n) -> int"},
+        { (char *)"CV_16SC", _wrap_CV_16SC, METH_VARARGS, (char *)"CV_16SC(int n) -> int"},
+        { (char *)"CV_32SC", _wrap_CV_32SC, METH_VARARGS, (char *)"CV_32SC(int n) -> int"},
+        { (char *)"CV_32FC", _wrap_CV_32FC, METH_VARARGS, (char *)"CV_32FC(int n) -> int"},
+        { (char *)"CV_64FC", _wrap_CV_64FC, METH_VARARGS, (char *)"CV_64FC(int n) -> int"},
+        { (char *)"CV_MAT_CN", _wrap_CV_MAT_CN, METH_VARARGS, (char *)"CV_MAT_CN(int flags) -> int"},
+        { (char *)"CV_MAT_TYPE", _wrap_CV_MAT_TYPE, METH_VARARGS, (char *)"CV_MAT_TYPE(int flags) -> int"},
+        { (char *)"CV_IS_MAT_CONT", _wrap_CV_IS_MAT_CONT, METH_VARARGS, (char *)"CV_IS_MAT_CONT(int flags) -> int"},
+        { (char *)"CV_IS_TEMP_MAT", _wrap_CV_IS_TEMP_MAT, METH_VARARGS, (char *)"CV_IS_TEMP_MAT(int flags) -> int"},
+        { (char *)"CV_IS_MAT_HDR", _wrap_CV_IS_MAT_HDR, METH_VARARGS, (char *)"CV_IS_MAT_HDR(CvMat mat) -> int"},
+        { (char *)"CV_IS_MAT", _wrap_CV_IS_MAT, METH_VARARGS, (char *)"CV_IS_MAT(CvMat mat) -> int"},
+        { (char *)"CV_IS_MASK_ARR", _wrap_CV_IS_MASK_ARR, METH_VARARGS, (char *)"CV_IS_MASK_ARR(CvMat mat) -> int"},
+        { (char *)"CV_ARE_TYPES_EQ", _wrap_CV_ARE_TYPES_EQ, METH_VARARGS, (char *)"CV_ARE_TYPES_EQ(CvMat mat1, CvMat mat2) -> int"},
+        { (char *)"CV_ARE_CNS_EQ", _wrap_CV_ARE_CNS_EQ, METH_VARARGS, (char *)"CV_ARE_CNS_EQ(CvMat mat1, CvMat mat2) -> int"},
+        { (char *)"CV_ARE_DEPTHS_EQ", _wrap_CV_ARE_DEPTHS_EQ, METH_VARARGS, (char *)"CV_ARE_DEPTHS_EQ(CvMat mat1, CvMat mat2) -> int"},
+        { (char *)"CV_ARE_SIZES_EQ", _wrap_CV_ARE_SIZES_EQ, METH_VARARGS, (char *)"CV_ARE_SIZES_EQ(CvMat mat1, CvMat mat2) -> int"},
+        { (char *)"CV_IS_MAT_CONST", _wrap_CV_IS_MAT_CONST, METH_VARARGS, (char *)"CV_IS_MAT_CONST(CvMat mat) -> int"},
+        { (char *)"CV_ELEM_SIZE1", _wrap_CV_ELEM_SIZE1, METH_VARARGS, (char *)"CV_ELEM_SIZE1(int type) -> int"},
+        { (char *)"CV_ELEM_SIZE", _wrap_CV_ELEM_SIZE, METH_VARARGS, (char *)"CV_ELEM_SIZE(int type) -> int"},
+        { (char *)"CV_IS_MATND_HDR", _wrap_CV_IS_MATND_HDR, METH_VARARGS, (char *)"CV_IS_MATND_HDR(CvMat mat) -> int"},
+        { (char *)"CV_IS_MATND", _wrap_CV_IS_MATND, METH_VARARGS, (char *)"CV_IS_MATND(CvMat mat) -> int"},
+        { (char *)"CV_IS_SPARSE_MAT_HDR", _wrap_CV_IS_SPARSE_MAT_HDR, METH_VARARGS, (char *)"CV_IS_SPARSE_MAT_HDR(CvMat mat) -> int"},
+        { (char *)"CV_IS_SPARSE_MAT", _wrap_CV_IS_SPARSE_MAT, METH_VARARGS, (char *)"CV_IS_SPARSE_MAT(CvMat mat) -> int"},
+        { (char *)"CV_IS_HIST", _wrap_CV_IS_HIST, METH_VARARGS, (char *)"CV_IS_HIST(CvHistogram hist) -> int"},
+        { (char *)"CV_IS_UNIFORM_HIST", _wrap_CV_IS_UNIFORM_HIST, METH_VARARGS, (char *)"CV_IS_UNIFORM_HIST(CvHistogram hist) -> int"},
+        { (char *)"CV_IS_SPARSE_HIST", _wrap_CV_IS_SPARSE_HIST, METH_VARARGS, (char *)"CV_IS_SPARSE_HIST(CvHistogram hist) -> int"},
+        { (char *)"CV_HIST_HAS_RANGES", _wrap_CV_HIST_HAS_RANGES, METH_VARARGS, (char *)"CV_HIST_HAS_RANGES(CvHistogram hist) -> int"},
+        { (char *)"CV_IS_STORAGE", _wrap_CV_IS_STORAGE, METH_VARARGS, (char *)"CV_IS_STORAGE(CvMemStorage storage) -> int"},
+        { (char *)"CV_IS_SET_ELEM", _wrap_CV_IS_SET_ELEM, METH_VARARGS, (char *)"CV_IS_SET_ELEM(void ptr) -> int"},
+        { (char *)"CV_IS_SEQ", _wrap_CV_IS_SEQ, METH_VARARGS, (char *)"CV_IS_SEQ(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SET", _wrap_CV_IS_SET, METH_VARARGS, (char *)"CV_IS_SET(CvSet set) -> int"},
+        { (char *)"CV_SEQ_ELTYPE", _wrap_CV_SEQ_ELTYPE, METH_VARARGS, (char *)"CV_SEQ_ELTYPE(CvSeq seq) -> int"},
+        { (char *)"CV_SEQ_KIND", _wrap_CV_SEQ_KIND, METH_VARARGS, (char *)"CV_SEQ_KIND(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_INDEX", _wrap_CV_IS_SEQ_INDEX, METH_VARARGS, (char *)"CV_IS_SEQ_INDEX(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_CURVE", _wrap_CV_IS_SEQ_CURVE, METH_VARARGS, (char *)"CV_IS_SEQ_CURVE(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_CLOSED", _wrap_CV_IS_SEQ_CLOSED, METH_VARARGS, (char *)"CV_IS_SEQ_CLOSED(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_CONVEX", _wrap_CV_IS_SEQ_CONVEX, METH_VARARGS, (char *)"CV_IS_SEQ_CONVEX(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_HOLE", _wrap_CV_IS_SEQ_HOLE, METH_VARARGS, (char *)"CV_IS_SEQ_HOLE(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_SIMPLE", _wrap_CV_IS_SEQ_SIMPLE, METH_VARARGS, (char *)"CV_IS_SEQ_SIMPLE(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_POINT_SET", _wrap_CV_IS_SEQ_POINT_SET, METH_VARARGS, (char *)"CV_IS_SEQ_POINT_SET(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_POINT_SUBSET", _wrap_CV_IS_SEQ_POINT_SUBSET, METH_VARARGS, (char *)"CV_IS_SEQ_POINT_SUBSET(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_POLYLINE", _wrap_CV_IS_SEQ_POLYLINE, METH_VARARGS, (char *)"CV_IS_SEQ_POLYLINE(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_POLYGON", _wrap_CV_IS_SEQ_POLYGON, METH_VARARGS, (char *)"CV_IS_SEQ_POLYGON(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_CHAIN", _wrap_CV_IS_SEQ_CHAIN, METH_VARARGS, (char *)"CV_IS_SEQ_CHAIN(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_CONTOUR", _wrap_CV_IS_SEQ_CONTOUR, METH_VARARGS, (char *)"CV_IS_SEQ_CONTOUR(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_CHAIN_CONTOUR", _wrap_CV_IS_SEQ_CHAIN_CONTOUR, METH_VARARGS, (char *)"CV_IS_SEQ_CHAIN_CONTOUR(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SEQ_POLYGON_TREE", _wrap_CV_IS_SEQ_POLYGON_TREE, METH_VARARGS, (char *)"CV_IS_SEQ_POLYGON_TREE(CvSeq seq) -> int"},
+        { (char *)"CV_IS_GRAPH", _wrap_CV_IS_GRAPH, METH_VARARGS, (char *)"CV_IS_GRAPH(CvSeq seq) -> int"},
+        { (char *)"CV_IS_GRAPH_ORIENTED", _wrap_CV_IS_GRAPH_ORIENTED, METH_VARARGS, (char *)"CV_IS_GRAPH_ORIENTED(CvSeq seq) -> int"},
+        { (char *)"CV_IS_SUBDIV2D", _wrap_CV_IS_SUBDIV2D, METH_VARARGS, (char *)"CV_IS_SUBDIV2D(CvSeq seq) -> int"},
+        { (char *)"CV_WRITE_SEQ_ELEM_VAR", _wrap_CV_WRITE_SEQ_ELEM_VAR, METH_VARARGS, (char *)"CV_WRITE_SEQ_ELEM_VAR(void elem_ptr, CvSeqWriter writer)"},
+        { (char *)"CV_WRITE_SEQ_ELEM", _wrap_CV_WRITE_SEQ_ELEM, METH_VARARGS, (char *)"CV_WRITE_SEQ_ELEM(CvPoint elem, CvSeqWriter writer)"},
+        { (char *)"CV_NEXT_SEQ_ELEM", _wrap_CV_NEXT_SEQ_ELEM, METH_VARARGS, (char *)"CV_NEXT_SEQ_ELEM(int elem_size, CvSeqReader reader)"},
+        { (char *)"CV_PREV_SEQ_ELEM", _wrap_CV_PREV_SEQ_ELEM, METH_VARARGS, (char *)"CV_PREV_SEQ_ELEM(int elem_size, CvSeqReader reader)"},
+        { (char *)"CV_READ_SEQ_ELEM", _wrap_CV_READ_SEQ_ELEM, METH_VARARGS, (char *)"CV_READ_SEQ_ELEM(CvPoint elem, CvSeqReader reader)"},
+        { (char *)"CV_REV_READ_SEQ_ELEM", _wrap_CV_REV_READ_SEQ_ELEM, METH_VARARGS, (char *)"CV_REV_READ_SEQ_ELEM(CvPoint elem, CvSeqReader reader)"},
+        { (char *)"CV_CURRENT_POINT", _wrap_CV_CURRENT_POINT, METH_VARARGS, (char *)"CV_CURRENT_POINT(CvSeqReader reader) -> CvPoint"},
+        { (char *)"CV_PREV_POINT", _wrap_CV_PREV_POINT, METH_VARARGS, (char *)"CV_PREV_POINT(CvSeqReader reader) -> CvPoint"},
+        { (char *)"CV_READ_EDGE", _wrap_CV_READ_EDGE, METH_VARARGS, (char *)"CV_READ_EDGE(CvPoint pt1, CvPoint pt2, CvSeqReader reader)"},
+        { (char *)"CV_NEXT_GRAPH_EDGE", _wrap_CV_NEXT_GRAPH_EDGE, METH_VARARGS, (char *)"CV_NEXT_GRAPH_EDGE(CvGraphEdge edge, CvGraphVtx vertex) -> CvGraphEdge"},
+        { (char *)"CV_NODE_TYPE", _wrap_CV_NODE_TYPE, METH_VARARGS, (char *)"CV_NODE_TYPE(int flags) -> int"},
+        { (char *)"CV_NODE_IS_INT", _wrap_CV_NODE_IS_INT, METH_VARARGS, (char *)"CV_NODE_IS_INT(int flags) -> int"},
+        { (char *)"CV_NODE_IS_REAL", _wrap_CV_NODE_IS_REAL, METH_VARARGS, (char *)"CV_NODE_IS_REAL(int flags) -> int"},
+        { (char *)"CV_NODE_IS_STRING", _wrap_CV_NODE_IS_STRING, METH_VARARGS, (char *)"CV_NODE_IS_STRING(int flags) -> int"},
+        { (char *)"CV_NODE_IS_SEQ", _wrap_CV_NODE_IS_SEQ, METH_VARARGS, (char *)"CV_NODE_IS_SEQ(int flags) -> int"},
+        { (char *)"CV_NODE_IS_MAP", _wrap_CV_NODE_IS_MAP, METH_VARARGS, (char *)"CV_NODE_IS_MAP(int flags) -> int"},
+        { (char *)"CV_NODE_IS_COLLECTION", _wrap_CV_NODE_IS_COLLECTION, METH_VARARGS, (char *)"CV_NODE_IS_COLLECTION(int flags) -> int"},
+        { (char *)"CV_NODE_IS_FLOW", _wrap_CV_NODE_IS_FLOW, METH_VARARGS, (char *)"CV_NODE_IS_FLOW(int flags) -> int"},
+        { (char *)"CV_NODE_IS_EMPTY", _wrap_CV_NODE_IS_EMPTY, METH_VARARGS, (char *)"CV_NODE_IS_EMPTY(int flags) -> int"},
+        { (char *)"CV_NODE_IS_USER", _wrap_CV_NODE_IS_USER, METH_VARARGS, (char *)"CV_NODE_IS_USER(int flags) -> int"},
+        { (char *)"CV_NODE_HAS_NAME", _wrap_CV_NODE_HAS_NAME, METH_VARARGS, (char *)"CV_NODE_HAS_NAME(int flags) -> int"},
+        { (char *)"CV_NODE_SEQ_IS_SIMPLE", _wrap_CV_NODE_SEQ_IS_SIMPLE, METH_VARARGS, (char *)"CV_NODE_SEQ_IS_SIMPLE(CvSeq seq) -> int"},
+        { (char *)"cvReshapeND", _wrap_cvReshapeND, METH_VARARGS, (char *)"cvReshapeND(CvArr arr, int new_cn, int new_dims, int new_sizes)"},
+        { (char *)"cvConvert", _wrap_cvConvert, METH_VARARGS, (char *)"cvConvert(CvArr src, CvArr dst)"},
+        { (char *)"cvAXPY", _wrap_cvAXPY, METH_VARARGS, (char *)"cvAXPY(CvArr A, double real_scalar, CvArr B, CvArr C)"},
+        { (char *)"cvAbs", _wrap_cvAbs, METH_VARARGS, (char *)"cvAbs(CvArr src, CvArr dst)"},
+        { (char *)"cvMatMulAdd", _wrap_cvMatMulAdd, METH_VARARGS, (char *)"cvMatMulAdd(CvArr src1, CvArr src2, CvArr src3, CvArr dst)"},
+        { (char *)"cvMatMul", _wrap_cvMatMul, METH_VARARGS, (char *)"cvMatMul(CvArr src1, CvArr src2, CvArr dst)"},
+        { (char *)"cvGetGraphVtx", _wrap_cvGetGraphVtx, METH_VARARGS, (char *)"cvGetGraphVtx(CvGraph graph, int idx)"},
+        { (char *)"cvGraphVtxIdx", _wrap_cvGraphVtxIdx, METH_VARARGS, (char *)"cvGraphVtxIdx(CvGraph graph, CvGraphVtx vtx) -> int"},
+        { (char *)"cvGraphEdgeIdx", _wrap_cvGraphEdgeIdx, METH_VARARGS, (char *)"cvGraphEdgeIdx(CvGraph graph, CvGraphEdge edge) -> int"},
+        { (char *)"cvGraphGetVtxCount", _wrap_cvGraphGetVtxCount, METH_VARARGS, (char *)"cvGraphGetVtxCount(CvGraph graph) -> int"},
+        { (char *)"cvGraphGetEdgeCount", _wrap_cvGraphGetEdgeCount, METH_VARARGS, (char *)"cvGraphGetEdgeCount(CvGraph graph) -> int"},
+        { (char *)"CV_IS_GRAPH_VERTEX_VISITED", _wrap_CV_IS_GRAPH_VERTEX_VISITED, METH_VARARGS, (char *)"CV_IS_GRAPH_VERTEX_VISITED(CvGraphVtx vtx) -> int"},
+        { (char *)"CV_IS_GRAPH_EDGE_VISITED", _wrap_CV_IS_GRAPH_EDGE_VISITED, METH_VARARGS, (char *)"CV_IS_GRAPH_EDGE_VISITED(CvGraphEdge edge) -> int"},
+        { (char *)"CV_RGB", _wrap_CV_RGB, METH_VARARGS, (char *)"CV_RGB(double r, double g, int b) -> CvScalar"},
+        { (char *)"CV_NEXT_LINE_POINT", _wrap_CV_NEXT_LINE_POINT, METH_VARARGS, (char *)"CV_NEXT_LINE_POINT(CvLineIterator line_iterator)"},
+        { (char *)"CV_INIT_3X3_DELTAS", _wrap_CV_INIT_3X3_DELTAS, METH_VARARGS, (char *)"CV_INIT_3X3_DELTAS(double deltas, int step, int nch)"},
+        { (char *)"CV_IS_HAAR_CLASSIFIER", _wrap_CV_IS_HAAR_CLASSIFIER, METH_VARARGS, (char *)"CV_IS_HAAR_CLASSIFIER(void haar) -> int"},
+        { (char *)"cvContourPerimeter", _wrap_cvContourPerimeter, METH_VARARGS, (char *)"cvContourPerimeter(CvSeq contour) -> double"},
+        { (char *)"cvCalcBackProject", _wrap_cvCalcBackProject, METH_VARARGS, (char *)"cvCalcBackProject( image, CvArr dst, CvHistogram hist)"},
+        { (char *)"cvCalcBackProjectPatch", _wrap_cvCalcBackProjectPatch, METH_VARARGS, (char *)"\n"
+               "cvCalcBackProjectPatch( image, CvArr dst, CvSize range, CvHistogram hist, \n"
+               "    int method, double factor)\n"
+               ""},
+        { (char *)"cvCreateImage", _wrap_cvCreateImage, METH_VARARGS, (char *)"cvCreateImage(CvSize size, int depth, int channels) -> CvMat"},
+        { (char *)"cvCloneImage", _wrap_cvCloneImage, METH_VARARGS, (char *)"cvCloneImage(CvMat mat) -> CvMat"},
+        { (char *)"Cv32suf_i_set", _wrap_Cv32suf_i_set, METH_VARARGS, (char *)"Cv32suf_i_set(Cv32suf self, int i)"},
+        { (char *)"Cv32suf_i_get", _wrap_Cv32suf_i_get, METH_VARARGS, (char *)"Cv32suf_i_get(Cv32suf self) -> int"},
+        { (char *)"Cv32suf_u_set", _wrap_Cv32suf_u_set, METH_VARARGS, (char *)"Cv32suf_u_set(Cv32suf self, unsigned int u)"},
+        { (char *)"Cv32suf_u_get", _wrap_Cv32suf_u_get, METH_VARARGS, (char *)"Cv32suf_u_get(Cv32suf self) -> unsigned int"},
+        { (char *)"Cv32suf_f_set", _wrap_Cv32suf_f_set, METH_VARARGS, (char *)"Cv32suf_f_set(Cv32suf self, float f)"},
+        { (char *)"Cv32suf_f_get", _wrap_Cv32suf_f_get, METH_VARARGS, (char *)"Cv32suf_f_get(Cv32suf self) -> float"},
+        { (char *)"new_Cv32suf", _wrap_new_Cv32suf, METH_VARARGS, (char *)"new_Cv32suf() -> Cv32suf"},
+        { (char *)"delete_Cv32suf", _wrap_delete_Cv32suf, METH_VARARGS, (char *)"delete_Cv32suf(Cv32suf self)"},
         { (char *)"Cv32suf_swigregister", Cv32suf_swigregister, METH_VARARGS, NULL},
-        { (char *)"Cv64suf_i_set", _wrap_Cv64suf_i_set, METH_VARARGS, NULL},
-        { (char *)"Cv64suf_i_get", _wrap_Cv64suf_i_get, METH_VARARGS, NULL},
-        { (char *)"Cv64suf_u_set", _wrap_Cv64suf_u_set, METH_VARARGS, NULL},
-        { (char *)"Cv64suf_u_get", _wrap_Cv64suf_u_get, METH_VARARGS, NULL},
-        { (char *)"Cv64suf_f_set", _wrap_Cv64suf_f_set, METH_VARARGS, NULL},
-        { (char *)"Cv64suf_f_get", _wrap_Cv64suf_f_get, METH_VARARGS, NULL},
-        { (char *)"new_Cv64suf", _wrap_new_Cv64suf, METH_VARARGS, NULL},
-        { (char *)"delete_Cv64suf", _wrap_delete_Cv64suf, METH_VARARGS, NULL},
+        { (char *)"Cv64suf_i_set", _wrap_Cv64suf_i_set, METH_VARARGS, (char *)"Cv64suf_i_set(Cv64suf self, int64 i)"},
+        { (char *)"Cv64suf_i_get", _wrap_Cv64suf_i_get, METH_VARARGS, (char *)"Cv64suf_i_get(Cv64suf self) -> int64"},
+        { (char *)"Cv64suf_u_set", _wrap_Cv64suf_u_set, METH_VARARGS, (char *)"Cv64suf_u_set(Cv64suf self, uint64 u)"},
+        { (char *)"Cv64suf_u_get", _wrap_Cv64suf_u_get, METH_VARARGS, (char *)"Cv64suf_u_get(Cv64suf self) -> uint64"},
+        { (char *)"Cv64suf_f_set", _wrap_Cv64suf_f_set, METH_VARARGS, (char *)"Cv64suf_f_set(Cv64suf self, double f)"},
+        { (char *)"Cv64suf_f_get", _wrap_Cv64suf_f_get, METH_VARARGS, (char *)"Cv64suf_f_get(Cv64suf self) -> double"},
+        { (char *)"new_Cv64suf", _wrap_new_Cv64suf, METH_VARARGS, (char *)"new_Cv64suf() -> Cv64suf"},
+        { (char *)"delete_Cv64suf", _wrap_delete_Cv64suf, METH_VARARGS, (char *)"delete_Cv64suf(Cv64suf self)"},
         { (char *)"Cv64suf_swigregister", Cv64suf_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvRound", _wrap_cvRound, METH_VARARGS, NULL},
-        { (char *)"cvFloor", _wrap_cvFloor, METH_VARARGS, NULL},
-        { (char *)"cvCeil", _wrap_cvCeil, METH_VARARGS, NULL},
-        { (char *)"cvIsNaN", _wrap_cvIsNaN, METH_VARARGS, NULL},
-        { (char *)"cvIsInf", _wrap_cvIsInf, METH_VARARGS, NULL},
-        { (char *)"cvRNG", _wrap_cvRNG, METH_VARARGS, NULL},
-        { (char *)"cvRandInt", _wrap_cvRandInt, METH_VARARGS, NULL},
-        { (char *)"cvRandReal", _wrap_cvRandReal, METH_VARARGS, NULL},
-        { (char *)"IplImage_ID_set", _wrap_IplImage_ID_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_ID_get", _wrap_IplImage_ID_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_nChannels_set", _wrap_IplImage_nChannels_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_nChannels_get", _wrap_IplImage_nChannels_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_depth_set", _wrap_IplImage_depth_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_depth_get", _wrap_IplImage_depth_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_dataOrder_set", _wrap_IplImage_dataOrder_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_dataOrder_get", _wrap_IplImage_dataOrder_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_origin_set", _wrap_IplImage_origin_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_origin_get", _wrap_IplImage_origin_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_align_set", _wrap_IplImage_align_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_align_get", _wrap_IplImage_align_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_width_set", _wrap_IplImage_width_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_width_get", _wrap_IplImage_width_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_height_set", _wrap_IplImage_height_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_height_get", _wrap_IplImage_height_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_roi_set", _wrap_IplImage_roi_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_roi_get", _wrap_IplImage_roi_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_imageSize_set", _wrap_IplImage_imageSize_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_imageSize_get", _wrap_IplImage_imageSize_get, METH_VARARGS, NULL},
-        { (char *)"IplImage_widthStep_set", _wrap_IplImage_widthStep_set, METH_VARARGS, NULL},
-        { (char *)"IplImage_widthStep_get", _wrap_IplImage_widthStep_get, METH_VARARGS, NULL},
-        { (char *)"delete_IplImage", _wrap_delete_IplImage, METH_VARARGS, NULL},
-        { (char *)"IplImage___add__", _wrap_IplImage___add__, METH_VARARGS, NULL},
-        { (char *)"IplImage___iadd__", _wrap_IplImage___iadd__, METH_VARARGS, NULL},
-        { (char *)"IplImage___xor__", _wrap_IplImage___xor__, METH_VARARGS, NULL},
-        { (char *)"IplImage___ixor__", _wrap_IplImage___ixor__, METH_VARARGS, NULL},
-        { (char *)"IplImage___sub__", _wrap_IplImage___sub__, METH_VARARGS, NULL},
-        { (char *)"IplImage___isub__", _wrap_IplImage___isub__, METH_VARARGS, NULL},
-        { (char *)"IplImage___or__", _wrap_IplImage___or__, METH_VARARGS, NULL},
-        { (char *)"IplImage___ior__", _wrap_IplImage___ior__, METH_VARARGS, NULL},
-        { (char *)"IplImage___and__", _wrap_IplImage___and__, METH_VARARGS, NULL},
-        { (char *)"IplImage___iand__", _wrap_IplImage___iand__, METH_VARARGS, NULL},
-        { (char *)"IplImage___ge__", _wrap_IplImage___ge__, METH_VARARGS, NULL},
-        { (char *)"IplImage___eq__", _wrap_IplImage___eq__, METH_VARARGS, NULL},
-        { (char *)"IplImage___le__", _wrap_IplImage___le__, METH_VARARGS, NULL},
-        { (char *)"IplImage___ne__", _wrap_IplImage___ne__, METH_VARARGS, NULL},
-        { (char *)"IplImage___lt__", _wrap_IplImage___lt__, METH_VARARGS, NULL},
-        { (char *)"IplImage___gt__", _wrap_IplImage___gt__, METH_VARARGS, NULL},
-        { (char *)"IplImage___mul__", _wrap_IplImage___mul__, METH_VARARGS, NULL},
-        { (char *)"IplImage___imul__", _wrap_IplImage___imul__, METH_VARARGS, NULL},
-        { (char *)"IplImage___div__", _wrap_IplImage___div__, METH_VARARGS, NULL},
-        { (char *)"IplImage___idiv__", _wrap_IplImage___idiv__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rdiv__", _wrap_IplImage___rdiv__, METH_VARARGS, NULL},
-        { (char *)"IplImage___radd__", _wrap_IplImage___radd__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rsub__", _wrap_IplImage___rsub__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rmul__", _wrap_IplImage___rmul__, METH_VARARGS, NULL},
-        { (char *)"IplImage___ror__", _wrap_IplImage___ror__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rand__", _wrap_IplImage___rand__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rxor__", _wrap_IplImage___rxor__, METH_VARARGS, NULL},
-        { (char *)"IplImage___req__", _wrap_IplImage___req__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rgt__", _wrap_IplImage___rgt__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rge__", _wrap_IplImage___rge__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rlt__", _wrap_IplImage___rlt__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rle__", _wrap_IplImage___rle__, METH_VARARGS, NULL},
-        { (char *)"IplImage___rne__", _wrap_IplImage___rne__, METH_VARARGS, NULL},
-        { (char *)"IplImage___pow__", _wrap_IplImage___pow__, METH_VARARGS, NULL},
-        { (char *)"IplImage___str__", _wrap_IplImage___str__, METH_VARARGS, NULL},
-        { (char *)"IplImage___setitem__", _wrap_IplImage___setitem__, METH_VARARGS, NULL},
-        { (char *)"IplImage___getitem__", _wrap_IplImage___getitem__, METH_VARARGS, NULL},
+        { (char *)"cvRound", _wrap_cvRound, METH_VARARGS, (char *)"cvRound(double value) -> int"},
+        { (char *)"cvFloor", _wrap_cvFloor, METH_VARARGS, (char *)"cvFloor(double value) -> int"},
+        { (char *)"cvCeil", _wrap_cvCeil, METH_VARARGS, (char *)"cvCeil(double value) -> int"},
+        { (char *)"cvIsNaN", _wrap_cvIsNaN, METH_VARARGS, (char *)"cvIsNaN(double value) -> int"},
+        { (char *)"cvIsInf", _wrap_cvIsInf, METH_VARARGS, (char *)"cvIsInf(double value) -> int"},
+        { (char *)"cvRNG", _wrap_cvRNG, METH_VARARGS, (char *)"\n"
+               "cvRNG(int64 seed = -1) -> CvRNG\n"
+               "cvRNG() -> CvRNG\n"
+               ""},
+        { (char *)"cvRandInt", _wrap_cvRandInt, METH_VARARGS, (char *)"cvRandInt(CvRNG rng) -> unsigned int"},
+        { (char *)"cvRandReal", _wrap_cvRandReal, METH_VARARGS, (char *)"cvRandReal(CvRNG rng) -> double"},
+        { (char *)"IplImage_ID_set", _wrap_IplImage_ID_set, METH_VARARGS, (char *)"IplImage_ID_set( self, int ID)"},
+        { (char *)"IplImage_ID_get", _wrap_IplImage_ID_get, METH_VARARGS, (char *)"IplImage_ID_get( self) -> int"},
+        { (char *)"IplImage_nChannels_set", _wrap_IplImage_nChannels_set, METH_VARARGS, (char *)"IplImage_nChannels_set( self, int nChannels)"},
+        { (char *)"IplImage_nChannels_get", _wrap_IplImage_nChannels_get, METH_VARARGS, (char *)"IplImage_nChannels_get( self) -> int"},
+        { (char *)"IplImage_depth_set", _wrap_IplImage_depth_set, METH_VARARGS, (char *)"IplImage_depth_set( self, int depth)"},
+        { (char *)"IplImage_depth_get", _wrap_IplImage_depth_get, METH_VARARGS, (char *)"IplImage_depth_get( self) -> int"},
+        { (char *)"IplImage_dataOrder_set", _wrap_IplImage_dataOrder_set, METH_VARARGS, (char *)"IplImage_dataOrder_set( self, int dataOrder)"},
+        { (char *)"IplImage_dataOrder_get", _wrap_IplImage_dataOrder_get, METH_VARARGS, (char *)"IplImage_dataOrder_get( self) -> int"},
+        { (char *)"IplImage_origin_set", _wrap_IplImage_origin_set, METH_VARARGS, (char *)"IplImage_origin_set( self, int origin)"},
+        { (char *)"IplImage_origin_get", _wrap_IplImage_origin_get, METH_VARARGS, (char *)"IplImage_origin_get( self) -> int"},
+        { (char *)"IplImage_align_set", _wrap_IplImage_align_set, METH_VARARGS, (char *)"IplImage_align_set( self, int align)"},
+        { (char *)"IplImage_align_get", _wrap_IplImage_align_get, METH_VARARGS, (char *)"IplImage_align_get( self) -> int"},
+        { (char *)"IplImage_width_set", _wrap_IplImage_width_set, METH_VARARGS, (char *)"IplImage_width_set( self, int width)"},
+        { (char *)"IplImage_width_get", _wrap_IplImage_width_get, METH_VARARGS, (char *)"IplImage_width_get( self) -> int"},
+        { (char *)"IplImage_height_set", _wrap_IplImage_height_set, METH_VARARGS, (char *)"IplImage_height_set( self, int height)"},
+        { (char *)"IplImage_height_get", _wrap_IplImage_height_get, METH_VARARGS, (char *)"IplImage_height_get( self) -> int"},
+        { (char *)"IplImage_roi_set", _wrap_IplImage_roi_set, METH_VARARGS, (char *)"IplImage_roi_set( self, IplROI roi)"},
+        { (char *)"IplImage_roi_get", _wrap_IplImage_roi_get, METH_VARARGS, (char *)"IplImage_roi_get( self) -> IplROI"},
+        { (char *)"IplImage_imageSize_set", _wrap_IplImage_imageSize_set, METH_VARARGS, (char *)"IplImage_imageSize_set( self, int imageSize)"},
+        { (char *)"IplImage_imageSize_get", _wrap_IplImage_imageSize_get, METH_VARARGS, (char *)"IplImage_imageSize_get( self) -> int"},
+        { (char *)"IplImage_widthStep_set", _wrap_IplImage_widthStep_set, METH_VARARGS, (char *)"IplImage_widthStep_set( self, int widthStep)"},
+        { (char *)"IplImage_widthStep_get", _wrap_IplImage_widthStep_get, METH_VARARGS, (char *)"IplImage_widthStep_get( self) -> int"},
+        { (char *)"delete_IplImage", _wrap_delete_IplImage, METH_VARARGS, (char *)"delete_IplImage( self)"},
+        { (char *)"IplImage___add__", _wrap_IplImage___add__, METH_VARARGS, (char *)"\n"
+               "__add__(CvArr src)\n"
+               "IplImage___add__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___iadd__", _wrap_IplImage___iadd__, METH_VARARGS, (char *)"\n"
+               "__iadd__(CvArr src)\n"
+               "IplImage___iadd__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___xor__", _wrap_IplImage___xor__, METH_VARARGS, (char *)"\n"
+               "__xor__(CvArr src)\n"
+               "IplImage___xor__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___ixor__", _wrap_IplImage___ixor__, METH_VARARGS, (char *)"\n"
+               "__ixor__(CvArr src)\n"
+               "IplImage___ixor__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___sub__", _wrap_IplImage___sub__, METH_VARARGS, (char *)"\n"
+               "__sub__(CvArr src)\n"
+               "IplImage___sub__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___isub__", _wrap_IplImage___isub__, METH_VARARGS, (char *)"\n"
+               "__isub__(CvArr src)\n"
+               "IplImage___isub__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___or__", _wrap_IplImage___or__, METH_VARARGS, (char *)"\n"
+               "__or__(CvArr src)\n"
+               "IplImage___or__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___ior__", _wrap_IplImage___ior__, METH_VARARGS, (char *)"\n"
+               "__ior__(CvArr src)\n"
+               "IplImage___ior__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___and__", _wrap_IplImage___and__, METH_VARARGS, (char *)"\n"
+               "__and__(CvArr src)\n"
+               "IplImage___and__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___iand__", _wrap_IplImage___iand__, METH_VARARGS, (char *)"\n"
+               "__iand__(CvArr src)\n"
+               "IplImage___iand__( self, CvScalar val)\n"
+               ""},
+        { (char *)"IplImage___ge__", _wrap_IplImage___ge__, METH_VARARGS, (char *)"\n"
+               "__ge__(CvArr src)\n"
+               "IplImage___ge__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___eq__", _wrap_IplImage___eq__, METH_VARARGS, (char *)"\n"
+               "__eq__(CvArr src)\n"
+               "IplImage___eq__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___le__", _wrap_IplImage___le__, METH_VARARGS, (char *)"\n"
+               "__le__(CvArr src)\n"
+               "IplImage___le__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___ne__", _wrap_IplImage___ne__, METH_VARARGS, (char *)"\n"
+               "__ne__(CvArr src)\n"
+               "IplImage___ne__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___lt__", _wrap_IplImage___lt__, METH_VARARGS, (char *)"\n"
+               "__lt__(CvArr src)\n"
+               "IplImage___lt__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___gt__", _wrap_IplImage___gt__, METH_VARARGS, (char *)"\n"
+               "__gt__(CvArr src)\n"
+               "IplImage___gt__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___mul__", _wrap_IplImage___mul__, METH_VARARGS, (char *)"\n"
+               "__mul__(CvArr src)\n"
+               "IplImage___mul__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___imul__", _wrap_IplImage___imul__, METH_VARARGS, (char *)"\n"
+               "__imul__(CvArr src)\n"
+               "IplImage___imul__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___div__", _wrap_IplImage___div__, METH_VARARGS, (char *)"\n"
+               "__div__(CvArr src)\n"
+               "IplImage___div__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___idiv__", _wrap_IplImage___idiv__, METH_VARARGS, (char *)"\n"
+               "__idiv__(CvArr src)\n"
+               "IplImage___idiv__( self, double val)\n"
+               ""},
+        { (char *)"IplImage___rdiv__", _wrap_IplImage___rdiv__, METH_VARARGS, (char *)"IplImage___rdiv__( self, CvArr arg)"},
+        { (char *)"IplImage___radd__", _wrap_IplImage___radd__, METH_VARARGS, (char *)"\n"
+               "__radd__(CvArr arg)\n"
+               "__radd__(CvScalar arg)\n"
+               "IplImage___radd__( self, double arg)\n"
+               ""},
+        { (char *)"IplImage___rsub__", _wrap_IplImage___rsub__, METH_VARARGS, (char *)"\n"
+               "__rsub__(CvArr arg)\n"
+               "__rsub__(CvScalar arg)\n"
+               "IplImage___rsub__( self, double arg)\n"
+               ""},
+        { (char *)"IplImage___rmul__", _wrap_IplImage___rmul__, METH_VARARGS, (char *)"\n"
+               "__rmul__(CvArr arg)\n"
+               "IplImage___rmul__( self, double arg)\n"
+               ""},
+        { (char *)"IplImage___ror__", _wrap_IplImage___ror__, METH_VARARGS, (char *)"\n"
+               "__ror__(CvScalar arg)\n"
+               "IplImage___ror__( self, double arg)\n"
+               ""},
+        { (char *)"IplImage___rand__", _wrap_IplImage___rand__, METH_VARARGS, (char *)"\n"
+               "__rand__(CvScalar arg)\n"
+               "IplImage___rand__( self, double arg)\n"
+               ""},
+        { (char *)"IplImage___rxor__", _wrap_IplImage___rxor__, METH_VARARGS, (char *)"\n"
+               "__rxor__(CvScalar arg)\n"
+               "IplImage___rxor__( self, double arg)\n"
+               ""},
+        { (char *)"IplImage___req__", _wrap_IplImage___req__, METH_VARARGS, (char *)"IplImage___req__( self, double arg)"},
+        { (char *)"IplImage___rgt__", _wrap_IplImage___rgt__, METH_VARARGS, (char *)"IplImage___rgt__( self, double arg)"},
+        { (char *)"IplImage___rge__", _wrap_IplImage___rge__, METH_VARARGS, (char *)"IplImage___rge__( self, double arg)"},
+        { (char *)"IplImage___rlt__", _wrap_IplImage___rlt__, METH_VARARGS, (char *)"IplImage___rlt__( self, double arg)"},
+        { (char *)"IplImage___rle__", _wrap_IplImage___rle__, METH_VARARGS, (char *)"IplImage___rle__( self, double arg)"},
+        { (char *)"IplImage___rne__", _wrap_IplImage___rne__, METH_VARARGS, (char *)"IplImage___rne__( self, double arg)"},
+        { (char *)"IplImage___pow__", _wrap_IplImage___pow__, METH_VARARGS, (char *)"IplImage___pow__( self, double arg)"},
+        { (char *)"IplImage___str__", _wrap_IplImage___str__, METH_VARARGS, (char *)"IplImage___str__( self) -> char"},
+        { (char *)"IplImage___setitem__", _wrap_IplImage___setitem__, METH_VARARGS, (char *)"\n"
+               "__setitem__(PyObject object, double val)\n"
+               "__setitem__(PyObject object, CvPoint val)\n"
+               "__setitem__(PyObject object, CvPoint2D32f val)\n"
+               "__setitem__(PyObject object, CvScalar val)\n"
+               "IplImage___setitem__( self, PyObject object, CvArr arr)\n"
+               ""},
+        { (char *)"IplImage___getitem__", _wrap_IplImage___getitem__, METH_VARARGS, (char *)"IplImage___getitem__( self, PyObject object) -> PyObject"},
         { (char *)"IplImage_swigregister", IplImage_swigregister, METH_VARARGS, NULL},
-        { (char *)"IplROI_coi_set", _wrap_IplROI_coi_set, METH_VARARGS, NULL},
-        { (char *)"IplROI_coi_get", _wrap_IplROI_coi_get, METH_VARARGS, NULL},
-        { (char *)"IplROI_xOffset_set", _wrap_IplROI_xOffset_set, METH_VARARGS, NULL},
-        { (char *)"IplROI_xOffset_get", _wrap_IplROI_xOffset_get, METH_VARARGS, NULL},
-        { (char *)"IplROI_yOffset_set", _wrap_IplROI_yOffset_set, METH_VARARGS, NULL},
-        { (char *)"IplROI_yOffset_get", _wrap_IplROI_yOffset_get, METH_VARARGS, NULL},
-        { (char *)"IplROI_width_set", _wrap_IplROI_width_set, METH_VARARGS, NULL},
-        { (char *)"IplROI_width_get", _wrap_IplROI_width_get, METH_VARARGS, NULL},
-        { (char *)"IplROI_height_set", _wrap_IplROI_height_set, METH_VARARGS, NULL},
-        { (char *)"IplROI_height_get", _wrap_IplROI_height_get, METH_VARARGS, NULL},
-        { (char *)"new_IplROI", _wrap_new_IplROI, METH_VARARGS, NULL},
-        { (char *)"delete_IplROI", _wrap_delete_IplROI, METH_VARARGS, NULL},
+        { (char *)"IplROI_coi_set", _wrap_IplROI_coi_set, METH_VARARGS, (char *)"IplROI_coi_set( self, int coi)"},
+        { (char *)"IplROI_coi_get", _wrap_IplROI_coi_get, METH_VARARGS, (char *)"IplROI_coi_get( self) -> int"},
+        { (char *)"IplROI_xOffset_set", _wrap_IplROI_xOffset_set, METH_VARARGS, (char *)"IplROI_xOffset_set( self, int xOffset)"},
+        { (char *)"IplROI_xOffset_get", _wrap_IplROI_xOffset_get, METH_VARARGS, (char *)"IplROI_xOffset_get( self) -> int"},
+        { (char *)"IplROI_yOffset_set", _wrap_IplROI_yOffset_set, METH_VARARGS, (char *)"IplROI_yOffset_set( self, int yOffset)"},
+        { (char *)"IplROI_yOffset_get", _wrap_IplROI_yOffset_get, METH_VARARGS, (char *)"IplROI_yOffset_get( self) -> int"},
+        { (char *)"IplROI_width_set", _wrap_IplROI_width_set, METH_VARARGS, (char *)"IplROI_width_set( self, int width)"},
+        { (char *)"IplROI_width_get", _wrap_IplROI_width_get, METH_VARARGS, (char *)"IplROI_width_get( self) -> int"},
+        { (char *)"IplROI_height_set", _wrap_IplROI_height_set, METH_VARARGS, (char *)"IplROI_height_set( self, int height)"},
+        { (char *)"IplROI_height_get", _wrap_IplROI_height_get, METH_VARARGS, (char *)"IplROI_height_get( self) -> int"},
+        { (char *)"new_IplROI", _wrap_new_IplROI, METH_VARARGS, (char *)"new_IplROI()"},
+        { (char *)"delete_IplROI", _wrap_delete_IplROI, METH_VARARGS, (char *)"delete_IplROI( self)"},
         { (char *)"IplROI_swigregister", IplROI_swigregister, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_nCols_set", _wrap_IplConvKernel_nCols_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_nCols_get", _wrap_IplConvKernel_nCols_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_nRows_set", _wrap_IplConvKernel_nRows_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_nRows_get", _wrap_IplConvKernel_nRows_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_anchorX_set", _wrap_IplConvKernel_anchorX_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_anchorX_get", _wrap_IplConvKernel_anchorX_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_anchorY_set", _wrap_IplConvKernel_anchorY_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_anchorY_get", _wrap_IplConvKernel_anchorY_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_values_set", _wrap_IplConvKernel_values_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_values_get", _wrap_IplConvKernel_values_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_nShiftR_set", _wrap_IplConvKernel_nShiftR_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernel_nShiftR_get", _wrap_IplConvKernel_nShiftR_get, METH_VARARGS, NULL},
-        { (char *)"delete_IplConvKernel", _wrap_delete_IplConvKernel, METH_VARARGS, NULL},
+        { (char *)"IplConvKernel_nCols_set", _wrap_IplConvKernel_nCols_set, METH_VARARGS, (char *)"IplConvKernel_nCols_set( self, int nCols)"},
+        { (char *)"IplConvKernel_nCols_get", _wrap_IplConvKernel_nCols_get, METH_VARARGS, (char *)"IplConvKernel_nCols_get( self) -> int"},
+        { (char *)"IplConvKernel_nRows_set", _wrap_IplConvKernel_nRows_set, METH_VARARGS, (char *)"IplConvKernel_nRows_set( self, int nRows)"},
+        { (char *)"IplConvKernel_nRows_get", _wrap_IplConvKernel_nRows_get, METH_VARARGS, (char *)"IplConvKernel_nRows_get( self) -> int"},
+        { (char *)"IplConvKernel_anchorX_set", _wrap_IplConvKernel_anchorX_set, METH_VARARGS, (char *)"IplConvKernel_anchorX_set( self, int anchorX)"},
+        { (char *)"IplConvKernel_anchorX_get", _wrap_IplConvKernel_anchorX_get, METH_VARARGS, (char *)"IplConvKernel_anchorX_get( self) -> int"},
+        { (char *)"IplConvKernel_anchorY_set", _wrap_IplConvKernel_anchorY_set, METH_VARARGS, (char *)"IplConvKernel_anchorY_set( self, int anchorY)"},
+        { (char *)"IplConvKernel_anchorY_get", _wrap_IplConvKernel_anchorY_get, METH_VARARGS, (char *)"IplConvKernel_anchorY_get( self) -> int"},
+        { (char *)"IplConvKernel_values_set", _wrap_IplConvKernel_values_set, METH_VARARGS, (char *)"IplConvKernel_values_set( self, int values)"},
+        { (char *)"IplConvKernel_values_get", _wrap_IplConvKernel_values_get, METH_VARARGS, (char *)"IplConvKernel_values_get( self) -> int"},
+        { (char *)"IplConvKernel_nShiftR_set", _wrap_IplConvKernel_nShiftR_set, METH_VARARGS, (char *)"IplConvKernel_nShiftR_set( self, int nShiftR)"},
+        { (char *)"IplConvKernel_nShiftR_get", _wrap_IplConvKernel_nShiftR_get, METH_VARARGS, (char *)"IplConvKernel_nShiftR_get( self) -> int"},
+        { (char *)"delete_IplConvKernel", _wrap_delete_IplConvKernel, METH_VARARGS, (char *)"delete_IplConvKernel( self)"},
         { (char *)"IplConvKernel_swigregister", IplConvKernel_swigregister, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_nCols_set", _wrap_IplConvKernelFP_nCols_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_nCols_get", _wrap_IplConvKernelFP_nCols_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_nRows_set", _wrap_IplConvKernelFP_nRows_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_nRows_get", _wrap_IplConvKernelFP_nRows_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_anchorX_set", _wrap_IplConvKernelFP_anchorX_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_anchorX_get", _wrap_IplConvKernelFP_anchorX_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_anchorY_set", _wrap_IplConvKernelFP_anchorY_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_anchorY_get", _wrap_IplConvKernelFP_anchorY_get, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_values_set", _wrap_IplConvKernelFP_values_set, METH_VARARGS, NULL},
-        { (char *)"IplConvKernelFP_values_get", _wrap_IplConvKernelFP_values_get, METH_VARARGS, NULL},
-        { (char *)"new_IplConvKernelFP", _wrap_new_IplConvKernelFP, METH_VARARGS, NULL},
-        { (char *)"delete_IplConvKernelFP", _wrap_delete_IplConvKernelFP, METH_VARARGS, NULL},
+        { (char *)"IplConvKernelFP_nCols_set", _wrap_IplConvKernelFP_nCols_set, METH_VARARGS, (char *)"IplConvKernelFP_nCols_set( self, int nCols)"},
+        { (char *)"IplConvKernelFP_nCols_get", _wrap_IplConvKernelFP_nCols_get, METH_VARARGS, (char *)"IplConvKernelFP_nCols_get( self) -> int"},
+        { (char *)"IplConvKernelFP_nRows_set", _wrap_IplConvKernelFP_nRows_set, METH_VARARGS, (char *)"IplConvKernelFP_nRows_set( self, int nRows)"},
+        { (char *)"IplConvKernelFP_nRows_get", _wrap_IplConvKernelFP_nRows_get, METH_VARARGS, (char *)"IplConvKernelFP_nRows_get( self) -> int"},
+        { (char *)"IplConvKernelFP_anchorX_set", _wrap_IplConvKernelFP_anchorX_set, METH_VARARGS, (char *)"IplConvKernelFP_anchorX_set( self, int anchorX)"},
+        { (char *)"IplConvKernelFP_anchorX_get", _wrap_IplConvKernelFP_anchorX_get, METH_VARARGS, (char *)"IplConvKernelFP_anchorX_get( self) -> int"},
+        { (char *)"IplConvKernelFP_anchorY_set", _wrap_IplConvKernelFP_anchorY_set, METH_VARARGS, (char *)"IplConvKernelFP_anchorY_set( self, int anchorY)"},
+        { (char *)"IplConvKernelFP_anchorY_get", _wrap_IplConvKernelFP_anchorY_get, METH_VARARGS, (char *)"IplConvKernelFP_anchorY_get( self) -> int"},
+        { (char *)"IplConvKernelFP_values_set", _wrap_IplConvKernelFP_values_set, METH_VARARGS, (char *)"IplConvKernelFP_values_set( self, float values)"},
+        { (char *)"IplConvKernelFP_values_get", _wrap_IplConvKernelFP_values_get, METH_VARARGS, (char *)"IplConvKernelFP_values_get( self) -> float"},
+        { (char *)"new_IplConvKernelFP", _wrap_new_IplConvKernelFP, METH_VARARGS, (char *)"new_IplConvKernelFP()"},
+        { (char *)"delete_IplConvKernelFP", _wrap_delete_IplConvKernelFP, METH_VARARGS, (char *)"delete_IplConvKernelFP( self)"},
         { (char *)"IplConvKernelFP_swigregister", IplConvKernelFP_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvMat_type_set", _wrap_CvMat_type_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_type_get", _wrap_CvMat_type_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_step_set", _wrap_CvMat_step_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_step_get", _wrap_CvMat_step_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_refcount_set", _wrap_CvMat_refcount_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_refcount_get", _wrap_CvMat_refcount_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_hdr_refcount_set", _wrap_CvMat_hdr_refcount_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_hdr_refcount_get", _wrap_CvMat_hdr_refcount_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_get", _wrap_CvMat_data_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvMat", _wrap_delete_CvMat, METH_VARARGS, NULL},
-        { (char *)"CvMat_depth_set", _wrap_CvMat_depth_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_depth_get", _wrap_CvMat_depth_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_nChannels_set", _wrap_CvMat_nChannels_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_nChannels_get", _wrap_CvMat_nChannels_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_dataOrder_set", _wrap_CvMat_dataOrder_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_dataOrder_get", _wrap_CvMat_dataOrder_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_origin_set", _wrap_CvMat_origin_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_origin_get", _wrap_CvMat_origin_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_width_set", _wrap_CvMat_width_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_width_get", _wrap_CvMat_width_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_height_set", _wrap_CvMat_height_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_height_get", _wrap_CvMat_height_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_imageSize_set", _wrap_CvMat_imageSize_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_imageSize_get", _wrap_CvMat_imageSize_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_widthStep_set", _wrap_CvMat_widthStep_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_widthStep_get", _wrap_CvMat_widthStep_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_rows_set", _wrap_CvMat_rows_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_rows_get", _wrap_CvMat_rows_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_cols_set", _wrap_CvMat_cols_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_cols_get", _wrap_CvMat_cols_get, METH_VARARGS, NULL},
-        { (char *)"CvMat___add__", _wrap_CvMat___add__, METH_VARARGS, NULL},
-        { (char *)"CvMat___iadd__", _wrap_CvMat___iadd__, METH_VARARGS, NULL},
-        { (char *)"CvMat___xor__", _wrap_CvMat___xor__, METH_VARARGS, NULL},
-        { (char *)"CvMat___ixor__", _wrap_CvMat___ixor__, METH_VARARGS, NULL},
-        { (char *)"CvMat___sub__", _wrap_CvMat___sub__, METH_VARARGS, NULL},
-        { (char *)"CvMat___isub__", _wrap_CvMat___isub__, METH_VARARGS, NULL},
-        { (char *)"CvMat___or__", _wrap_CvMat___or__, METH_VARARGS, NULL},
-        { (char *)"CvMat___ior__", _wrap_CvMat___ior__, METH_VARARGS, NULL},
-        { (char *)"CvMat___and__", _wrap_CvMat___and__, METH_VARARGS, NULL},
-        { (char *)"CvMat___iand__", _wrap_CvMat___iand__, METH_VARARGS, NULL},
-        { (char *)"CvMat___ge__", _wrap_CvMat___ge__, METH_VARARGS, NULL},
-        { (char *)"CvMat___eq__", _wrap_CvMat___eq__, METH_VARARGS, NULL},
-        { (char *)"CvMat___le__", _wrap_CvMat___le__, METH_VARARGS, NULL},
-        { (char *)"CvMat___ne__", _wrap_CvMat___ne__, METH_VARARGS, NULL},
-        { (char *)"CvMat___lt__", _wrap_CvMat___lt__, METH_VARARGS, NULL},
-        { (char *)"CvMat___gt__", _wrap_CvMat___gt__, METH_VARARGS, NULL},
-        { (char *)"CvMat___mul__", _wrap_CvMat___mul__, METH_VARARGS, NULL},
-        { (char *)"CvMat___imul__", _wrap_CvMat___imul__, METH_VARARGS, NULL},
-        { (char *)"CvMat___div__", _wrap_CvMat___div__, METH_VARARGS, NULL},
-        { (char *)"CvMat___idiv__", _wrap_CvMat___idiv__, METH_VARARGS, NULL},
-        { (char *)"CvMat___radd__", _wrap_CvMat___radd__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rsub__", _wrap_CvMat___rsub__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rmul__", _wrap_CvMat___rmul__, METH_VARARGS, NULL},
-        { (char *)"CvMat___ror__", _wrap_CvMat___ror__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rand__", _wrap_CvMat___rand__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rxor__", _wrap_CvMat___rxor__, METH_VARARGS, NULL},
-        { (char *)"CvMat___req__", _wrap_CvMat___req__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rgt__", _wrap_CvMat___rgt__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rge__", _wrap_CvMat___rge__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rlt__", _wrap_CvMat___rlt__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rle__", _wrap_CvMat___rle__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rne__", _wrap_CvMat___rne__, METH_VARARGS, NULL},
-        { (char *)"CvMat___rdiv__", _wrap_CvMat___rdiv__, METH_VARARGS, NULL},
-        { (char *)"CvMat___pow__", _wrap_CvMat___pow__, METH_VARARGS, NULL},
-        { (char *)"CvMat___str__", _wrap_CvMat___str__, METH_VARARGS, NULL},
-        { (char *)"CvMat___setitem__", _wrap_CvMat___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvMat___getitem__", _wrap_CvMat___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvMat___invert__", _wrap_CvMat___invert__, METH_VARARGS, NULL},
-        { (char *)"CvMat_imageData_set", _wrap_CvMat_imageData_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_imageData_get", _wrap_CvMat_imageData_get, METH_VARARGS, NULL},
+        { (char *)"CvMat_type_set", _wrap_CvMat_type_set, METH_VARARGS, (char *)"CvMat_type_set(CvMat self, int type)"},
+        { (char *)"CvMat_type_get", _wrap_CvMat_type_get, METH_VARARGS, (char *)"CvMat_type_get(CvMat self) -> int"},
+        { (char *)"CvMat_step_set", _wrap_CvMat_step_set, METH_VARARGS, (char *)"CvMat_step_set(CvMat self, int step)"},
+        { (char *)"CvMat_step_get", _wrap_CvMat_step_get, METH_VARARGS, (char *)"CvMat_step_get(CvMat self) -> int"},
+        { (char *)"CvMat_refcount_set", _wrap_CvMat_refcount_set, METH_VARARGS, (char *)"CvMat_refcount_set(CvMat self, int refcount)"},
+        { (char *)"CvMat_refcount_get", _wrap_CvMat_refcount_get, METH_VARARGS, (char *)"CvMat_refcount_get(CvMat self) -> int"},
+        { (char *)"CvMat_hdr_refcount_set", _wrap_CvMat_hdr_refcount_set, METH_VARARGS, (char *)"CvMat_hdr_refcount_set(CvMat self, int hdr_refcount)"},
+        { (char *)"CvMat_hdr_refcount_get", _wrap_CvMat_hdr_refcount_get, METH_VARARGS, (char *)"CvMat_hdr_refcount_get(CvMat self) -> int"},
+        { (char *)"CvMat_data_get", _wrap_CvMat_data_get, METH_VARARGS, (char *)"CvMat_data_get(CvMat self) -> CvMat_data"},
+        { (char *)"delete_CvMat", _wrap_delete_CvMat, METH_VARARGS, (char *)"delete_CvMat(CvMat self)"},
+        { (char *)"CvMat_depth_set", _wrap_CvMat_depth_set, METH_VARARGS, (char *)"CvMat_depth_set(CvMat self, int depth)"},
+        { (char *)"CvMat_depth_get", _wrap_CvMat_depth_get, METH_VARARGS, (char *)"CvMat_depth_get(CvMat self) -> int"},
+        { (char *)"CvMat_nChannels_set", _wrap_CvMat_nChannels_set, METH_VARARGS, (char *)"CvMat_nChannels_set(CvMat self, int nChannels)"},
+        { (char *)"CvMat_nChannels_get", _wrap_CvMat_nChannels_get, METH_VARARGS, (char *)"CvMat_nChannels_get(CvMat self) -> int"},
+        { (char *)"CvMat_dataOrder_set", _wrap_CvMat_dataOrder_set, METH_VARARGS, (char *)"CvMat_dataOrder_set(CvMat self, int dataOrder)"},
+        { (char *)"CvMat_dataOrder_get", _wrap_CvMat_dataOrder_get, METH_VARARGS, (char *)"CvMat_dataOrder_get(CvMat self) -> int"},
+        { (char *)"CvMat_origin_set", _wrap_CvMat_origin_set, METH_VARARGS, (char *)"CvMat_origin_set(CvMat self, int origin)"},
+        { (char *)"CvMat_origin_get", _wrap_CvMat_origin_get, METH_VARARGS, (char *)"CvMat_origin_get(CvMat self) -> int"},
+        { (char *)"CvMat_width_set", _wrap_CvMat_width_set, METH_VARARGS, (char *)"CvMat_width_set(CvMat self, int width)"},
+        { (char *)"CvMat_width_get", _wrap_CvMat_width_get, METH_VARARGS, (char *)"CvMat_width_get(CvMat self) -> int"},
+        { (char *)"CvMat_height_set", _wrap_CvMat_height_set, METH_VARARGS, (char *)"CvMat_height_set(CvMat self, int height)"},
+        { (char *)"CvMat_height_get", _wrap_CvMat_height_get, METH_VARARGS, (char *)"CvMat_height_get(CvMat self) -> int"},
+        { (char *)"CvMat_imageSize_set", _wrap_CvMat_imageSize_set, METH_VARARGS, (char *)"CvMat_imageSize_set(CvMat self, int imageSize)"},
+        { (char *)"CvMat_imageSize_get", _wrap_CvMat_imageSize_get, METH_VARARGS, (char *)"CvMat_imageSize_get(CvMat self) -> int"},
+        { (char *)"CvMat_widthStep_set", _wrap_CvMat_widthStep_set, METH_VARARGS, (char *)"CvMat_widthStep_set(CvMat self, int widthStep)"},
+        { (char *)"CvMat_widthStep_get", _wrap_CvMat_widthStep_get, METH_VARARGS, (char *)"CvMat_widthStep_get(CvMat self) -> int"},
+        { (char *)"CvMat_rows_set", _wrap_CvMat_rows_set, METH_VARARGS, (char *)"CvMat_rows_set(CvMat self, int rows)"},
+        { (char *)"CvMat_rows_get", _wrap_CvMat_rows_get, METH_VARARGS, (char *)"CvMat_rows_get(CvMat self) -> int"},
+        { (char *)"CvMat_cols_set", _wrap_CvMat_cols_set, METH_VARARGS, (char *)"CvMat_cols_set(CvMat self, int cols)"},
+        { (char *)"CvMat_cols_get", _wrap_CvMat_cols_get, METH_VARARGS, (char *)"CvMat_cols_get(CvMat self) -> int"},
+        { (char *)"CvMat___add__", _wrap_CvMat___add__, METH_VARARGS, (char *)"\n"
+               "__add__(CvArr src) -> CvMat\n"
+               "CvMat___add__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___iadd__", _wrap_CvMat___iadd__, METH_VARARGS, (char *)"\n"
+               "__iadd__(CvArr src) -> CvMat\n"
+               "CvMat___iadd__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___xor__", _wrap_CvMat___xor__, METH_VARARGS, (char *)"\n"
+               "__xor__(CvArr src) -> CvMat\n"
+               "CvMat___xor__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___ixor__", _wrap_CvMat___ixor__, METH_VARARGS, (char *)"\n"
+               "__ixor__(CvArr src) -> CvMat\n"
+               "CvMat___ixor__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___sub__", _wrap_CvMat___sub__, METH_VARARGS, (char *)"\n"
+               "__sub__(CvArr src) -> CvMat\n"
+               "CvMat___sub__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___isub__", _wrap_CvMat___isub__, METH_VARARGS, (char *)"\n"
+               "__isub__(CvArr src) -> CvMat\n"
+               "CvMat___isub__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___or__", _wrap_CvMat___or__, METH_VARARGS, (char *)"\n"
+               "__or__(CvArr src) -> CvMat\n"
+               "CvMat___or__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___ior__", _wrap_CvMat___ior__, METH_VARARGS, (char *)"\n"
+               "__ior__(CvArr src) -> CvMat\n"
+               "CvMat___ior__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___and__", _wrap_CvMat___and__, METH_VARARGS, (char *)"\n"
+               "__and__(CvArr src) -> CvMat\n"
+               "CvMat___and__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___iand__", _wrap_CvMat___iand__, METH_VARARGS, (char *)"\n"
+               "__iand__(CvArr src) -> CvMat\n"
+               "CvMat___iand__(CvMat self, CvScalar val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___ge__", _wrap_CvMat___ge__, METH_VARARGS, (char *)"\n"
+               "__ge__(CvArr src) -> CvMat\n"
+               "CvMat___ge__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___eq__", _wrap_CvMat___eq__, METH_VARARGS, (char *)"\n"
+               "__eq__(CvArr src) -> CvMat\n"
+               "CvMat___eq__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___le__", _wrap_CvMat___le__, METH_VARARGS, (char *)"\n"
+               "__le__(CvArr src) -> CvMat\n"
+               "CvMat___le__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___ne__", _wrap_CvMat___ne__, METH_VARARGS, (char *)"\n"
+               "__ne__(CvArr src) -> CvMat\n"
+               "CvMat___ne__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___lt__", _wrap_CvMat___lt__, METH_VARARGS, (char *)"\n"
+               "__lt__(CvArr src) -> CvMat\n"
+               "CvMat___lt__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___gt__", _wrap_CvMat___gt__, METH_VARARGS, (char *)"\n"
+               "__gt__(CvArr src) -> CvMat\n"
+               "CvMat___gt__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___mul__", _wrap_CvMat___mul__, METH_VARARGS, (char *)"\n"
+               "__mul__(CvArr src) -> CvMat\n"
+               "CvMat___mul__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___imul__", _wrap_CvMat___imul__, METH_VARARGS, (char *)"\n"
+               "__imul__(CvArr src) -> CvMat\n"
+               "CvMat___imul__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___div__", _wrap_CvMat___div__, METH_VARARGS, (char *)"\n"
+               "__div__(CvArr src) -> CvMat\n"
+               "CvMat___div__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___idiv__", _wrap_CvMat___idiv__, METH_VARARGS, (char *)"\n"
+               "__idiv__(CvArr src) -> CvMat\n"
+               "CvMat___idiv__(CvMat self, double val) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___radd__", _wrap_CvMat___radd__, METH_VARARGS, (char *)"\n"
+               "__radd__(CvArr arg) -> CvMat\n"
+               "__radd__(CvScalar arg) -> CvMat\n"
+               "CvMat___radd__(CvMat self, double arg) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___rsub__", _wrap_CvMat___rsub__, METH_VARARGS, (char *)"\n"
+               "__rsub__(CvArr arg) -> CvMat\n"
+               "__rsub__(CvScalar arg) -> CvMat\n"
+               "CvMat___rsub__(CvMat self, double arg) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___rmul__", _wrap_CvMat___rmul__, METH_VARARGS, (char *)"\n"
+               "__rmul__(CvArr arg) -> CvMat\n"
+               "CvMat___rmul__(CvMat self, double arg) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___ror__", _wrap_CvMat___ror__, METH_VARARGS, (char *)"\n"
+               "__ror__(CvScalar arg) -> CvMat\n"
+               "CvMat___ror__(CvMat self, double arg) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___rand__", _wrap_CvMat___rand__, METH_VARARGS, (char *)"\n"
+               "__rand__(CvScalar arg) -> CvMat\n"
+               "CvMat___rand__(CvMat self, double arg) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___rxor__", _wrap_CvMat___rxor__, METH_VARARGS, (char *)"\n"
+               "__rxor__(CvScalar arg) -> CvMat\n"
+               "CvMat___rxor__(CvMat self, double arg) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___req__", _wrap_CvMat___req__, METH_VARARGS, (char *)"CvMat___req__(CvMat self, double arg) -> CvMat"},
+        { (char *)"CvMat___rgt__", _wrap_CvMat___rgt__, METH_VARARGS, (char *)"CvMat___rgt__(CvMat self, double arg) -> CvMat"},
+        { (char *)"CvMat___rge__", _wrap_CvMat___rge__, METH_VARARGS, (char *)"CvMat___rge__(CvMat self, double arg) -> CvMat"},
+        { (char *)"CvMat___rlt__", _wrap_CvMat___rlt__, METH_VARARGS, (char *)"CvMat___rlt__(CvMat self, double arg) -> CvMat"},
+        { (char *)"CvMat___rle__", _wrap_CvMat___rle__, METH_VARARGS, (char *)"CvMat___rle__(CvMat self, double arg) -> CvMat"},
+        { (char *)"CvMat___rne__", _wrap_CvMat___rne__, METH_VARARGS, (char *)"CvMat___rne__(CvMat self, double arg) -> CvMat"},
+        { (char *)"CvMat___rdiv__", _wrap_CvMat___rdiv__, METH_VARARGS, (char *)"\n"
+               "__rdiv__(CvArr arg) -> CvMat\n"
+               "CvMat___rdiv__(CvMat self, double arg) -> CvMat\n"
+               ""},
+        { (char *)"CvMat___pow__", _wrap_CvMat___pow__, METH_VARARGS, (char *)"CvMat___pow__(CvMat self, double arg) -> CvMat"},
+        { (char *)"CvMat___str__", _wrap_CvMat___str__, METH_VARARGS, (char *)"CvMat___str__(CvMat self) -> char"},
+        { (char *)"CvMat___setitem__", _wrap_CvMat___setitem__, METH_VARARGS, (char *)"\n"
+               "__setitem__(PyObject object, double val)\n"
+               "__setitem__(PyObject object, CvPoint val)\n"
+               "__setitem__(PyObject object, CvPoint2D32f val)\n"
+               "__setitem__(PyObject object, CvScalar val)\n"
+               "CvMat___setitem__(CvMat self, PyObject object, CvArr arr)\n"
+               ""},
+        { (char *)"CvMat___getitem__", _wrap_CvMat___getitem__, METH_VARARGS, (char *)"CvMat___getitem__(CvMat self, PyObject object) -> PyObject"},
+        { (char *)"CvMat___invert__", _wrap_CvMat___invert__, METH_VARARGS, (char *)"CvMat___invert__(CvMat self) -> CvMat"},
+        { (char *)"CvMat_imageData_set", _wrap_CvMat_imageData_set, METH_VARARGS, (char *)"CvMat_imageData_set(CvMat self, PyObject imageData)"},
+        { (char *)"CvMat_imageData_get", _wrap_CvMat_imageData_get, METH_VARARGS, (char *)"CvMat_imageData_get(CvMat self) -> PyObject"},
         { (char *)"CvMat_swigregister", CvMat_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_ptr_set", _wrap_CvMat_data_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_ptr_get", _wrap_CvMat_data_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_s_set", _wrap_CvMat_data_s_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_s_get", _wrap_CvMat_data_s_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_i_set", _wrap_CvMat_data_i_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_i_get", _wrap_CvMat_data_i_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_fl_set", _wrap_CvMat_data_fl_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_fl_get", _wrap_CvMat_data_fl_get, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_db_set", _wrap_CvMat_data_db_set, METH_VARARGS, NULL},
-        { (char *)"CvMat_data_db_get", _wrap_CvMat_data_db_get, METH_VARARGS, NULL},
-        { (char *)"new_CvMat_data", _wrap_new_CvMat_data, METH_VARARGS, NULL},
-        { (char *)"delete_CvMat_data", _wrap_delete_CvMat_data, METH_VARARGS, NULL},
+        { (char *)"CvMat_data_ptr_set", _wrap_CvMat_data_ptr_set, METH_VARARGS, (char *)"CvMat_data_ptr_set(CvMat_data self, uchar ptr)"},
+        { (char *)"CvMat_data_ptr_get", _wrap_CvMat_data_ptr_get, METH_VARARGS, (char *)"CvMat_data_ptr_get(CvMat_data self) -> uchar"},
+        { (char *)"CvMat_data_s_set", _wrap_CvMat_data_s_set, METH_VARARGS, (char *)"CvMat_data_s_set(CvMat_data self, short s)"},
+        { (char *)"CvMat_data_s_get", _wrap_CvMat_data_s_get, METH_VARARGS, (char *)"CvMat_data_s_get(CvMat_data self) -> short"},
+        { (char *)"CvMat_data_i_set", _wrap_CvMat_data_i_set, METH_VARARGS, (char *)"CvMat_data_i_set(CvMat_data self, int i)"},
+        { (char *)"CvMat_data_i_get", _wrap_CvMat_data_i_get, METH_VARARGS, (char *)"CvMat_data_i_get(CvMat_data self) -> int"},
+        { (char *)"CvMat_data_fl_set", _wrap_CvMat_data_fl_set, METH_VARARGS, (char *)"CvMat_data_fl_set(CvMat_data self, float fl)"},
+        { (char *)"CvMat_data_fl_get", _wrap_CvMat_data_fl_get, METH_VARARGS, (char *)"CvMat_data_fl_get(CvMat_data self) -> float"},
+        { (char *)"CvMat_data_db_set", _wrap_CvMat_data_db_set, METH_VARARGS, (char *)"CvMat_data_db_set(CvMat_data self, double db)"},
+        { (char *)"CvMat_data_db_get", _wrap_CvMat_data_db_get, METH_VARARGS, (char *)"CvMat_data_db_get(CvMat_data self) -> double"},
+        { (char *)"new_CvMat_data", _wrap_new_CvMat_data, METH_VARARGS, (char *)"new_CvMat_data() -> CvMat_data"},
+        { (char *)"delete_CvMat_data", _wrap_delete_CvMat_data, METH_VARARGS, (char *)"delete_CvMat_data(CvMat_data self)"},
         { (char *)"CvMat_data_swigregister", CvMat_data_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvMat", _wrap_cvMat, METH_VARARGS, NULL},
-        { (char *)"cvmGet", _wrap_cvmGet, METH_VARARGS, NULL},
-        { (char *)"cvmSet", _wrap_cvmSet, METH_VARARGS, NULL},
-        { (char *)"cvCvToIplDepth", _wrap_cvCvToIplDepth, METH_VARARGS, NULL},
-        { (char *)"CvMatND_type_set", _wrap_CvMatND_type_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_type_get", _wrap_CvMatND_type_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_dims_set", _wrap_CvMatND_dims_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_dims_get", _wrap_CvMatND_dims_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_refcount_set", _wrap_CvMatND_refcount_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_refcount_get", _wrap_CvMatND_refcount_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_hdr_refcount_set", _wrap_CvMatND_hdr_refcount_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_hdr_refcount_get", _wrap_CvMatND_hdr_refcount_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_dim_get", _wrap_CvMatND_dim_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_get", _wrap_CvMatND_data_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvMatND", _wrap_delete_CvMatND, METH_VARARGS, NULL},
+        { (char *)"cvMat", _wrap_cvMat, METH_VARARGS, (char *)"\n"
+               "cvMat(int rows, int cols, int type, void data = None) -> CvMat\n"
+               "cvMat(int rows, int cols, int type) -> CvMat\n"
+               ""},
+        { (char *)"cvmGet", _wrap_cvmGet, METH_VARARGS, (char *)"cvmGet(CvMat mat, int row, int col) -> double"},
+        { (char *)"cvmSet", _wrap_cvmSet, METH_VARARGS, (char *)"cvmSet(CvMat mat, int row, int col, double value)"},
+        { (char *)"cvIplDepth", _wrap_cvIplDepth, METH_VARARGS, (char *)"cvIplDepth(int type) -> int"},
+        { (char *)"CvMatND_type_set", _wrap_CvMatND_type_set, METH_VARARGS, (char *)"CvMatND_type_set(CvMatND self, int type)"},
+        { (char *)"CvMatND_type_get", _wrap_CvMatND_type_get, METH_VARARGS, (char *)"CvMatND_type_get(CvMatND self) -> int"},
+        { (char *)"CvMatND_dims_set", _wrap_CvMatND_dims_set, METH_VARARGS, (char *)"CvMatND_dims_set(CvMatND self, int dims)"},
+        { (char *)"CvMatND_dims_get", _wrap_CvMatND_dims_get, METH_VARARGS, (char *)"CvMatND_dims_get(CvMatND self) -> int"},
+        { (char *)"CvMatND_refcount_set", _wrap_CvMatND_refcount_set, METH_VARARGS, (char *)"CvMatND_refcount_set(CvMatND self, int refcount)"},
+        { (char *)"CvMatND_refcount_get", _wrap_CvMatND_refcount_get, METH_VARARGS, (char *)"CvMatND_refcount_get(CvMatND self) -> int"},
+        { (char *)"CvMatND_hdr_refcount_set", _wrap_CvMatND_hdr_refcount_set, METH_VARARGS, (char *)"CvMatND_hdr_refcount_set(CvMatND self, int hdr_refcount)"},
+        { (char *)"CvMatND_hdr_refcount_get", _wrap_CvMatND_hdr_refcount_get, METH_VARARGS, (char *)"CvMatND_hdr_refcount_get(CvMatND self) -> int"},
+        { (char *)"CvMatND_dim_get", _wrap_CvMatND_dim_get, METH_VARARGS, (char *)"CvMatND_dim_get(CvMatND self) -> CvMatND_dim"},
+        { (char *)"CvMatND_data_get", _wrap_CvMatND_data_get, METH_VARARGS, (char *)"CvMatND_data_get(CvMatND self) -> CvMatND_data"},
+        { (char *)"delete_CvMatND", _wrap_delete_CvMatND, METH_VARARGS, (char *)"delete_CvMatND(CvMatND self)"},
         { (char *)"CvMatND_swigregister", CvMatND_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvMatND_dim_size_set", _wrap_CvMatND_dim_size_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_dim_size_get", _wrap_CvMatND_dim_size_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_dim_step_set", _wrap_CvMatND_dim_step_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_dim_step_get", _wrap_CvMatND_dim_step_get, METH_VARARGS, NULL},
-        { (char *)"new_CvMatND_dim", _wrap_new_CvMatND_dim, METH_VARARGS, NULL},
-        { (char *)"delete_CvMatND_dim", _wrap_delete_CvMatND_dim, METH_VARARGS, NULL},
+        { (char *)"CvMatND_dim_size_set", _wrap_CvMatND_dim_size_set, METH_VARARGS, (char *)"CvMatND_dim_size_set(CvMatND_dim self, int size)"},
+        { (char *)"CvMatND_dim_size_get", _wrap_CvMatND_dim_size_get, METH_VARARGS, (char *)"CvMatND_dim_size_get(CvMatND_dim self) -> int"},
+        { (char *)"CvMatND_dim_step_set", _wrap_CvMatND_dim_step_set, METH_VARARGS, (char *)"CvMatND_dim_step_set(CvMatND_dim self, int step)"},
+        { (char *)"CvMatND_dim_step_get", _wrap_CvMatND_dim_step_get, METH_VARARGS, (char *)"CvMatND_dim_step_get(CvMatND_dim self) -> int"},
+        { (char *)"new_CvMatND_dim", _wrap_new_CvMatND_dim, METH_VARARGS, (char *)"new_CvMatND_dim() -> CvMatND_dim"},
+        { (char *)"delete_CvMatND_dim", _wrap_delete_CvMatND_dim, METH_VARARGS, (char *)"delete_CvMatND_dim(CvMatND_dim self)"},
         { (char *)"CvMatND_dim_swigregister", CvMatND_dim_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_ptr_set", _wrap_CvMatND_data_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_ptr_get", _wrap_CvMatND_data_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_fl_set", _wrap_CvMatND_data_fl_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_fl_get", _wrap_CvMatND_data_fl_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_db_set", _wrap_CvMatND_data_db_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_db_get", _wrap_CvMatND_data_db_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_i_set", _wrap_CvMatND_data_i_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_i_get", _wrap_CvMatND_data_i_get, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_s_set", _wrap_CvMatND_data_s_set, METH_VARARGS, NULL},
-        { (char *)"CvMatND_data_s_get", _wrap_CvMatND_data_s_get, METH_VARARGS, NULL},
-        { (char *)"new_CvMatND_data", _wrap_new_CvMatND_data, METH_VARARGS, NULL},
-        { (char *)"delete_CvMatND_data", _wrap_delete_CvMatND_data, METH_VARARGS, NULL},
+        { (char *)"CvMatND_data_ptr_set", _wrap_CvMatND_data_ptr_set, METH_VARARGS, (char *)"CvMatND_data_ptr_set(CvMatND_data self, uchar ptr)"},
+        { (char *)"CvMatND_data_ptr_get", _wrap_CvMatND_data_ptr_get, METH_VARARGS, (char *)"CvMatND_data_ptr_get(CvMatND_data self) -> uchar"},
+        { (char *)"CvMatND_data_fl_set", _wrap_CvMatND_data_fl_set, METH_VARARGS, (char *)"CvMatND_data_fl_set(CvMatND_data self, float fl)"},
+        { (char *)"CvMatND_data_fl_get", _wrap_CvMatND_data_fl_get, METH_VARARGS, (char *)"CvMatND_data_fl_get(CvMatND_data self) -> float"},
+        { (char *)"CvMatND_data_db_set", _wrap_CvMatND_data_db_set, METH_VARARGS, (char *)"CvMatND_data_db_set(CvMatND_data self, double db)"},
+        { (char *)"CvMatND_data_db_get", _wrap_CvMatND_data_db_get, METH_VARARGS, (char *)"CvMatND_data_db_get(CvMatND_data self) -> double"},
+        { (char *)"CvMatND_data_i_set", _wrap_CvMatND_data_i_set, METH_VARARGS, (char *)"CvMatND_data_i_set(CvMatND_data self, int i)"},
+        { (char *)"CvMatND_data_i_get", _wrap_CvMatND_data_i_get, METH_VARARGS, (char *)"CvMatND_data_i_get(CvMatND_data self) -> int"},
+        { (char *)"CvMatND_data_s_set", _wrap_CvMatND_data_s_set, METH_VARARGS, (char *)"CvMatND_data_s_set(CvMatND_data self, short s)"},
+        { (char *)"CvMatND_data_s_get", _wrap_CvMatND_data_s_get, METH_VARARGS, (char *)"CvMatND_data_s_get(CvMatND_data self) -> short"},
+        { (char *)"new_CvMatND_data", _wrap_new_CvMatND_data, METH_VARARGS, (char *)"new_CvMatND_data() -> CvMatND_data"},
+        { (char *)"delete_CvMatND_data", _wrap_delete_CvMatND_data, METH_VARARGS, (char *)"delete_CvMatND_data(CvMatND_data self)"},
         { (char *)"CvMatND_data_swigregister", CvMatND_data_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_type_set", _wrap_CvSparseMat_type_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_type_get", _wrap_CvSparseMat_type_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_dims_set", _wrap_CvSparseMat_dims_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_dims_get", _wrap_CvSparseMat_dims_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_refcount_set", _wrap_CvSparseMat_refcount_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_refcount_get", _wrap_CvSparseMat_refcount_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_hdr_refcount_set", _wrap_CvSparseMat_hdr_refcount_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_hdr_refcount_get", _wrap_CvSparseMat_hdr_refcount_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_heap_set", _wrap_CvSparseMat_heap_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_heap_get", _wrap_CvSparseMat_heap_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_hashtable_set", _wrap_CvSparseMat_hashtable_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_hashtable_get", _wrap_CvSparseMat_hashtable_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_hashsize_set", _wrap_CvSparseMat_hashsize_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_hashsize_get", _wrap_CvSparseMat_hashsize_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_valoffset_set", _wrap_CvSparseMat_valoffset_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_valoffset_get", _wrap_CvSparseMat_valoffset_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_idxoffset_set", _wrap_CvSparseMat_idxoffset_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_idxoffset_get", _wrap_CvSparseMat_idxoffset_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_size_set", _wrap_CvSparseMat_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMat_size_get", _wrap_CvSparseMat_size_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvSparseMat", _wrap_delete_CvSparseMat, METH_VARARGS, NULL},
+        { (char *)"CvSparseMat_type_set", _wrap_CvSparseMat_type_set, METH_VARARGS, (char *)"CvSparseMat_type_set(CvSparseMat self, int type)"},
+        { (char *)"CvSparseMat_type_get", _wrap_CvSparseMat_type_get, METH_VARARGS, (char *)"CvSparseMat_type_get(CvSparseMat self) -> int"},
+        { (char *)"CvSparseMat_dims_set", _wrap_CvSparseMat_dims_set, METH_VARARGS, (char *)"CvSparseMat_dims_set(CvSparseMat self, int dims)"},
+        { (char *)"CvSparseMat_dims_get", _wrap_CvSparseMat_dims_get, METH_VARARGS, (char *)"CvSparseMat_dims_get(CvSparseMat self) -> int"},
+        { (char *)"CvSparseMat_refcount_set", _wrap_CvSparseMat_refcount_set, METH_VARARGS, (char *)"CvSparseMat_refcount_set(CvSparseMat self, int refcount)"},
+        { (char *)"CvSparseMat_refcount_get", _wrap_CvSparseMat_refcount_get, METH_VARARGS, (char *)"CvSparseMat_refcount_get(CvSparseMat self) -> int"},
+        { (char *)"CvSparseMat_hdr_refcount_set", _wrap_CvSparseMat_hdr_refcount_set, METH_VARARGS, (char *)"CvSparseMat_hdr_refcount_set(CvSparseMat self, int hdr_refcount)"},
+        { (char *)"CvSparseMat_hdr_refcount_get", _wrap_CvSparseMat_hdr_refcount_get, METH_VARARGS, (char *)"CvSparseMat_hdr_refcount_get(CvSparseMat self) -> int"},
+        { (char *)"CvSparseMat_heap_set", _wrap_CvSparseMat_heap_set, METH_VARARGS, (char *)"CvSparseMat_heap_set(CvSparseMat self, CvSet heap)"},
+        { (char *)"CvSparseMat_heap_get", _wrap_CvSparseMat_heap_get, METH_VARARGS, (char *)"CvSparseMat_heap_get(CvSparseMat self) -> CvSet"},
+        { (char *)"CvSparseMat_hashtable_set", _wrap_CvSparseMat_hashtable_set, METH_VARARGS, (char *)"CvSparseMat_hashtable_set(CvSparseMat self, void hashtable)"},
+        { (char *)"CvSparseMat_hashtable_get", _wrap_CvSparseMat_hashtable_get, METH_VARARGS, (char *)"CvSparseMat_hashtable_get(CvSparseMat self) -> void"},
+        { (char *)"CvSparseMat_hashsize_set", _wrap_CvSparseMat_hashsize_set, METH_VARARGS, (char *)"CvSparseMat_hashsize_set(CvSparseMat self, int hashsize)"},
+        { (char *)"CvSparseMat_hashsize_get", _wrap_CvSparseMat_hashsize_get, METH_VARARGS, (char *)"CvSparseMat_hashsize_get(CvSparseMat self) -> int"},
+        { (char *)"CvSparseMat_valoffset_set", _wrap_CvSparseMat_valoffset_set, METH_VARARGS, (char *)"CvSparseMat_valoffset_set(CvSparseMat self, int valoffset)"},
+        { (char *)"CvSparseMat_valoffset_get", _wrap_CvSparseMat_valoffset_get, METH_VARARGS, (char *)"CvSparseMat_valoffset_get(CvSparseMat self) -> int"},
+        { (char *)"CvSparseMat_idxoffset_set", _wrap_CvSparseMat_idxoffset_set, METH_VARARGS, (char *)"CvSparseMat_idxoffset_set(CvSparseMat self, int idxoffset)"},
+        { (char *)"CvSparseMat_idxoffset_get", _wrap_CvSparseMat_idxoffset_get, METH_VARARGS, (char *)"CvSparseMat_idxoffset_get(CvSparseMat self) -> int"},
+        { (char *)"CvSparseMat_size_set", _wrap_CvSparseMat_size_set, METH_VARARGS, (char *)"CvSparseMat_size_set(CvSparseMat self, int size)"},
+        { (char *)"CvSparseMat_size_get", _wrap_CvSparseMat_size_get, METH_VARARGS, (char *)"CvSparseMat_size_get(CvSparseMat self) -> int"},
+        { (char *)"delete_CvSparseMat", _wrap_delete_CvSparseMat, METH_VARARGS, (char *)"delete_CvSparseMat(CvSparseMat self)"},
         { (char *)"CvSparseMat_swigregister", CvSparseMat_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSparseNode_hashval_set", _wrap_CvSparseNode_hashval_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseNode_hashval_get", _wrap_CvSparseNode_hashval_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseNode_next_set", _wrap_CvSparseNode_next_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseNode_next_get", _wrap_CvSparseNode_next_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSparseNode", _wrap_new_CvSparseNode, METH_VARARGS, NULL},
-        { (char *)"delete_CvSparseNode", _wrap_delete_CvSparseNode, METH_VARARGS, NULL},
+        { (char *)"CvSparseNode_hashval_set", _wrap_CvSparseNode_hashval_set, METH_VARARGS, (char *)"CvSparseNode_hashval_set(CvSparseNode self, unsigned int hashval)"},
+        { (char *)"CvSparseNode_hashval_get", _wrap_CvSparseNode_hashval_get, METH_VARARGS, (char *)"CvSparseNode_hashval_get(CvSparseNode self) -> unsigned int"},
+        { (char *)"CvSparseNode_next_set", _wrap_CvSparseNode_next_set, METH_VARARGS, (char *)"CvSparseNode_next_set(CvSparseNode self, CvSparseNode next)"},
+        { (char *)"CvSparseNode_next_get", _wrap_CvSparseNode_next_get, METH_VARARGS, (char *)"CvSparseNode_next_get(CvSparseNode self) -> CvSparseNode"},
+        { (char *)"new_CvSparseNode", _wrap_new_CvSparseNode, METH_VARARGS, (char *)"new_CvSparseNode() -> CvSparseNode"},
+        { (char *)"delete_CvSparseNode", _wrap_delete_CvSparseNode, METH_VARARGS, (char *)"delete_CvSparseNode(CvSparseNode self)"},
         { (char *)"CvSparseNode_swigregister", CvSparseNode_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSparseMatIterator_mat_set", _wrap_CvSparseMatIterator_mat_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMatIterator_mat_get", _wrap_CvSparseMatIterator_mat_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMatIterator_node_set", _wrap_CvSparseMatIterator_node_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMatIterator_node_get", _wrap_CvSparseMatIterator_node_get, METH_VARARGS, NULL},
-        { (char *)"CvSparseMatIterator_curidx_set", _wrap_CvSparseMatIterator_curidx_set, METH_VARARGS, NULL},
-        { (char *)"CvSparseMatIterator_curidx_get", _wrap_CvSparseMatIterator_curidx_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSparseMatIterator", _wrap_new_CvSparseMatIterator, METH_VARARGS, NULL},
-        { (char *)"delete_CvSparseMatIterator", _wrap_delete_CvSparseMatIterator, METH_VARARGS, NULL},
+        { (char *)"CvSparseMatIterator_mat_set", _wrap_CvSparseMatIterator_mat_set, METH_VARARGS, (char *)"CvSparseMatIterator_mat_set(CvSparseMatIterator self, CvSparseMat mat)"},
+        { (char *)"CvSparseMatIterator_mat_get", _wrap_CvSparseMatIterator_mat_get, METH_VARARGS, (char *)"CvSparseMatIterator_mat_get(CvSparseMatIterator self) -> CvSparseMat"},
+        { (char *)"CvSparseMatIterator_node_set", _wrap_CvSparseMatIterator_node_set, METH_VARARGS, (char *)"CvSparseMatIterator_node_set(CvSparseMatIterator self, CvSparseNode node)"},
+        { (char *)"CvSparseMatIterator_node_get", _wrap_CvSparseMatIterator_node_get, METH_VARARGS, (char *)"CvSparseMatIterator_node_get(CvSparseMatIterator self) -> CvSparseNode"},
+        { (char *)"CvSparseMatIterator_curidx_set", _wrap_CvSparseMatIterator_curidx_set, METH_VARARGS, (char *)"CvSparseMatIterator_curidx_set(CvSparseMatIterator self, int curidx)"},
+        { (char *)"CvSparseMatIterator_curidx_get", _wrap_CvSparseMatIterator_curidx_get, METH_VARARGS, (char *)"CvSparseMatIterator_curidx_get(CvSparseMatIterator self) -> int"},
+        { (char *)"new_CvSparseMatIterator", _wrap_new_CvSparseMatIterator, METH_VARARGS, (char *)"new_CvSparseMatIterator() -> CvSparseMatIterator"},
+        { (char *)"delete_CvSparseMatIterator", _wrap_delete_CvSparseMatIterator, METH_VARARGS, (char *)"delete_CvSparseMatIterator(CvSparseMatIterator self)"},
         { (char *)"CvSparseMatIterator_swigregister", CvSparseMatIterator_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_type_set", _wrap_CvHistogram_type_set, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_type_get", _wrap_CvHistogram_type_get, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_bins_set", _wrap_CvHistogram_bins_set, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_bins_get", _wrap_CvHistogram_bins_get, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_thresh_set", _wrap_CvHistogram_thresh_set, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_thresh_get", _wrap_CvHistogram_thresh_get, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_thresh2_set", _wrap_CvHistogram_thresh2_set, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_thresh2_get", _wrap_CvHistogram_thresh2_get, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_mat_set", _wrap_CvHistogram_mat_set, METH_VARARGS, NULL},
-        { (char *)"CvHistogram_mat_get", _wrap_CvHistogram_mat_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvHistogram", _wrap_delete_CvHistogram, METH_VARARGS, NULL},
+        { (char *)"CvHistogram_type_set", _wrap_CvHistogram_type_set, METH_VARARGS, (char *)"CvHistogram_type_set(CvHistogram self, int type)"},
+        { (char *)"CvHistogram_type_get", _wrap_CvHistogram_type_get, METH_VARARGS, (char *)"CvHistogram_type_get(CvHistogram self) -> int"},
+        { (char *)"CvHistogram_bins_set", _wrap_CvHistogram_bins_set, METH_VARARGS, (char *)"CvHistogram_bins_set(CvHistogram self, CvArr bins)"},
+        { (char *)"CvHistogram_bins_get", _wrap_CvHistogram_bins_get, METH_VARARGS, (char *)"CvHistogram_bins_get(CvHistogram self) -> CvArr"},
+        { (char *)"CvHistogram_thresh_set", _wrap_CvHistogram_thresh_set, METH_VARARGS, (char *)"CvHistogram_thresh_set(CvHistogram self, float thresh)"},
+        { (char *)"CvHistogram_thresh_get", _wrap_CvHistogram_thresh_get, METH_VARARGS, (char *)"CvHistogram_thresh_get(CvHistogram self) -> float"},
+        { (char *)"CvHistogram_thresh2_set", _wrap_CvHistogram_thresh2_set, METH_VARARGS, (char *)"CvHistogram_thresh2_set(CvHistogram self, float thresh2)"},
+        { (char *)"CvHistogram_thresh2_get", _wrap_CvHistogram_thresh2_get, METH_VARARGS, (char *)"CvHistogram_thresh2_get(CvHistogram self) -> float"},
+        { (char *)"CvHistogram_mat_set", _wrap_CvHistogram_mat_set, METH_VARARGS, (char *)"CvHistogram_mat_set(CvHistogram self, CvMatND mat)"},
+        { (char *)"CvHistogram_mat_get", _wrap_CvHistogram_mat_get, METH_VARARGS, (char *)"CvHistogram_mat_get(CvHistogram self) -> CvMatND"},
+        { (char *)"delete_CvHistogram", _wrap_delete_CvHistogram, METH_VARARGS, (char *)"delete_CvHistogram(CvHistogram self)"},
         { (char *)"CvHistogram_swigregister", CvHistogram_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvRect_x_set", _wrap_CvRect_x_set, METH_VARARGS, NULL},
-        { (char *)"CvRect_x_get", _wrap_CvRect_x_get, METH_VARARGS, NULL},
-        { (char *)"CvRect_y_set", _wrap_CvRect_y_set, METH_VARARGS, NULL},
-        { (char *)"CvRect_y_get", _wrap_CvRect_y_get, METH_VARARGS, NULL},
-        { (char *)"CvRect_width_set", _wrap_CvRect_width_set, METH_VARARGS, NULL},
-        { (char *)"CvRect_width_get", _wrap_CvRect_width_get, METH_VARARGS, NULL},
-        { (char *)"CvRect_height_set", _wrap_CvRect_height_set, METH_VARARGS, NULL},
-        { (char *)"CvRect_height_get", _wrap_CvRect_height_get, METH_VARARGS, NULL},
-        { (char *)"new_CvRect", _wrap_new_CvRect, METH_VARARGS, NULL},
-        { (char *)"delete_CvRect", _wrap_delete_CvRect, METH_VARARGS, NULL},
+        { (char *)"CvRect_x_set", _wrap_CvRect_x_set, METH_VARARGS, (char *)"CvRect_x_set(CvRect self, int x)"},
+        { (char *)"CvRect_x_get", _wrap_CvRect_x_get, METH_VARARGS, (char *)"CvRect_x_get(CvRect self) -> int"},
+        { (char *)"CvRect_y_set", _wrap_CvRect_y_set, METH_VARARGS, (char *)"CvRect_y_set(CvRect self, int y)"},
+        { (char *)"CvRect_y_get", _wrap_CvRect_y_get, METH_VARARGS, (char *)"CvRect_y_get(CvRect self) -> int"},
+        { (char *)"CvRect_width_set", _wrap_CvRect_width_set, METH_VARARGS, (char *)"CvRect_width_set(CvRect self, int width)"},
+        { (char *)"CvRect_width_get", _wrap_CvRect_width_get, METH_VARARGS, (char *)"CvRect_width_get(CvRect self) -> int"},
+        { (char *)"CvRect_height_set", _wrap_CvRect_height_set, METH_VARARGS, (char *)"CvRect_height_set(CvRect self, int height)"},
+        { (char *)"CvRect_height_get", _wrap_CvRect_height_get, METH_VARARGS, (char *)"CvRect_height_get(CvRect self) -> int"},
+        { (char *)"new_CvRect", _wrap_new_CvRect, METH_VARARGS, (char *)"new_CvRect() -> CvRect"},
+        { (char *)"delete_CvRect", _wrap_delete_CvRect, METH_VARARGS, (char *)"delete_CvRect(CvRect self)"},
         { (char *)"CvRect_swigregister", CvRect_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvRect", _wrap_cvRect, METH_VARARGS, NULL},
-        { (char *)"cvRectToROI", _wrap_cvRectToROI, METH_VARARGS, NULL},
-        { (char *)"cvROIToRect", _wrap_cvROIToRect, METH_VARARGS, NULL},
-        { (char *)"CvTermCriteria_type_set", _wrap_CvTermCriteria_type_set, METH_VARARGS, NULL},
-        { (char *)"CvTermCriteria_type_get", _wrap_CvTermCriteria_type_get, METH_VARARGS, NULL},
-        { (char *)"CvTermCriteria_max_iter_set", _wrap_CvTermCriteria_max_iter_set, METH_VARARGS, NULL},
-        { (char *)"CvTermCriteria_max_iter_get", _wrap_CvTermCriteria_max_iter_get, METH_VARARGS, NULL},
-        { (char *)"CvTermCriteria_epsilon_set", _wrap_CvTermCriteria_epsilon_set, METH_VARARGS, NULL},
-        { (char *)"CvTermCriteria_epsilon_get", _wrap_CvTermCriteria_epsilon_get, METH_VARARGS, NULL},
-        { (char *)"new_CvTermCriteria", _wrap_new_CvTermCriteria, METH_VARARGS, NULL},
-        { (char *)"delete_CvTermCriteria", _wrap_delete_CvTermCriteria, METH_VARARGS, NULL},
+        { (char *)"cvRect", _wrap_cvRect, METH_VARARGS, (char *)"cvRect(int x, int y, int width, int height) -> CvRect"},
+        { (char *)"cvRectToROI", _wrap_cvRectToROI, METH_VARARGS, (char *)"cvRectToROI(CvRect rect, int coi)"},
+        { (char *)"cvROIToRect", _wrap_cvROIToRect, METH_VARARGS, (char *)"cvROIToRect( roi) -> CvRect"},
+        { (char *)"CvTermCriteria_type_set", _wrap_CvTermCriteria_type_set, METH_VARARGS, (char *)"CvTermCriteria_type_set(CvTermCriteria self, int type)"},
+        { (char *)"CvTermCriteria_type_get", _wrap_CvTermCriteria_type_get, METH_VARARGS, (char *)"CvTermCriteria_type_get(CvTermCriteria self) -> int"},
+        { (char *)"CvTermCriteria_max_iter_set", _wrap_CvTermCriteria_max_iter_set, METH_VARARGS, (char *)"CvTermCriteria_max_iter_set(CvTermCriteria self, int max_iter)"},
+        { (char *)"CvTermCriteria_max_iter_get", _wrap_CvTermCriteria_max_iter_get, METH_VARARGS, (char *)"CvTermCriteria_max_iter_get(CvTermCriteria self) -> int"},
+        { (char *)"CvTermCriteria_epsilon_set", _wrap_CvTermCriteria_epsilon_set, METH_VARARGS, (char *)"CvTermCriteria_epsilon_set(CvTermCriteria self, double epsilon)"},
+        { (char *)"CvTermCriteria_epsilon_get", _wrap_CvTermCriteria_epsilon_get, METH_VARARGS, (char *)"CvTermCriteria_epsilon_get(CvTermCriteria self) -> double"},
+        { (char *)"new_CvTermCriteria", _wrap_new_CvTermCriteria, METH_VARARGS, (char *)"new_CvTermCriteria() -> CvTermCriteria"},
+        { (char *)"delete_CvTermCriteria", _wrap_delete_CvTermCriteria, METH_VARARGS, (char *)"delete_CvTermCriteria(CvTermCriteria self)"},
         { (char *)"CvTermCriteria_swigregister", CvTermCriteria_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvTermCriteria", _wrap_cvTermCriteria, METH_VARARGS, NULL},
-        { (char *)"CvPoint_x_set", _wrap_CvPoint_x_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint_x_get", _wrap_CvPoint_x_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint_y_set", _wrap_CvPoint_y_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint_y_get", _wrap_CvPoint_y_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint___str__", _wrap_CvPoint___str__, METH_VARARGS, NULL},
-        { (char *)"CvPoint___repr__", _wrap_CvPoint___repr__, METH_VARARGS, NULL},
-        { (char *)"new_CvPoint", _wrap_new_CvPoint, METH_VARARGS, NULL},
-        { (char *)"delete_CvPoint", _wrap_delete_CvPoint, METH_VARARGS, NULL},
+        { (char *)"cvTermCriteria", _wrap_cvTermCriteria, METH_VARARGS, (char *)"cvTermCriteria(int type, int max_iter, double epsilon) -> CvTermCriteria"},
+        { (char *)"CvPoint_x_set", _wrap_CvPoint_x_set, METH_VARARGS, (char *)"CvPoint_x_set(CvPoint self, int x)"},
+        { (char *)"CvPoint_x_get", _wrap_CvPoint_x_get, METH_VARARGS, (char *)"CvPoint_x_get(CvPoint self) -> int"},
+        { (char *)"CvPoint_y_set", _wrap_CvPoint_y_set, METH_VARARGS, (char *)"CvPoint_y_set(CvPoint self, int y)"},
+        { (char *)"CvPoint_y_get", _wrap_CvPoint_y_get, METH_VARARGS, (char *)"CvPoint_y_get(CvPoint self) -> int"},
+        { (char *)"CvPoint___str__", _wrap_CvPoint___str__, METH_VARARGS, (char *)"CvPoint___str__(CvPoint self) -> char"},
+        { (char *)"CvPoint___repr__", _wrap_CvPoint___repr__, METH_VARARGS, (char *)"CvPoint___repr__(CvPoint self) -> char"},
+        { (char *)"new_CvPoint", _wrap_new_CvPoint, METH_VARARGS, (char *)"new_CvPoint() -> CvPoint"},
+        { (char *)"delete_CvPoint", _wrap_delete_CvPoint, METH_VARARGS, (char *)"delete_CvPoint(CvPoint self)"},
         { (char *)"CvPoint_swigregister", CvPoint_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvPoint", _wrap_cvPoint, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D32f_x_set", _wrap_CvPoint2D32f_x_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D32f_x_get", _wrap_CvPoint2D32f_x_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D32f_y_set", _wrap_CvPoint2D32f_y_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D32f_y_get", _wrap_CvPoint2D32f_y_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D32f___str__", _wrap_CvPoint2D32f___str__, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D32f___repr__", _wrap_CvPoint2D32f___repr__, METH_VARARGS, NULL},
-        { (char *)"new_CvPoint2D32f", _wrap_new_CvPoint2D32f, METH_VARARGS, NULL},
-        { (char *)"delete_CvPoint2D32f", _wrap_delete_CvPoint2D32f, METH_VARARGS, NULL},
+        { (char *)"cvPoint", _wrap_cvPoint, METH_VARARGS, (char *)"cvPoint(int x, int y) -> CvPoint"},
+        { (char *)"CvPoint2D32f_x_set", _wrap_CvPoint2D32f_x_set, METH_VARARGS, (char *)"CvPoint2D32f_x_set(CvPoint2D32f self, float x)"},
+        { (char *)"CvPoint2D32f_x_get", _wrap_CvPoint2D32f_x_get, METH_VARARGS, (char *)"CvPoint2D32f_x_get(CvPoint2D32f self) -> float"},
+        { (char *)"CvPoint2D32f_y_set", _wrap_CvPoint2D32f_y_set, METH_VARARGS, (char *)"CvPoint2D32f_y_set(CvPoint2D32f self, float y)"},
+        { (char *)"CvPoint2D32f_y_get", _wrap_CvPoint2D32f_y_get, METH_VARARGS, (char *)"CvPoint2D32f_y_get(CvPoint2D32f self) -> float"},
+        { (char *)"CvPoint2D32f___str__", _wrap_CvPoint2D32f___str__, METH_VARARGS, (char *)"CvPoint2D32f___str__(CvPoint2D32f self) -> char"},
+        { (char *)"CvPoint2D32f___repr__", _wrap_CvPoint2D32f___repr__, METH_VARARGS, (char *)"CvPoint2D32f___repr__(CvPoint2D32f self) -> char"},
+        { (char *)"new_CvPoint2D32f", _wrap_new_CvPoint2D32f, METH_VARARGS, (char *)"new_CvPoint2D32f() -> CvPoint2D32f"},
+        { (char *)"delete_CvPoint2D32f", _wrap_delete_CvPoint2D32f, METH_VARARGS, (char *)"delete_CvPoint2D32f(CvPoint2D32f self)"},
         { (char *)"CvPoint2D32f_swigregister", CvPoint2D32f_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvPoint2D32f", _wrap_cvPoint2D32f, METH_VARARGS, NULL},
-        { (char *)"cvPointTo32f", _wrap_cvPointTo32f, METH_VARARGS, NULL},
-        { (char *)"cvPointFrom32f", _wrap_cvPointFrom32f, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D32f_x_set", _wrap_CvPoint3D32f_x_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D32f_x_get", _wrap_CvPoint3D32f_x_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D32f_y_set", _wrap_CvPoint3D32f_y_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D32f_y_get", _wrap_CvPoint3D32f_y_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D32f_z_set", _wrap_CvPoint3D32f_z_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D32f_z_get", _wrap_CvPoint3D32f_z_get, METH_VARARGS, NULL},
-        { (char *)"new_CvPoint3D32f", _wrap_new_CvPoint3D32f, METH_VARARGS, NULL},
-        { (char *)"delete_CvPoint3D32f", _wrap_delete_CvPoint3D32f, METH_VARARGS, NULL},
+        { (char *)"cvPoint2D32f", _wrap_cvPoint2D32f, METH_VARARGS, (char *)"cvPoint2D32f(double x, double y) -> CvPoint2D32f"},
+        { (char *)"cvPointTo32f", _wrap_cvPointTo32f, METH_VARARGS, (char *)"cvPointTo32f(CvPoint point) -> CvPoint2D32f"},
+        { (char *)"cvPointFrom32f", _wrap_cvPointFrom32f, METH_VARARGS, (char *)"cvPointFrom32f(CvPoint2D32f point) -> CvPoint"},
+        { (char *)"CvPoint3D32f_x_set", _wrap_CvPoint3D32f_x_set, METH_VARARGS, (char *)"CvPoint3D32f_x_set(CvPoint3D32f self, float x)"},
+        { (char *)"CvPoint3D32f_x_get", _wrap_CvPoint3D32f_x_get, METH_VARARGS, (char *)"CvPoint3D32f_x_get(CvPoint3D32f self) -> float"},
+        { (char *)"CvPoint3D32f_y_set", _wrap_CvPoint3D32f_y_set, METH_VARARGS, (char *)"CvPoint3D32f_y_set(CvPoint3D32f self, float y)"},
+        { (char *)"CvPoint3D32f_y_get", _wrap_CvPoint3D32f_y_get, METH_VARARGS, (char *)"CvPoint3D32f_y_get(CvPoint3D32f self) -> float"},
+        { (char *)"CvPoint3D32f_z_set", _wrap_CvPoint3D32f_z_set, METH_VARARGS, (char *)"CvPoint3D32f_z_set(CvPoint3D32f self, float z)"},
+        { (char *)"CvPoint3D32f_z_get", _wrap_CvPoint3D32f_z_get, METH_VARARGS, (char *)"CvPoint3D32f_z_get(CvPoint3D32f self) -> float"},
+        { (char *)"new_CvPoint3D32f", _wrap_new_CvPoint3D32f, METH_VARARGS, (char *)"new_CvPoint3D32f() -> CvPoint3D32f"},
+        { (char *)"delete_CvPoint3D32f", _wrap_delete_CvPoint3D32f, METH_VARARGS, (char *)"delete_CvPoint3D32f(CvPoint3D32f self)"},
         { (char *)"CvPoint3D32f_swigregister", CvPoint3D32f_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvPoint3D32f", _wrap_cvPoint3D32f, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D64f_x_set", _wrap_CvPoint2D64f_x_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D64f_x_get", _wrap_CvPoint2D64f_x_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D64f_y_set", _wrap_CvPoint2D64f_y_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint2D64f_y_get", _wrap_CvPoint2D64f_y_get, METH_VARARGS, NULL},
-        { (char *)"new_CvPoint2D64f", _wrap_new_CvPoint2D64f, METH_VARARGS, NULL},
-        { (char *)"delete_CvPoint2D64f", _wrap_delete_CvPoint2D64f, METH_VARARGS, NULL},
+        { (char *)"cvPoint3D32f", _wrap_cvPoint3D32f, METH_VARARGS, (char *)"cvPoint3D32f(double x, double y, double z) -> CvPoint3D32f"},
+        { (char *)"CvPoint2D64f_x_set", _wrap_CvPoint2D64f_x_set, METH_VARARGS, (char *)"CvPoint2D64f_x_set(CvPoint2D64f self, double x)"},
+        { (char *)"CvPoint2D64f_x_get", _wrap_CvPoint2D64f_x_get, METH_VARARGS, (char *)"CvPoint2D64f_x_get(CvPoint2D64f self) -> double"},
+        { (char *)"CvPoint2D64f_y_set", _wrap_CvPoint2D64f_y_set, METH_VARARGS, (char *)"CvPoint2D64f_y_set(CvPoint2D64f self, double y)"},
+        { (char *)"CvPoint2D64f_y_get", _wrap_CvPoint2D64f_y_get, METH_VARARGS, (char *)"CvPoint2D64f_y_get(CvPoint2D64f self) -> double"},
+        { (char *)"new_CvPoint2D64f", _wrap_new_CvPoint2D64f, METH_VARARGS, (char *)"new_CvPoint2D64f() -> CvPoint2D64f"},
+        { (char *)"delete_CvPoint2D64f", _wrap_delete_CvPoint2D64f, METH_VARARGS, (char *)"delete_CvPoint2D64f(CvPoint2D64f self)"},
         { (char *)"CvPoint2D64f_swigregister", CvPoint2D64f_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvPoint2D64f", _wrap_cvPoint2D64f, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D64f_x_set", _wrap_CvPoint3D64f_x_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D64f_x_get", _wrap_CvPoint3D64f_x_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D64f_y_set", _wrap_CvPoint3D64f_y_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D64f_y_get", _wrap_CvPoint3D64f_y_get, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D64f_z_set", _wrap_CvPoint3D64f_z_set, METH_VARARGS, NULL},
-        { (char *)"CvPoint3D64f_z_get", _wrap_CvPoint3D64f_z_get, METH_VARARGS, NULL},
-        { (char *)"new_CvPoint3D64f", _wrap_new_CvPoint3D64f, METH_VARARGS, NULL},
-        { (char *)"delete_CvPoint3D64f", _wrap_delete_CvPoint3D64f, METH_VARARGS, NULL},
+        { (char *)"cvPoint2D64f", _wrap_cvPoint2D64f, METH_VARARGS, (char *)"cvPoint2D64f(double x, double y) -> CvPoint2D64f"},
+        { (char *)"CvPoint3D64f_x_set", _wrap_CvPoint3D64f_x_set, METH_VARARGS, (char *)"CvPoint3D64f_x_set(CvPoint3D64f self, double x)"},
+        { (char *)"CvPoint3D64f_x_get", _wrap_CvPoint3D64f_x_get, METH_VARARGS, (char *)"CvPoint3D64f_x_get(CvPoint3D64f self) -> double"},
+        { (char *)"CvPoint3D64f_y_set", _wrap_CvPoint3D64f_y_set, METH_VARARGS, (char *)"CvPoint3D64f_y_set(CvPoint3D64f self, double y)"},
+        { (char *)"CvPoint3D64f_y_get", _wrap_CvPoint3D64f_y_get, METH_VARARGS, (char *)"CvPoint3D64f_y_get(CvPoint3D64f self) -> double"},
+        { (char *)"CvPoint3D64f_z_set", _wrap_CvPoint3D64f_z_set, METH_VARARGS, (char *)"CvPoint3D64f_z_set(CvPoint3D64f self, double z)"},
+        { (char *)"CvPoint3D64f_z_get", _wrap_CvPoint3D64f_z_get, METH_VARARGS, (char *)"CvPoint3D64f_z_get(CvPoint3D64f self) -> double"},
+        { (char *)"new_CvPoint3D64f", _wrap_new_CvPoint3D64f, METH_VARARGS, (char *)"new_CvPoint3D64f() -> CvPoint3D64f"},
+        { (char *)"delete_CvPoint3D64f", _wrap_delete_CvPoint3D64f, METH_VARARGS, (char *)"delete_CvPoint3D64f(CvPoint3D64f self)"},
         { (char *)"CvPoint3D64f_swigregister", CvPoint3D64f_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvPoint3D64f", _wrap_cvPoint3D64f, METH_VARARGS, NULL},
-        { (char *)"CvSize_width_set", _wrap_CvSize_width_set, METH_VARARGS, NULL},
-        { (char *)"CvSize_width_get", _wrap_CvSize_width_get, METH_VARARGS, NULL},
-        { (char *)"CvSize_height_set", _wrap_CvSize_height_set, METH_VARARGS, NULL},
-        { (char *)"CvSize_height_get", _wrap_CvSize_height_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSize", _wrap_new_CvSize, METH_VARARGS, NULL},
-        { (char *)"delete_CvSize", _wrap_delete_CvSize, METH_VARARGS, NULL},
+        { (char *)"cvPoint3D64f", _wrap_cvPoint3D64f, METH_VARARGS, (char *)"cvPoint3D64f(double x, double y, double z) -> CvPoint3D64f"},
+        { (char *)"CvSize_width_set", _wrap_CvSize_width_set, METH_VARARGS, (char *)"CvSize_width_set(CvSize self, int width)"},
+        { (char *)"CvSize_width_get", _wrap_CvSize_width_get, METH_VARARGS, (char *)"CvSize_width_get(CvSize self) -> int"},
+        { (char *)"CvSize_height_set", _wrap_CvSize_height_set, METH_VARARGS, (char *)"CvSize_height_set(CvSize self, int height)"},
+        { (char *)"CvSize_height_get", _wrap_CvSize_height_get, METH_VARARGS, (char *)"CvSize_height_get(CvSize self) -> int"},
+        { (char *)"new_CvSize", _wrap_new_CvSize, METH_VARARGS, (char *)"new_CvSize() -> CvSize"},
+        { (char *)"delete_CvSize", _wrap_delete_CvSize, METH_VARARGS, (char *)"delete_CvSize(CvSize self)"},
         { (char *)"CvSize_swigregister", CvSize_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvSize", _wrap_cvSize, METH_VARARGS, NULL},
-        { (char *)"CvSize2D32f_width_set", _wrap_CvSize2D32f_width_set, METH_VARARGS, NULL},
-        { (char *)"CvSize2D32f_width_get", _wrap_CvSize2D32f_width_get, METH_VARARGS, NULL},
-        { (char *)"CvSize2D32f_height_set", _wrap_CvSize2D32f_height_set, METH_VARARGS, NULL},
-        { (char *)"CvSize2D32f_height_get", _wrap_CvSize2D32f_height_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSize2D32f", _wrap_new_CvSize2D32f, METH_VARARGS, NULL},
-        { (char *)"delete_CvSize2D32f", _wrap_delete_CvSize2D32f, METH_VARARGS, NULL},
+        { (char *)"cvSize", _wrap_cvSize, METH_VARARGS, (char *)"cvSize(int width, int height) -> CvSize"},
+        { (char *)"CvSize2D32f_width_set", _wrap_CvSize2D32f_width_set, METH_VARARGS, (char *)"CvSize2D32f_width_set(CvSize2D32f self, float width)"},
+        { (char *)"CvSize2D32f_width_get", _wrap_CvSize2D32f_width_get, METH_VARARGS, (char *)"CvSize2D32f_width_get(CvSize2D32f self) -> float"},
+        { (char *)"CvSize2D32f_height_set", _wrap_CvSize2D32f_height_set, METH_VARARGS, (char *)"CvSize2D32f_height_set(CvSize2D32f self, float height)"},
+        { (char *)"CvSize2D32f_height_get", _wrap_CvSize2D32f_height_get, METH_VARARGS, (char *)"CvSize2D32f_height_get(CvSize2D32f self) -> float"},
+        { (char *)"new_CvSize2D32f", _wrap_new_CvSize2D32f, METH_VARARGS, (char *)"new_CvSize2D32f() -> CvSize2D32f"},
+        { (char *)"delete_CvSize2D32f", _wrap_delete_CvSize2D32f, METH_VARARGS, (char *)"delete_CvSize2D32f(CvSize2D32f self)"},
         { (char *)"CvSize2D32f_swigregister", CvSize2D32f_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvSize2D32f", _wrap_cvSize2D32f, METH_VARARGS, NULL},
-        { (char *)"CvBox2D_center_set", _wrap_CvBox2D_center_set, METH_VARARGS, NULL},
-        { (char *)"CvBox2D_center_get", _wrap_CvBox2D_center_get, METH_VARARGS, NULL},
-        { (char *)"CvBox2D_size_set", _wrap_CvBox2D_size_set, METH_VARARGS, NULL},
-        { (char *)"CvBox2D_size_get", _wrap_CvBox2D_size_get, METH_VARARGS, NULL},
-        { (char *)"CvBox2D_angle_set", _wrap_CvBox2D_angle_set, METH_VARARGS, NULL},
-        { (char *)"CvBox2D_angle_get", _wrap_CvBox2D_angle_get, METH_VARARGS, NULL},
-        { (char *)"new_CvBox2D", _wrap_new_CvBox2D, METH_VARARGS, NULL},
-        { (char *)"delete_CvBox2D", _wrap_delete_CvBox2D, METH_VARARGS, NULL},
+        { (char *)"cvSize2D32f", _wrap_cvSize2D32f, METH_VARARGS, (char *)"cvSize2D32f(double width, double height) -> CvSize2D32f"},
+        { (char *)"CvBox2D_center_set", _wrap_CvBox2D_center_set, METH_VARARGS, (char *)"CvBox2D_center_set(CvBox2D self, CvPoint2D32f center)"},
+        { (char *)"CvBox2D_center_get", _wrap_CvBox2D_center_get, METH_VARARGS, (char *)"CvBox2D_center_get(CvBox2D self) -> CvPoint2D32f"},
+        { (char *)"CvBox2D_size_set", _wrap_CvBox2D_size_set, METH_VARARGS, (char *)"CvBox2D_size_set(CvBox2D self, CvSize2D32f size)"},
+        { (char *)"CvBox2D_size_get", _wrap_CvBox2D_size_get, METH_VARARGS, (char *)"CvBox2D_size_get(CvBox2D self) -> CvSize2D32f"},
+        { (char *)"CvBox2D_angle_set", _wrap_CvBox2D_angle_set, METH_VARARGS, (char *)"CvBox2D_angle_set(CvBox2D self, float angle)"},
+        { (char *)"CvBox2D_angle_get", _wrap_CvBox2D_angle_get, METH_VARARGS, (char *)"CvBox2D_angle_get(CvBox2D self) -> float"},
+        { (char *)"new_CvBox2D", _wrap_new_CvBox2D, METH_VARARGS, (char *)"new_CvBox2D() -> CvBox2D"},
+        { (char *)"delete_CvBox2D", _wrap_delete_CvBox2D, METH_VARARGS, (char *)"delete_CvBox2D(CvBox2D self)"},
         { (char *)"CvBox2D_swigregister", CvBox2D_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_ptr_set", _wrap_CvLineIterator_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_ptr_get", _wrap_CvLineIterator_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_err_set", _wrap_CvLineIterator_err_set, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_err_get", _wrap_CvLineIterator_err_get, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_plus_delta_set", _wrap_CvLineIterator_plus_delta_set, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_plus_delta_get", _wrap_CvLineIterator_plus_delta_get, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_minus_delta_set", _wrap_CvLineIterator_minus_delta_set, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_minus_delta_get", _wrap_CvLineIterator_minus_delta_get, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_plus_step_set", _wrap_CvLineIterator_plus_step_set, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_plus_step_get", _wrap_CvLineIterator_plus_step_get, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_minus_step_set", _wrap_CvLineIterator_minus_step_set, METH_VARARGS, NULL},
-        { (char *)"CvLineIterator_minus_step_get", _wrap_CvLineIterator_minus_step_get, METH_VARARGS, NULL},
-        { (char *)"new_CvLineIterator", _wrap_new_CvLineIterator, METH_VARARGS, NULL},
-        { (char *)"delete_CvLineIterator", _wrap_delete_CvLineIterator, METH_VARARGS, NULL},
+        { (char *)"CvLineIterator_ptr_set", _wrap_CvLineIterator_ptr_set, METH_VARARGS, (char *)"CvLineIterator_ptr_set(CvLineIterator self, uchar ptr)"},
+        { (char *)"CvLineIterator_ptr_get", _wrap_CvLineIterator_ptr_get, METH_VARARGS, (char *)"CvLineIterator_ptr_get(CvLineIterator self) -> uchar"},
+        { (char *)"CvLineIterator_err_set", _wrap_CvLineIterator_err_set, METH_VARARGS, (char *)"CvLineIterator_err_set(CvLineIterator self, int err)"},
+        { (char *)"CvLineIterator_err_get", _wrap_CvLineIterator_err_get, METH_VARARGS, (char *)"CvLineIterator_err_get(CvLineIterator self) -> int"},
+        { (char *)"CvLineIterator_plus_delta_set", _wrap_CvLineIterator_plus_delta_set, METH_VARARGS, (char *)"CvLineIterator_plus_delta_set(CvLineIterator self, int plus_delta)"},
+        { (char *)"CvLineIterator_plus_delta_get", _wrap_CvLineIterator_plus_delta_get, METH_VARARGS, (char *)"CvLineIterator_plus_delta_get(CvLineIterator self) -> int"},
+        { (char *)"CvLineIterator_minus_delta_set", _wrap_CvLineIterator_minus_delta_set, METH_VARARGS, (char *)"CvLineIterator_minus_delta_set(CvLineIterator self, int minus_delta)"},
+        { (char *)"CvLineIterator_minus_delta_get", _wrap_CvLineIterator_minus_delta_get, METH_VARARGS, (char *)"CvLineIterator_minus_delta_get(CvLineIterator self) -> int"},
+        { (char *)"CvLineIterator_plus_step_set", _wrap_CvLineIterator_plus_step_set, METH_VARARGS, (char *)"CvLineIterator_plus_step_set(CvLineIterator self, int plus_step)"},
+        { (char *)"CvLineIterator_plus_step_get", _wrap_CvLineIterator_plus_step_get, METH_VARARGS, (char *)"CvLineIterator_plus_step_get(CvLineIterator self) -> int"},
+        { (char *)"CvLineIterator_minus_step_set", _wrap_CvLineIterator_minus_step_set, METH_VARARGS, (char *)"CvLineIterator_minus_step_set(CvLineIterator self, int minus_step)"},
+        { (char *)"CvLineIterator_minus_step_get", _wrap_CvLineIterator_minus_step_get, METH_VARARGS, (char *)"CvLineIterator_minus_step_get(CvLineIterator self) -> int"},
+        { (char *)"new_CvLineIterator", _wrap_new_CvLineIterator, METH_VARARGS, (char *)"new_CvLineIterator() -> CvLineIterator"},
+        { (char *)"delete_CvLineIterator", _wrap_delete_CvLineIterator, METH_VARARGS, (char *)"delete_CvLineIterator(CvLineIterator self)"},
         { (char *)"CvLineIterator_swigregister", CvLineIterator_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSlice_start_index_set", _wrap_CvSlice_start_index_set, METH_VARARGS, NULL},
-        { (char *)"CvSlice_start_index_get", _wrap_CvSlice_start_index_get, METH_VARARGS, NULL},
-        { (char *)"CvSlice_end_index_set", _wrap_CvSlice_end_index_set, METH_VARARGS, NULL},
-        { (char *)"CvSlice_end_index_get", _wrap_CvSlice_end_index_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSlice", _wrap_new_CvSlice, METH_VARARGS, NULL},
-        { (char *)"delete_CvSlice", _wrap_delete_CvSlice, METH_VARARGS, NULL},
+        { (char *)"CvSlice_start_index_set", _wrap_CvSlice_start_index_set, METH_VARARGS, (char *)"CvSlice_start_index_set(CvSlice self, int start_index)"},
+        { (char *)"CvSlice_start_index_get", _wrap_CvSlice_start_index_get, METH_VARARGS, (char *)"CvSlice_start_index_get(CvSlice self) -> int"},
+        { (char *)"CvSlice_end_index_set", _wrap_CvSlice_end_index_set, METH_VARARGS, (char *)"CvSlice_end_index_set(CvSlice self, int end_index)"},
+        { (char *)"CvSlice_end_index_get", _wrap_CvSlice_end_index_get, METH_VARARGS, (char *)"CvSlice_end_index_get(CvSlice self) -> int"},
+        { (char *)"new_CvSlice", _wrap_new_CvSlice, METH_VARARGS, (char *)"new_CvSlice() -> CvSlice"},
+        { (char *)"delete_CvSlice", _wrap_delete_CvSlice, METH_VARARGS, (char *)"delete_CvSlice(CvSlice self)"},
         { (char *)"CvSlice_swigregister", CvSlice_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvSlice", _wrap_cvSlice, METH_VARARGS, NULL},
-        { (char *)"CvScalar_val_set", _wrap_CvScalar_val_set, METH_VARARGS, NULL},
-        { (char *)"CvScalar_val_get", _wrap_CvScalar_val_get, METH_VARARGS, NULL},
-        { (char *)"CvScalar___str__", _wrap_CvScalar___str__, METH_VARARGS, NULL},
-        { (char *)"CvScalar___repr__", _wrap_CvScalar___repr__, METH_VARARGS, NULL},
-        { (char *)"CvScalar___getitem__", _wrap_CvScalar___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvScalar___setitem__", _wrap_CvScalar___setitem__, METH_VARARGS, NULL},
-        { (char *)"new_CvScalar", _wrap_new_CvScalar, METH_VARARGS, NULL},
-        { (char *)"delete_CvScalar", _wrap_delete_CvScalar, METH_VARARGS, NULL},
+        { (char *)"cvSlice", _wrap_cvSlice, METH_VARARGS, (char *)"cvSlice(int start, int end) -> CvSlice"},
+        { (char *)"CvScalar_val_set", _wrap_CvScalar_val_set, METH_VARARGS, (char *)"CvScalar_val_set(CvScalar self, double val)"},
+        { (char *)"CvScalar_val_get", _wrap_CvScalar_val_get, METH_VARARGS, (char *)"CvScalar_val_get(CvScalar self) -> double"},
+        { (char *)"CvScalar___str__", _wrap_CvScalar___str__, METH_VARARGS, (char *)"CvScalar___str__(CvScalar self) -> char"},
+        { (char *)"CvScalar___repr__", _wrap_CvScalar___repr__, METH_VARARGS, (char *)"CvScalar___repr__(CvScalar self) -> char"},
+        { (char *)"CvScalar___getitem__", _wrap_CvScalar___getitem__, METH_VARARGS, (char *)"CvScalar___getitem__(CvScalar self, int index) -> double"},
+        { (char *)"CvScalar___setitem__", _wrap_CvScalar___setitem__, METH_VARARGS, (char *)"CvScalar___setitem__(CvScalar self, int index, double value)"},
+        { (char *)"new_CvScalar", _wrap_new_CvScalar, METH_VARARGS, (char *)"new_CvScalar() -> CvScalar"},
+        { (char *)"delete_CvScalar", _wrap_delete_CvScalar, METH_VARARGS, (char *)"delete_CvScalar(CvScalar self)"},
         { (char *)"CvScalar_swigregister", CvScalar_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvScalar", _wrap_cvScalar, METH_VARARGS, NULL},
-        { (char *)"cvRealScalar", _wrap_cvRealScalar, METH_VARARGS, NULL},
-        { (char *)"cvScalarAll", _wrap_cvScalarAll, METH_VARARGS, NULL},
-        { (char *)"CvMemBlock_prev_set", _wrap_CvMemBlock_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvMemBlock_prev_get", _wrap_CvMemBlock_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvMemBlock_next_set", _wrap_CvMemBlock_next_set, METH_VARARGS, NULL},
-        { (char *)"CvMemBlock_next_get", _wrap_CvMemBlock_next_get, METH_VARARGS, NULL},
-        { (char *)"new_CvMemBlock", _wrap_new_CvMemBlock, METH_VARARGS, NULL},
-        { (char *)"delete_CvMemBlock", _wrap_delete_CvMemBlock, METH_VARARGS, NULL},
+        { (char *)"cvScalar", _wrap_cvScalar, METH_VARARGS, (char *)"\n"
+               "cvScalar(double val0, double val1 = 0, double val2 = 0, double val3 = 0) -> CvScalar\n"
+               "cvScalar(double val0, double val1 = 0, double val2 = 0) -> CvScalar\n"
+               "cvScalar(double val0, double val1 = 0) -> CvScalar\n"
+               "cvScalar(double val0) -> CvScalar\n"
+               ""},
+        { (char *)"cvRealScalar", _wrap_cvRealScalar, METH_VARARGS, (char *)"cvRealScalar(double val0) -> CvScalar"},
+        { (char *)"cvScalarAll", _wrap_cvScalarAll, METH_VARARGS, (char *)"cvScalarAll(double val0123) -> CvScalar"},
+        { (char *)"CvMemBlock_prev_set", _wrap_CvMemBlock_prev_set, METH_VARARGS, (char *)"CvMemBlock_prev_set(CvMemBlock self, CvMemBlock prev)"},
+        { (char *)"CvMemBlock_prev_get", _wrap_CvMemBlock_prev_get, METH_VARARGS, (char *)"CvMemBlock_prev_get(CvMemBlock self) -> CvMemBlock"},
+        { (char *)"CvMemBlock_next_set", _wrap_CvMemBlock_next_set, METH_VARARGS, (char *)"CvMemBlock_next_set(CvMemBlock self, CvMemBlock next)"},
+        { (char *)"CvMemBlock_next_get", _wrap_CvMemBlock_next_get, METH_VARARGS, (char *)"CvMemBlock_next_get(CvMemBlock self) -> CvMemBlock"},
+        { (char *)"new_CvMemBlock", _wrap_new_CvMemBlock, METH_VARARGS, (char *)"new_CvMemBlock() -> CvMemBlock"},
+        { (char *)"delete_CvMemBlock", _wrap_delete_CvMemBlock, METH_VARARGS, (char *)"delete_CvMemBlock(CvMemBlock self)"},
         { (char *)"CvMemBlock_swigregister", CvMemBlock_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_signature_set", _wrap_CvMemStorage_signature_set, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_signature_get", _wrap_CvMemStorage_signature_get, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_bottom_set", _wrap_CvMemStorage_bottom_set, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_bottom_get", _wrap_CvMemStorage_bottom_get, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_top_set", _wrap_CvMemStorage_top_set, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_top_get", _wrap_CvMemStorage_top_get, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_parent_set", _wrap_CvMemStorage_parent_set, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_parent_get", _wrap_CvMemStorage_parent_get, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_block_size_set", _wrap_CvMemStorage_block_size_set, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_block_size_get", _wrap_CvMemStorage_block_size_get, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_free_space_set", _wrap_CvMemStorage_free_space_set, METH_VARARGS, NULL},
-        { (char *)"CvMemStorage_free_space_get", _wrap_CvMemStorage_free_space_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvMemStorage", _wrap_delete_CvMemStorage, METH_VARARGS, NULL},
+        { (char *)"CvMemStorage_signature_set", _wrap_CvMemStorage_signature_set, METH_VARARGS, (char *)"CvMemStorage_signature_set(CvMemStorage self, int signature)"},
+        { (char *)"CvMemStorage_signature_get", _wrap_CvMemStorage_signature_get, METH_VARARGS, (char *)"CvMemStorage_signature_get(CvMemStorage self) -> int"},
+        { (char *)"CvMemStorage_bottom_set", _wrap_CvMemStorage_bottom_set, METH_VARARGS, (char *)"CvMemStorage_bottom_set(CvMemStorage self, CvMemBlock bottom)"},
+        { (char *)"CvMemStorage_bottom_get", _wrap_CvMemStorage_bottom_get, METH_VARARGS, (char *)"CvMemStorage_bottom_get(CvMemStorage self) -> CvMemBlock"},
+        { (char *)"CvMemStorage_top_set", _wrap_CvMemStorage_top_set, METH_VARARGS, (char *)"CvMemStorage_top_set(CvMemStorage self, CvMemBlock top)"},
+        { (char *)"CvMemStorage_top_get", _wrap_CvMemStorage_top_get, METH_VARARGS, (char *)"CvMemStorage_top_get(CvMemStorage self) -> CvMemBlock"},
+        { (char *)"CvMemStorage_parent_set", _wrap_CvMemStorage_parent_set, METH_VARARGS, (char *)"CvMemStorage_parent_set(CvMemStorage self, CvMemStorage parent)"},
+        { (char *)"CvMemStorage_parent_get", _wrap_CvMemStorage_parent_get, METH_VARARGS, (char *)"CvMemStorage_parent_get(CvMemStorage self) -> CvMemStorage"},
+        { (char *)"CvMemStorage_block_size_set", _wrap_CvMemStorage_block_size_set, METH_VARARGS, (char *)"CvMemStorage_block_size_set(CvMemStorage self, int block_size)"},
+        { (char *)"CvMemStorage_block_size_get", _wrap_CvMemStorage_block_size_get, METH_VARARGS, (char *)"CvMemStorage_block_size_get(CvMemStorage self) -> int"},
+        { (char *)"CvMemStorage_free_space_set", _wrap_CvMemStorage_free_space_set, METH_VARARGS, (char *)"CvMemStorage_free_space_set(CvMemStorage self, int free_space)"},
+        { (char *)"CvMemStorage_free_space_get", _wrap_CvMemStorage_free_space_get, METH_VARARGS, (char *)"CvMemStorage_free_space_get(CvMemStorage self) -> int"},
+        { (char *)"delete_CvMemStorage", _wrap_delete_CvMemStorage, METH_VARARGS, (char *)"delete_CvMemStorage(CvMemStorage self)"},
         { (char *)"CvMemStorage_swigregister", CvMemStorage_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvMemStoragePos_top_set", _wrap_CvMemStoragePos_top_set, METH_VARARGS, NULL},
-        { (char *)"CvMemStoragePos_top_get", _wrap_CvMemStoragePos_top_get, METH_VARARGS, NULL},
-        { (char *)"CvMemStoragePos_free_space_set", _wrap_CvMemStoragePos_free_space_set, METH_VARARGS, NULL},
-        { (char *)"CvMemStoragePos_free_space_get", _wrap_CvMemStoragePos_free_space_get, METH_VARARGS, NULL},
-        { (char *)"new_CvMemStoragePos", _wrap_new_CvMemStoragePos, METH_VARARGS, NULL},
-        { (char *)"delete_CvMemStoragePos", _wrap_delete_CvMemStoragePos, METH_VARARGS, NULL},
+        { (char *)"CvMemStoragePos_top_set", _wrap_CvMemStoragePos_top_set, METH_VARARGS, (char *)"CvMemStoragePos_top_set(CvMemStoragePos self, CvMemBlock top)"},
+        { (char *)"CvMemStoragePos_top_get", _wrap_CvMemStoragePos_top_get, METH_VARARGS, (char *)"CvMemStoragePos_top_get(CvMemStoragePos self) -> CvMemBlock"},
+        { (char *)"CvMemStoragePos_free_space_set", _wrap_CvMemStoragePos_free_space_set, METH_VARARGS, (char *)"CvMemStoragePos_free_space_set(CvMemStoragePos self, int free_space)"},
+        { (char *)"CvMemStoragePos_free_space_get", _wrap_CvMemStoragePos_free_space_get, METH_VARARGS, (char *)"CvMemStoragePos_free_space_get(CvMemStoragePos self) -> int"},
+        { (char *)"new_CvMemStoragePos", _wrap_new_CvMemStoragePos, METH_VARARGS, (char *)"new_CvMemStoragePos() -> CvMemStoragePos"},
+        { (char *)"delete_CvMemStoragePos", _wrap_delete_CvMemStoragePos, METH_VARARGS, (char *)"delete_CvMemStoragePos(CvMemStoragePos self)"},
         { (char *)"CvMemStoragePos_swigregister", CvMemStoragePos_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_prev_set", _wrap_CvSeqBlock_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_prev_get", _wrap_CvSeqBlock_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_next_set", _wrap_CvSeqBlock_next_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_next_get", _wrap_CvSeqBlock_next_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_start_index_set", _wrap_CvSeqBlock_start_index_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_start_index_get", _wrap_CvSeqBlock_start_index_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_count_set", _wrap_CvSeqBlock_count_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_count_get", _wrap_CvSeqBlock_count_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_data_set", _wrap_CvSeqBlock_data_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqBlock_data_get", _wrap_CvSeqBlock_data_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSeqBlock", _wrap_new_CvSeqBlock, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeqBlock", _wrap_delete_CvSeqBlock, METH_VARARGS, NULL},
+        { (char *)"CvSeqBlock_prev_set", _wrap_CvSeqBlock_prev_set, METH_VARARGS, (char *)"CvSeqBlock_prev_set(CvSeqBlock self, CvSeqBlock prev)"},
+        { (char *)"CvSeqBlock_prev_get", _wrap_CvSeqBlock_prev_get, METH_VARARGS, (char *)"CvSeqBlock_prev_get(CvSeqBlock self) -> CvSeqBlock"},
+        { (char *)"CvSeqBlock_next_set", _wrap_CvSeqBlock_next_set, METH_VARARGS, (char *)"CvSeqBlock_next_set(CvSeqBlock self, CvSeqBlock next)"},
+        { (char *)"CvSeqBlock_next_get", _wrap_CvSeqBlock_next_get, METH_VARARGS, (char *)"CvSeqBlock_next_get(CvSeqBlock self) -> CvSeqBlock"},
+        { (char *)"CvSeqBlock_start_index_set", _wrap_CvSeqBlock_start_index_set, METH_VARARGS, (char *)"CvSeqBlock_start_index_set(CvSeqBlock self, int start_index)"},
+        { (char *)"CvSeqBlock_start_index_get", _wrap_CvSeqBlock_start_index_get, METH_VARARGS, (char *)"CvSeqBlock_start_index_get(CvSeqBlock self) -> int"},
+        { (char *)"CvSeqBlock_count_set", _wrap_CvSeqBlock_count_set, METH_VARARGS, (char *)"CvSeqBlock_count_set(CvSeqBlock self, int count)"},
+        { (char *)"CvSeqBlock_count_get", _wrap_CvSeqBlock_count_get, METH_VARARGS, (char *)"CvSeqBlock_count_get(CvSeqBlock self) -> int"},
+        { (char *)"CvSeqBlock_data_set", _wrap_CvSeqBlock_data_set, METH_VARARGS, (char *)"CvSeqBlock_data_set(CvSeqBlock self, schar data)"},
+        { (char *)"CvSeqBlock_data_get", _wrap_CvSeqBlock_data_get, METH_VARARGS, (char *)"CvSeqBlock_data_get(CvSeqBlock self) -> schar"},
+        { (char *)"new_CvSeqBlock", _wrap_new_CvSeqBlock, METH_VARARGS, (char *)"new_CvSeqBlock() -> CvSeqBlock"},
+        { (char *)"delete_CvSeqBlock", _wrap_delete_CvSeqBlock, METH_VARARGS, (char *)"delete_CvSeqBlock(CvSeqBlock self)"},
         { (char *)"CvSeqBlock_swigregister", CvSeqBlock_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_flags_set", _wrap_CvSeq_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_flags_get", _wrap_CvSeq_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_header_size_set", _wrap_CvSeq_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_header_size_get", _wrap_CvSeq_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_h_prev_set", _wrap_CvSeq_h_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_h_prev_get", _wrap_CvSeq_h_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_h_next_set", _wrap_CvSeq_h_next_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_h_next_get", _wrap_CvSeq_h_next_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_v_prev_set", _wrap_CvSeq_v_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_v_prev_get", _wrap_CvSeq_v_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_v_next_set", _wrap_CvSeq_v_next_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_v_next_get", _wrap_CvSeq_v_next_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_total_set", _wrap_CvSeq_total_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_total_get", _wrap_CvSeq_total_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_elem_size_set", _wrap_CvSeq_elem_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_elem_size_get", _wrap_CvSeq_elem_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_block_max_set", _wrap_CvSeq_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_block_max_get", _wrap_CvSeq_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_ptr_set", _wrap_CvSeq_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_ptr_get", _wrap_CvSeq_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_delta_elems_set", _wrap_CvSeq_delta_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_delta_elems_get", _wrap_CvSeq_delta_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_storage_set", _wrap_CvSeq_storage_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_storage_get", _wrap_CvSeq_storage_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_free_blocks_set", _wrap_CvSeq_free_blocks_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_free_blocks_get", _wrap_CvSeq_free_blocks_get, METH_VARARGS, NULL},
-        { (char *)"CvSeq_first_set", _wrap_CvSeq_first_set, METH_VARARGS, NULL},
-        { (char *)"CvSeq_first_get", _wrap_CvSeq_first_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq", _wrap_new_CvSeq, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq", _wrap_delete_CvSeq, METH_VARARGS, NULL},
+        { (char *)"CvSeq_flags_set", _wrap_CvSeq_flags_set, METH_VARARGS, (char *)"CvSeq_flags_set(CvSeq self, int flags)"},
+        { (char *)"CvSeq_flags_get", _wrap_CvSeq_flags_get, METH_VARARGS, (char *)"CvSeq_flags_get(CvSeq self) -> int"},
+        { (char *)"CvSeq_header_size_set", _wrap_CvSeq_header_size_set, METH_VARARGS, (char *)"CvSeq_header_size_set(CvSeq self, int header_size)"},
+        { (char *)"CvSeq_header_size_get", _wrap_CvSeq_header_size_get, METH_VARARGS, (char *)"CvSeq_header_size_get(CvSeq self) -> int"},
+        { (char *)"CvSeq_h_prev_set", _wrap_CvSeq_h_prev_set, METH_VARARGS, (char *)"CvSeq_h_prev_set(CvSeq self, CvSeq h_prev)"},
+        { (char *)"CvSeq_h_prev_get", _wrap_CvSeq_h_prev_get, METH_VARARGS, (char *)"CvSeq_h_prev_get(CvSeq self) -> CvSeq"},
+        { (char *)"CvSeq_h_next_set", _wrap_CvSeq_h_next_set, METH_VARARGS, (char *)"CvSeq_h_next_set(CvSeq self, CvSeq h_next)"},
+        { (char *)"CvSeq_h_next_get", _wrap_CvSeq_h_next_get, METH_VARARGS, (char *)"CvSeq_h_next_get(CvSeq self) -> CvSeq"},
+        { (char *)"CvSeq_v_prev_set", _wrap_CvSeq_v_prev_set, METH_VARARGS, (char *)"CvSeq_v_prev_set(CvSeq self, CvSeq v_prev)"},
+        { (char *)"CvSeq_v_prev_get", _wrap_CvSeq_v_prev_get, METH_VARARGS, (char *)"CvSeq_v_prev_get(CvSeq self) -> CvSeq"},
+        { (char *)"CvSeq_v_next_set", _wrap_CvSeq_v_next_set, METH_VARARGS, (char *)"CvSeq_v_next_set(CvSeq self, CvSeq v_next)"},
+        { (char *)"CvSeq_v_next_get", _wrap_CvSeq_v_next_get, METH_VARARGS, (char *)"CvSeq_v_next_get(CvSeq self) -> CvSeq"},
+        { (char *)"CvSeq_total_set", _wrap_CvSeq_total_set, METH_VARARGS, (char *)"CvSeq_total_set(CvSeq self, int total)"},
+        { (char *)"CvSeq_total_get", _wrap_CvSeq_total_get, METH_VARARGS, (char *)"CvSeq_total_get(CvSeq self) -> int"},
+        { (char *)"CvSeq_elem_size_set", _wrap_CvSeq_elem_size_set, METH_VARARGS, (char *)"CvSeq_elem_size_set(CvSeq self, int elem_size)"},
+        { (char *)"CvSeq_elem_size_get", _wrap_CvSeq_elem_size_get, METH_VARARGS, (char *)"CvSeq_elem_size_get(CvSeq self) -> int"},
+        { (char *)"CvSeq_block_max_set", _wrap_CvSeq_block_max_set, METH_VARARGS, (char *)"CvSeq_block_max_set(CvSeq self, schar block_max)"},
+        { (char *)"CvSeq_block_max_get", _wrap_CvSeq_block_max_get, METH_VARARGS, (char *)"CvSeq_block_max_get(CvSeq self) -> schar"},
+        { (char *)"CvSeq_ptr_set", _wrap_CvSeq_ptr_set, METH_VARARGS, (char *)"CvSeq_ptr_set(CvSeq self, schar ptr)"},
+        { (char *)"CvSeq_ptr_get", _wrap_CvSeq_ptr_get, METH_VARARGS, (char *)"CvSeq_ptr_get(CvSeq self) -> schar"},
+        { (char *)"CvSeq_delta_elems_set", _wrap_CvSeq_delta_elems_set, METH_VARARGS, (char *)"CvSeq_delta_elems_set(CvSeq self, int delta_elems)"},
+        { (char *)"CvSeq_delta_elems_get", _wrap_CvSeq_delta_elems_get, METH_VARARGS, (char *)"CvSeq_delta_elems_get(CvSeq self) -> int"},
+        { (char *)"CvSeq_storage_set", _wrap_CvSeq_storage_set, METH_VARARGS, (char *)"CvSeq_storage_set(CvSeq self, CvMemStorage storage)"},
+        { (char *)"CvSeq_storage_get", _wrap_CvSeq_storage_get, METH_VARARGS, (char *)"CvSeq_storage_get(CvSeq self) -> CvMemStorage"},
+        { (char *)"CvSeq_free_blocks_set", _wrap_CvSeq_free_blocks_set, METH_VARARGS, (char *)"CvSeq_free_blocks_set(CvSeq self, CvSeqBlock free_blocks)"},
+        { (char *)"CvSeq_free_blocks_get", _wrap_CvSeq_free_blocks_get, METH_VARARGS, (char *)"CvSeq_free_blocks_get(CvSeq self) -> CvSeqBlock"},
+        { (char *)"CvSeq_first_set", _wrap_CvSeq_first_set, METH_VARARGS, (char *)"CvSeq_first_set(CvSeq self, CvSeqBlock first)"},
+        { (char *)"CvSeq_first_get", _wrap_CvSeq_first_get, METH_VARARGS, (char *)"CvSeq_first_get(CvSeq self) -> CvSeqBlock"},
+        { (char *)"new_CvSeq", _wrap_new_CvSeq, METH_VARARGS, (char *)"new_CvSeq() -> CvSeq"},
+        { (char *)"delete_CvSeq", _wrap_delete_CvSeq, METH_VARARGS, (char *)"delete_CvSeq(CvSeq self)"},
         { (char *)"CvSeq_swigregister", CvSeq_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSetElem_flags_set", _wrap_CvSetElem_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvSetElem_flags_get", _wrap_CvSetElem_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvSetElem_next_free_set", _wrap_CvSetElem_next_free_set, METH_VARARGS, NULL},
-        { (char *)"CvSetElem_next_free_get", _wrap_CvSetElem_next_free_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSetElem", _wrap_new_CvSetElem, METH_VARARGS, NULL},
-        { (char *)"delete_CvSetElem", _wrap_delete_CvSetElem, METH_VARARGS, NULL},
+        { (char *)"CvSetElem_flags_set", _wrap_CvSetElem_flags_set, METH_VARARGS, (char *)"CvSetElem_flags_set(CvSetElem self, int flags)"},
+        { (char *)"CvSetElem_flags_get", _wrap_CvSetElem_flags_get, METH_VARARGS, (char *)"CvSetElem_flags_get(CvSetElem self) -> int"},
+        { (char *)"CvSetElem_next_free_set", _wrap_CvSetElem_next_free_set, METH_VARARGS, (char *)"CvSetElem_next_free_set(CvSetElem self, CvSetElem next_free)"},
+        { (char *)"CvSetElem_next_free_get", _wrap_CvSetElem_next_free_get, METH_VARARGS, (char *)"CvSetElem_next_free_get(CvSetElem self) -> CvSetElem"},
+        { (char *)"new_CvSetElem", _wrap_new_CvSetElem, METH_VARARGS, (char *)"new_CvSetElem() -> CvSetElem"},
+        { (char *)"delete_CvSetElem", _wrap_delete_CvSetElem, METH_VARARGS, (char *)"delete_CvSetElem(CvSetElem self)"},
         { (char *)"CvSetElem_swigregister", CvSetElem_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSet_flags_set", _wrap_CvSet_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_flags_get", _wrap_CvSet_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_header_size_set", _wrap_CvSet_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_header_size_get", _wrap_CvSet_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_h_prev_set", _wrap_CvSet_h_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_h_prev_get", _wrap_CvSet_h_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_h_next_set", _wrap_CvSet_h_next_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_h_next_get", _wrap_CvSet_h_next_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_v_prev_set", _wrap_CvSet_v_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_v_prev_get", _wrap_CvSet_v_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_v_next_set", _wrap_CvSet_v_next_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_v_next_get", _wrap_CvSet_v_next_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_total_set", _wrap_CvSet_total_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_total_get", _wrap_CvSet_total_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_elem_size_set", _wrap_CvSet_elem_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_elem_size_get", _wrap_CvSet_elem_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_block_max_set", _wrap_CvSet_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_block_max_get", _wrap_CvSet_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_ptr_set", _wrap_CvSet_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_ptr_get", _wrap_CvSet_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_delta_elems_set", _wrap_CvSet_delta_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_delta_elems_get", _wrap_CvSet_delta_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_storage_set", _wrap_CvSet_storage_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_storage_get", _wrap_CvSet_storage_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_free_blocks_set", _wrap_CvSet_free_blocks_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_free_blocks_get", _wrap_CvSet_free_blocks_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_first_set", _wrap_CvSet_first_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_first_get", _wrap_CvSet_first_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_free_elems_set", _wrap_CvSet_free_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_free_elems_get", _wrap_CvSet_free_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvSet_active_count_set", _wrap_CvSet_active_count_set, METH_VARARGS, NULL},
-        { (char *)"CvSet_active_count_get", _wrap_CvSet_active_count_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSet", _wrap_new_CvSet, METH_VARARGS, NULL},
-        { (char *)"delete_CvSet", _wrap_delete_CvSet, METH_VARARGS, NULL},
+        { (char *)"CvSet_flags_set", _wrap_CvSet_flags_set, METH_VARARGS, (char *)"CvSet_flags_set(CvSet self, int flags)"},
+        { (char *)"CvSet_flags_get", _wrap_CvSet_flags_get, METH_VARARGS, (char *)"CvSet_flags_get(CvSet self) -> int"},
+        { (char *)"CvSet_header_size_set", _wrap_CvSet_header_size_set, METH_VARARGS, (char *)"CvSet_header_size_set(CvSet self, int header_size)"},
+        { (char *)"CvSet_header_size_get", _wrap_CvSet_header_size_get, METH_VARARGS, (char *)"CvSet_header_size_get(CvSet self) -> int"},
+        { (char *)"CvSet_h_prev_set", _wrap_CvSet_h_prev_set, METH_VARARGS, (char *)"CvSet_h_prev_set(CvSet self, CvSeq h_prev)"},
+        { (char *)"CvSet_h_prev_get", _wrap_CvSet_h_prev_get, METH_VARARGS, (char *)"CvSet_h_prev_get(CvSet self) -> CvSeq"},
+        { (char *)"CvSet_h_next_set", _wrap_CvSet_h_next_set, METH_VARARGS, (char *)"CvSet_h_next_set(CvSet self, CvSeq h_next)"},
+        { (char *)"CvSet_h_next_get", _wrap_CvSet_h_next_get, METH_VARARGS, (char *)"CvSet_h_next_get(CvSet self) -> CvSeq"},
+        { (char *)"CvSet_v_prev_set", _wrap_CvSet_v_prev_set, METH_VARARGS, (char *)"CvSet_v_prev_set(CvSet self, CvSeq v_prev)"},
+        { (char *)"CvSet_v_prev_get", _wrap_CvSet_v_prev_get, METH_VARARGS, (char *)"CvSet_v_prev_get(CvSet self) -> CvSeq"},
+        { (char *)"CvSet_v_next_set", _wrap_CvSet_v_next_set, METH_VARARGS, (char *)"CvSet_v_next_set(CvSet self, CvSeq v_next)"},
+        { (char *)"CvSet_v_next_get", _wrap_CvSet_v_next_get, METH_VARARGS, (char *)"CvSet_v_next_get(CvSet self) -> CvSeq"},
+        { (char *)"CvSet_total_set", _wrap_CvSet_total_set, METH_VARARGS, (char *)"CvSet_total_set(CvSet self, int total)"},
+        { (char *)"CvSet_total_get", _wrap_CvSet_total_get, METH_VARARGS, (char *)"CvSet_total_get(CvSet self) -> int"},
+        { (char *)"CvSet_elem_size_set", _wrap_CvSet_elem_size_set, METH_VARARGS, (char *)"CvSet_elem_size_set(CvSet self, int elem_size)"},
+        { (char *)"CvSet_elem_size_get", _wrap_CvSet_elem_size_get, METH_VARARGS, (char *)"CvSet_elem_size_get(CvSet self) -> int"},
+        { (char *)"CvSet_block_max_set", _wrap_CvSet_block_max_set, METH_VARARGS, (char *)"CvSet_block_max_set(CvSet self, schar block_max)"},
+        { (char *)"CvSet_block_max_get", _wrap_CvSet_block_max_get, METH_VARARGS, (char *)"CvSet_block_max_get(CvSet self) -> schar"},
+        { (char *)"CvSet_ptr_set", _wrap_CvSet_ptr_set, METH_VARARGS, (char *)"CvSet_ptr_set(CvSet self, schar ptr)"},
+        { (char *)"CvSet_ptr_get", _wrap_CvSet_ptr_get, METH_VARARGS, (char *)"CvSet_ptr_get(CvSet self) -> schar"},
+        { (char *)"CvSet_delta_elems_set", _wrap_CvSet_delta_elems_set, METH_VARARGS, (char *)"CvSet_delta_elems_set(CvSet self, int delta_elems)"},
+        { (char *)"CvSet_delta_elems_get", _wrap_CvSet_delta_elems_get, METH_VARARGS, (char *)"CvSet_delta_elems_get(CvSet self) -> int"},
+        { (char *)"CvSet_storage_set", _wrap_CvSet_storage_set, METH_VARARGS, (char *)"CvSet_storage_set(CvSet self, CvMemStorage storage)"},
+        { (char *)"CvSet_storage_get", _wrap_CvSet_storage_get, METH_VARARGS, (char *)"CvSet_storage_get(CvSet self) -> CvMemStorage"},
+        { (char *)"CvSet_free_blocks_set", _wrap_CvSet_free_blocks_set, METH_VARARGS, (char *)"CvSet_free_blocks_set(CvSet self, CvSeqBlock free_blocks)"},
+        { (char *)"CvSet_free_blocks_get", _wrap_CvSet_free_blocks_get, METH_VARARGS, (char *)"CvSet_free_blocks_get(CvSet self) -> CvSeqBlock"},
+        { (char *)"CvSet_first_set", _wrap_CvSet_first_set, METH_VARARGS, (char *)"CvSet_first_set(CvSet self, CvSeqBlock first)"},
+        { (char *)"CvSet_first_get", _wrap_CvSet_first_get, METH_VARARGS, (char *)"CvSet_first_get(CvSet self) -> CvSeqBlock"},
+        { (char *)"CvSet_free_elems_set", _wrap_CvSet_free_elems_set, METH_VARARGS, (char *)"CvSet_free_elems_set(CvSet self, CvSetElem free_elems)"},
+        { (char *)"CvSet_free_elems_get", _wrap_CvSet_free_elems_get, METH_VARARGS, (char *)"CvSet_free_elems_get(CvSet self) -> CvSetElem"},
+        { (char *)"CvSet_active_count_set", _wrap_CvSet_active_count_set, METH_VARARGS, (char *)"CvSet_active_count_set(CvSet self, int active_count)"},
+        { (char *)"CvSet_active_count_get", _wrap_CvSet_active_count_get, METH_VARARGS, (char *)"CvSet_active_count_get(CvSet self) -> int"},
+        { (char *)"new_CvSet", _wrap_new_CvSet, METH_VARARGS, (char *)"new_CvSet() -> CvSet"},
+        { (char *)"delete_CvSet", _wrap_delete_CvSet, METH_VARARGS, (char *)"delete_CvSet(CvSet self)"},
         { (char *)"CvSet_swigregister", CvSet_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvGraphEdge_flags_set", _wrap_CvGraphEdge_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphEdge_flags_get", _wrap_CvGraphEdge_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphEdge_weight_set", _wrap_CvGraphEdge_weight_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphEdge_weight_get", _wrap_CvGraphEdge_weight_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphEdge_next_set", _wrap_CvGraphEdge_next_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphEdge_next_get", _wrap_CvGraphEdge_next_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphEdge_vtx_set", _wrap_CvGraphEdge_vtx_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphEdge_vtx_get", _wrap_CvGraphEdge_vtx_get, METH_VARARGS, NULL},
-        { (char *)"new_CvGraphEdge", _wrap_new_CvGraphEdge, METH_VARARGS, NULL},
-        { (char *)"delete_CvGraphEdge", _wrap_delete_CvGraphEdge, METH_VARARGS, NULL},
+        { (char *)"CvGraphEdge_flags_set", _wrap_CvGraphEdge_flags_set, METH_VARARGS, (char *)"CvGraphEdge_flags_set(CvGraphEdge self, int flags)"},
+        { (char *)"CvGraphEdge_flags_get", _wrap_CvGraphEdge_flags_get, METH_VARARGS, (char *)"CvGraphEdge_flags_get(CvGraphEdge self) -> int"},
+        { (char *)"CvGraphEdge_weight_set", _wrap_CvGraphEdge_weight_set, METH_VARARGS, (char *)"CvGraphEdge_weight_set(CvGraphEdge self, float weight)"},
+        { (char *)"CvGraphEdge_weight_get", _wrap_CvGraphEdge_weight_get, METH_VARARGS, (char *)"CvGraphEdge_weight_get(CvGraphEdge self) -> float"},
+        { (char *)"CvGraphEdge_next_set", _wrap_CvGraphEdge_next_set, METH_VARARGS, (char *)"CvGraphEdge_next_set(CvGraphEdge self, CvGraphEdge next)"},
+        { (char *)"CvGraphEdge_next_get", _wrap_CvGraphEdge_next_get, METH_VARARGS, (char *)"CvGraphEdge_next_get(CvGraphEdge self) -> CvGraphEdge"},
+        { (char *)"CvGraphEdge_vtx_set", _wrap_CvGraphEdge_vtx_set, METH_VARARGS, (char *)"CvGraphEdge_vtx_set(CvGraphEdge self, CvGraphVtx vtx)"},
+        { (char *)"CvGraphEdge_vtx_get", _wrap_CvGraphEdge_vtx_get, METH_VARARGS, (char *)"CvGraphEdge_vtx_get(CvGraphEdge self) -> CvGraphVtx"},
+        { (char *)"new_CvGraphEdge", _wrap_new_CvGraphEdge, METH_VARARGS, (char *)"new_CvGraphEdge() -> CvGraphEdge"},
+        { (char *)"delete_CvGraphEdge", _wrap_delete_CvGraphEdge, METH_VARARGS, (char *)"delete_CvGraphEdge(CvGraphEdge self)"},
         { (char *)"CvGraphEdge_swigregister", CvGraphEdge_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx_flags_set", _wrap_CvGraphVtx_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx_flags_get", _wrap_CvGraphVtx_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx_first_set", _wrap_CvGraphVtx_first_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx_first_get", _wrap_CvGraphVtx_first_get, METH_VARARGS, NULL},
-        { (char *)"new_CvGraphVtx", _wrap_new_CvGraphVtx, METH_VARARGS, NULL},
-        { (char *)"delete_CvGraphVtx", _wrap_delete_CvGraphVtx, METH_VARARGS, NULL},
+        { (char *)"CvGraphVtx_flags_set", _wrap_CvGraphVtx_flags_set, METH_VARARGS, (char *)"CvGraphVtx_flags_set(CvGraphVtx self, int flags)"},
+        { (char *)"CvGraphVtx_flags_get", _wrap_CvGraphVtx_flags_get, METH_VARARGS, (char *)"CvGraphVtx_flags_get(CvGraphVtx self) -> int"},
+        { (char *)"CvGraphVtx_first_set", _wrap_CvGraphVtx_first_set, METH_VARARGS, (char *)"CvGraphVtx_first_set(CvGraphVtx self, CvGraphEdge first)"},
+        { (char *)"CvGraphVtx_first_get", _wrap_CvGraphVtx_first_get, METH_VARARGS, (char *)"CvGraphVtx_first_get(CvGraphVtx self) -> CvGraphEdge"},
+        { (char *)"new_CvGraphVtx", _wrap_new_CvGraphVtx, METH_VARARGS, (char *)"new_CvGraphVtx() -> CvGraphVtx"},
+        { (char *)"delete_CvGraphVtx", _wrap_delete_CvGraphVtx, METH_VARARGS, (char *)"delete_CvGraphVtx(CvGraphVtx self)"},
         { (char *)"CvGraphVtx_swigregister", CvGraphVtx_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx2D_flags_set", _wrap_CvGraphVtx2D_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx2D_flags_get", _wrap_CvGraphVtx2D_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx2D_first_set", _wrap_CvGraphVtx2D_first_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx2D_first_get", _wrap_CvGraphVtx2D_first_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx2D_ptr_set", _wrap_CvGraphVtx2D_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphVtx2D_ptr_get", _wrap_CvGraphVtx2D_ptr_get, METH_VARARGS, NULL},
-        { (char *)"new_CvGraphVtx2D", _wrap_new_CvGraphVtx2D, METH_VARARGS, NULL},
-        { (char *)"delete_CvGraphVtx2D", _wrap_delete_CvGraphVtx2D, METH_VARARGS, NULL},
+        { (char *)"CvGraphVtx2D_flags_set", _wrap_CvGraphVtx2D_flags_set, METH_VARARGS, (char *)"CvGraphVtx2D_flags_set(CvGraphVtx2D self, int flags)"},
+        { (char *)"CvGraphVtx2D_flags_get", _wrap_CvGraphVtx2D_flags_get, METH_VARARGS, (char *)"CvGraphVtx2D_flags_get(CvGraphVtx2D self) -> int"},
+        { (char *)"CvGraphVtx2D_first_set", _wrap_CvGraphVtx2D_first_set, METH_VARARGS, (char *)"CvGraphVtx2D_first_set(CvGraphVtx2D self, CvGraphEdge first)"},
+        { (char *)"CvGraphVtx2D_first_get", _wrap_CvGraphVtx2D_first_get, METH_VARARGS, (char *)"CvGraphVtx2D_first_get(CvGraphVtx2D self) -> CvGraphEdge"},
+        { (char *)"CvGraphVtx2D_ptr_set", _wrap_CvGraphVtx2D_ptr_set, METH_VARARGS, (char *)"CvGraphVtx2D_ptr_set(CvGraphVtx2D self, CvPoint2D32f ptr)"},
+        { (char *)"CvGraphVtx2D_ptr_get", _wrap_CvGraphVtx2D_ptr_get, METH_VARARGS, (char *)"CvGraphVtx2D_ptr_get(CvGraphVtx2D self) -> CvPoint2D32f"},
+        { (char *)"new_CvGraphVtx2D", _wrap_new_CvGraphVtx2D, METH_VARARGS, (char *)"new_CvGraphVtx2D() -> CvGraphVtx2D"},
+        { (char *)"delete_CvGraphVtx2D", _wrap_delete_CvGraphVtx2D, METH_VARARGS, (char *)"delete_CvGraphVtx2D(CvGraphVtx2D self)"},
         { (char *)"CvGraphVtx2D_swigregister", CvGraphVtx2D_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvGraph_flags_set", _wrap_CvGraph_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_flags_get", _wrap_CvGraph_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_header_size_set", _wrap_CvGraph_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_header_size_get", _wrap_CvGraph_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_h_prev_set", _wrap_CvGraph_h_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_h_prev_get", _wrap_CvGraph_h_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_h_next_set", _wrap_CvGraph_h_next_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_h_next_get", _wrap_CvGraph_h_next_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_v_prev_set", _wrap_CvGraph_v_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_v_prev_get", _wrap_CvGraph_v_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_v_next_set", _wrap_CvGraph_v_next_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_v_next_get", _wrap_CvGraph_v_next_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_total_set", _wrap_CvGraph_total_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_total_get", _wrap_CvGraph_total_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_elem_size_set", _wrap_CvGraph_elem_size_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_elem_size_get", _wrap_CvGraph_elem_size_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_block_max_set", _wrap_CvGraph_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_block_max_get", _wrap_CvGraph_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_ptr_set", _wrap_CvGraph_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_ptr_get", _wrap_CvGraph_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_delta_elems_set", _wrap_CvGraph_delta_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_delta_elems_get", _wrap_CvGraph_delta_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_storage_set", _wrap_CvGraph_storage_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_storage_get", _wrap_CvGraph_storage_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_free_blocks_set", _wrap_CvGraph_free_blocks_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_free_blocks_get", _wrap_CvGraph_free_blocks_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_first_set", _wrap_CvGraph_first_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_first_get", _wrap_CvGraph_first_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_free_elems_set", _wrap_CvGraph_free_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_free_elems_get", _wrap_CvGraph_free_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_active_count_set", _wrap_CvGraph_active_count_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_active_count_get", _wrap_CvGraph_active_count_get, METH_VARARGS, NULL},
-        { (char *)"CvGraph_edges_set", _wrap_CvGraph_edges_set, METH_VARARGS, NULL},
-        { (char *)"CvGraph_edges_get", _wrap_CvGraph_edges_get, METH_VARARGS, NULL},
-        { (char *)"new_CvGraph", _wrap_new_CvGraph, METH_VARARGS, NULL},
-        { (char *)"delete_CvGraph", _wrap_delete_CvGraph, METH_VARARGS, NULL},
+        { (char *)"CvGraph_flags_set", _wrap_CvGraph_flags_set, METH_VARARGS, (char *)"CvGraph_flags_set(CvGraph self, int flags)"},
+        { (char *)"CvGraph_flags_get", _wrap_CvGraph_flags_get, METH_VARARGS, (char *)"CvGraph_flags_get(CvGraph self) -> int"},
+        { (char *)"CvGraph_header_size_set", _wrap_CvGraph_header_size_set, METH_VARARGS, (char *)"CvGraph_header_size_set(CvGraph self, int header_size)"},
+        { (char *)"CvGraph_header_size_get", _wrap_CvGraph_header_size_get, METH_VARARGS, (char *)"CvGraph_header_size_get(CvGraph self) -> int"},
+        { (char *)"CvGraph_h_prev_set", _wrap_CvGraph_h_prev_set, METH_VARARGS, (char *)"CvGraph_h_prev_set(CvGraph self, CvSeq h_prev)"},
+        { (char *)"CvGraph_h_prev_get", _wrap_CvGraph_h_prev_get, METH_VARARGS, (char *)"CvGraph_h_prev_get(CvGraph self) -> CvSeq"},
+        { (char *)"CvGraph_h_next_set", _wrap_CvGraph_h_next_set, METH_VARARGS, (char *)"CvGraph_h_next_set(CvGraph self, CvSeq h_next)"},
+        { (char *)"CvGraph_h_next_get", _wrap_CvGraph_h_next_get, METH_VARARGS, (char *)"CvGraph_h_next_get(CvGraph self) -> CvSeq"},
+        { (char *)"CvGraph_v_prev_set", _wrap_CvGraph_v_prev_set, METH_VARARGS, (char *)"CvGraph_v_prev_set(CvGraph self, CvSeq v_prev)"},
+        { (char *)"CvGraph_v_prev_get", _wrap_CvGraph_v_prev_get, METH_VARARGS, (char *)"CvGraph_v_prev_get(CvGraph self) -> CvSeq"},
+        { (char *)"CvGraph_v_next_set", _wrap_CvGraph_v_next_set, METH_VARARGS, (char *)"CvGraph_v_next_set(CvGraph self, CvSeq v_next)"},
+        { (char *)"CvGraph_v_next_get", _wrap_CvGraph_v_next_get, METH_VARARGS, (char *)"CvGraph_v_next_get(CvGraph self) -> CvSeq"},
+        { (char *)"CvGraph_total_set", _wrap_CvGraph_total_set, METH_VARARGS, (char *)"CvGraph_total_set(CvGraph self, int total)"},
+        { (char *)"CvGraph_total_get", _wrap_CvGraph_total_get, METH_VARARGS, (char *)"CvGraph_total_get(CvGraph self) -> int"},
+        { (char *)"CvGraph_elem_size_set", _wrap_CvGraph_elem_size_set, METH_VARARGS, (char *)"CvGraph_elem_size_set(CvGraph self, int elem_size)"},
+        { (char *)"CvGraph_elem_size_get", _wrap_CvGraph_elem_size_get, METH_VARARGS, (char *)"CvGraph_elem_size_get(CvGraph self) -> int"},
+        { (char *)"CvGraph_block_max_set", _wrap_CvGraph_block_max_set, METH_VARARGS, (char *)"CvGraph_block_max_set(CvGraph self, schar block_max)"},
+        { (char *)"CvGraph_block_max_get", _wrap_CvGraph_block_max_get, METH_VARARGS, (char *)"CvGraph_block_max_get(CvGraph self) -> schar"},
+        { (char *)"CvGraph_ptr_set", _wrap_CvGraph_ptr_set, METH_VARARGS, (char *)"CvGraph_ptr_set(CvGraph self, schar ptr)"},
+        { (char *)"CvGraph_ptr_get", _wrap_CvGraph_ptr_get, METH_VARARGS, (char *)"CvGraph_ptr_get(CvGraph self) -> schar"},
+        { (char *)"CvGraph_delta_elems_set", _wrap_CvGraph_delta_elems_set, METH_VARARGS, (char *)"CvGraph_delta_elems_set(CvGraph self, int delta_elems)"},
+        { (char *)"CvGraph_delta_elems_get", _wrap_CvGraph_delta_elems_get, METH_VARARGS, (char *)"CvGraph_delta_elems_get(CvGraph self) -> int"},
+        { (char *)"CvGraph_storage_set", _wrap_CvGraph_storage_set, METH_VARARGS, (char *)"CvGraph_storage_set(CvGraph self, CvMemStorage storage)"},
+        { (char *)"CvGraph_storage_get", _wrap_CvGraph_storage_get, METH_VARARGS, (char *)"CvGraph_storage_get(CvGraph self) -> CvMemStorage"},
+        { (char *)"CvGraph_free_blocks_set", _wrap_CvGraph_free_blocks_set, METH_VARARGS, (char *)"CvGraph_free_blocks_set(CvGraph self, CvSeqBlock free_blocks)"},
+        { (char *)"CvGraph_free_blocks_get", _wrap_CvGraph_free_blocks_get, METH_VARARGS, (char *)"CvGraph_free_blocks_get(CvGraph self) -> CvSeqBlock"},
+        { (char *)"CvGraph_first_set", _wrap_CvGraph_first_set, METH_VARARGS, (char *)"CvGraph_first_set(CvGraph self, CvSeqBlock first)"},
+        { (char *)"CvGraph_first_get", _wrap_CvGraph_first_get, METH_VARARGS, (char *)"CvGraph_first_get(CvGraph self) -> CvSeqBlock"},
+        { (char *)"CvGraph_free_elems_set", _wrap_CvGraph_free_elems_set, METH_VARARGS, (char *)"CvGraph_free_elems_set(CvGraph self, CvSetElem free_elems)"},
+        { (char *)"CvGraph_free_elems_get", _wrap_CvGraph_free_elems_get, METH_VARARGS, (char *)"CvGraph_free_elems_get(CvGraph self) -> CvSetElem"},
+        { (char *)"CvGraph_active_count_set", _wrap_CvGraph_active_count_set, METH_VARARGS, (char *)"CvGraph_active_count_set(CvGraph self, int active_count)"},
+        { (char *)"CvGraph_active_count_get", _wrap_CvGraph_active_count_get, METH_VARARGS, (char *)"CvGraph_active_count_get(CvGraph self) -> int"},
+        { (char *)"CvGraph_edges_set", _wrap_CvGraph_edges_set, METH_VARARGS, (char *)"CvGraph_edges_set(CvGraph self, CvSet edges)"},
+        { (char *)"CvGraph_edges_get", _wrap_CvGraph_edges_get, METH_VARARGS, (char *)"CvGraph_edges_get(CvGraph self) -> CvSet"},
+        { (char *)"new_CvGraph", _wrap_new_CvGraph, METH_VARARGS, (char *)"new_CvGraph() -> CvGraph"},
+        { (char *)"delete_CvGraph", _wrap_delete_CvGraph, METH_VARARGS, (char *)"delete_CvGraph(CvGraph self)"},
         { (char *)"CvGraph_swigregister", CvGraph_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvChain_flags_set", _wrap_CvChain_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_flags_get", _wrap_CvChain_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_header_size_set", _wrap_CvChain_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_header_size_get", _wrap_CvChain_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_h_prev_set", _wrap_CvChain_h_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_h_prev_get", _wrap_CvChain_h_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_h_next_set", _wrap_CvChain_h_next_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_h_next_get", _wrap_CvChain_h_next_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_v_prev_set", _wrap_CvChain_v_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_v_prev_get", _wrap_CvChain_v_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_v_next_set", _wrap_CvChain_v_next_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_v_next_get", _wrap_CvChain_v_next_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_total_set", _wrap_CvChain_total_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_total_get", _wrap_CvChain_total_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_elem_size_set", _wrap_CvChain_elem_size_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_elem_size_get", _wrap_CvChain_elem_size_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_block_max_set", _wrap_CvChain_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_block_max_get", _wrap_CvChain_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_ptr_set", _wrap_CvChain_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_ptr_get", _wrap_CvChain_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_delta_elems_set", _wrap_CvChain_delta_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_delta_elems_get", _wrap_CvChain_delta_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_storage_set", _wrap_CvChain_storage_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_storage_get", _wrap_CvChain_storage_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_free_blocks_set", _wrap_CvChain_free_blocks_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_free_blocks_get", _wrap_CvChain_free_blocks_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_first_set", _wrap_CvChain_first_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_first_get", _wrap_CvChain_first_get, METH_VARARGS, NULL},
-        { (char *)"CvChain_origin_set", _wrap_CvChain_origin_set, METH_VARARGS, NULL},
-        { (char *)"CvChain_origin_get", _wrap_CvChain_origin_get, METH_VARARGS, NULL},
-        { (char *)"new_CvChain", _wrap_new_CvChain, METH_VARARGS, NULL},
-        { (char *)"delete_CvChain", _wrap_delete_CvChain, METH_VARARGS, NULL},
+        { (char *)"CvChain_flags_set", _wrap_CvChain_flags_set, METH_VARARGS, (char *)"CvChain_flags_set(CvChain self, int flags)"},
+        { (char *)"CvChain_flags_get", _wrap_CvChain_flags_get, METH_VARARGS, (char *)"CvChain_flags_get(CvChain self) -> int"},
+        { (char *)"CvChain_header_size_set", _wrap_CvChain_header_size_set, METH_VARARGS, (char *)"CvChain_header_size_set(CvChain self, int header_size)"},
+        { (char *)"CvChain_header_size_get", _wrap_CvChain_header_size_get, METH_VARARGS, (char *)"CvChain_header_size_get(CvChain self) -> int"},
+        { (char *)"CvChain_h_prev_set", _wrap_CvChain_h_prev_set, METH_VARARGS, (char *)"CvChain_h_prev_set(CvChain self, CvSeq h_prev)"},
+        { (char *)"CvChain_h_prev_get", _wrap_CvChain_h_prev_get, METH_VARARGS, (char *)"CvChain_h_prev_get(CvChain self) -> CvSeq"},
+        { (char *)"CvChain_h_next_set", _wrap_CvChain_h_next_set, METH_VARARGS, (char *)"CvChain_h_next_set(CvChain self, CvSeq h_next)"},
+        { (char *)"CvChain_h_next_get", _wrap_CvChain_h_next_get, METH_VARARGS, (char *)"CvChain_h_next_get(CvChain self) -> CvSeq"},
+        { (char *)"CvChain_v_prev_set", _wrap_CvChain_v_prev_set, METH_VARARGS, (char *)"CvChain_v_prev_set(CvChain self, CvSeq v_prev)"},
+        { (char *)"CvChain_v_prev_get", _wrap_CvChain_v_prev_get, METH_VARARGS, (char *)"CvChain_v_prev_get(CvChain self) -> CvSeq"},
+        { (char *)"CvChain_v_next_set", _wrap_CvChain_v_next_set, METH_VARARGS, (char *)"CvChain_v_next_set(CvChain self, CvSeq v_next)"},
+        { (char *)"CvChain_v_next_get", _wrap_CvChain_v_next_get, METH_VARARGS, (char *)"CvChain_v_next_get(CvChain self) -> CvSeq"},
+        { (char *)"CvChain_total_set", _wrap_CvChain_total_set, METH_VARARGS, (char *)"CvChain_total_set(CvChain self, int total)"},
+        { (char *)"CvChain_total_get", _wrap_CvChain_total_get, METH_VARARGS, (char *)"CvChain_total_get(CvChain self) -> int"},
+        { (char *)"CvChain_elem_size_set", _wrap_CvChain_elem_size_set, METH_VARARGS, (char *)"CvChain_elem_size_set(CvChain self, int elem_size)"},
+        { (char *)"CvChain_elem_size_get", _wrap_CvChain_elem_size_get, METH_VARARGS, (char *)"CvChain_elem_size_get(CvChain self) -> int"},
+        { (char *)"CvChain_block_max_set", _wrap_CvChain_block_max_set, METH_VARARGS, (char *)"CvChain_block_max_set(CvChain self, schar block_max)"},
+        { (char *)"CvChain_block_max_get", _wrap_CvChain_block_max_get, METH_VARARGS, (char *)"CvChain_block_max_get(CvChain self) -> schar"},
+        { (char *)"CvChain_ptr_set", _wrap_CvChain_ptr_set, METH_VARARGS, (char *)"CvChain_ptr_set(CvChain self, schar ptr)"},
+        { (char *)"CvChain_ptr_get", _wrap_CvChain_ptr_get, METH_VARARGS, (char *)"CvChain_ptr_get(CvChain self) -> schar"},
+        { (char *)"CvChain_delta_elems_set", _wrap_CvChain_delta_elems_set, METH_VARARGS, (char *)"CvChain_delta_elems_set(CvChain self, int delta_elems)"},
+        { (char *)"CvChain_delta_elems_get", _wrap_CvChain_delta_elems_get, METH_VARARGS, (char *)"CvChain_delta_elems_get(CvChain self) -> int"},
+        { (char *)"CvChain_storage_set", _wrap_CvChain_storage_set, METH_VARARGS, (char *)"CvChain_storage_set(CvChain self, CvMemStorage storage)"},
+        { (char *)"CvChain_storage_get", _wrap_CvChain_storage_get, METH_VARARGS, (char *)"CvChain_storage_get(CvChain self) -> CvMemStorage"},
+        { (char *)"CvChain_free_blocks_set", _wrap_CvChain_free_blocks_set, METH_VARARGS, (char *)"CvChain_free_blocks_set(CvChain self, CvSeqBlock free_blocks)"},
+        { (char *)"CvChain_free_blocks_get", _wrap_CvChain_free_blocks_get, METH_VARARGS, (char *)"CvChain_free_blocks_get(CvChain self) -> CvSeqBlock"},
+        { (char *)"CvChain_first_set", _wrap_CvChain_first_set, METH_VARARGS, (char *)"CvChain_first_set(CvChain self, CvSeqBlock first)"},
+        { (char *)"CvChain_first_get", _wrap_CvChain_first_get, METH_VARARGS, (char *)"CvChain_first_get(CvChain self) -> CvSeqBlock"},
+        { (char *)"CvChain_origin_set", _wrap_CvChain_origin_set, METH_VARARGS, (char *)"CvChain_origin_set(CvChain self, CvPoint origin)"},
+        { (char *)"CvChain_origin_get", _wrap_CvChain_origin_get, METH_VARARGS, (char *)"CvChain_origin_get(CvChain self) -> CvPoint"},
+        { (char *)"new_CvChain", _wrap_new_CvChain, METH_VARARGS, (char *)"new_CvChain() -> CvChain"},
+        { (char *)"delete_CvChain", _wrap_delete_CvChain, METH_VARARGS, (char *)"delete_CvChain(CvChain self)"},
         { (char *)"CvChain_swigregister", CvChain_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvContour_flags_set", _wrap_CvContour_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_flags_get", _wrap_CvContour_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_header_size_set", _wrap_CvContour_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_header_size_get", _wrap_CvContour_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_h_prev_set", _wrap_CvContour_h_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_h_prev_get", _wrap_CvContour_h_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_h_next_set", _wrap_CvContour_h_next_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_h_next_get", _wrap_CvContour_h_next_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_v_prev_set", _wrap_CvContour_v_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_v_prev_get", _wrap_CvContour_v_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_v_next_set", _wrap_CvContour_v_next_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_v_next_get", _wrap_CvContour_v_next_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_total_set", _wrap_CvContour_total_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_total_get", _wrap_CvContour_total_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_elem_size_set", _wrap_CvContour_elem_size_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_elem_size_get", _wrap_CvContour_elem_size_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_block_max_set", _wrap_CvContour_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_block_max_get", _wrap_CvContour_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_ptr_set", _wrap_CvContour_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_ptr_get", _wrap_CvContour_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_delta_elems_set", _wrap_CvContour_delta_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_delta_elems_get", _wrap_CvContour_delta_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_storage_set", _wrap_CvContour_storage_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_storage_get", _wrap_CvContour_storage_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_free_blocks_set", _wrap_CvContour_free_blocks_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_free_blocks_get", _wrap_CvContour_free_blocks_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_first_set", _wrap_CvContour_first_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_first_get", _wrap_CvContour_first_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_rect_set", _wrap_CvContour_rect_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_rect_get", _wrap_CvContour_rect_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_color_set", _wrap_CvContour_color_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_color_get", _wrap_CvContour_color_get, METH_VARARGS, NULL},
-        { (char *)"CvContour_reserved_set", _wrap_CvContour_reserved_set, METH_VARARGS, NULL},
-        { (char *)"CvContour_reserved_get", _wrap_CvContour_reserved_get, METH_VARARGS, NULL},
-        { (char *)"new_CvContour", _wrap_new_CvContour, METH_VARARGS, NULL},
-        { (char *)"delete_CvContour", _wrap_delete_CvContour, METH_VARARGS, NULL},
+        { (char *)"CvContour_flags_set", _wrap_CvContour_flags_set, METH_VARARGS, (char *)"CvContour_flags_set(CvContour self, int flags)"},
+        { (char *)"CvContour_flags_get", _wrap_CvContour_flags_get, METH_VARARGS, (char *)"CvContour_flags_get(CvContour self) -> int"},
+        { (char *)"CvContour_header_size_set", _wrap_CvContour_header_size_set, METH_VARARGS, (char *)"CvContour_header_size_set(CvContour self, int header_size)"},
+        { (char *)"CvContour_header_size_get", _wrap_CvContour_header_size_get, METH_VARARGS, (char *)"CvContour_header_size_get(CvContour self) -> int"},
+        { (char *)"CvContour_h_prev_set", _wrap_CvContour_h_prev_set, METH_VARARGS, (char *)"CvContour_h_prev_set(CvContour self, CvSeq h_prev)"},
+        { (char *)"CvContour_h_prev_get", _wrap_CvContour_h_prev_get, METH_VARARGS, (char *)"CvContour_h_prev_get(CvContour self) -> CvSeq"},
+        { (char *)"CvContour_h_next_set", _wrap_CvContour_h_next_set, METH_VARARGS, (char *)"CvContour_h_next_set(CvContour self, CvSeq h_next)"},
+        { (char *)"CvContour_h_next_get", _wrap_CvContour_h_next_get, METH_VARARGS, (char *)"CvContour_h_next_get(CvContour self) -> CvSeq"},
+        { (char *)"CvContour_v_prev_set", _wrap_CvContour_v_prev_set, METH_VARARGS, (char *)"CvContour_v_prev_set(CvContour self, CvSeq v_prev)"},
+        { (char *)"CvContour_v_prev_get", _wrap_CvContour_v_prev_get, METH_VARARGS, (char *)"CvContour_v_prev_get(CvContour self) -> CvSeq"},
+        { (char *)"CvContour_v_next_set", _wrap_CvContour_v_next_set, METH_VARARGS, (char *)"CvContour_v_next_set(CvContour self, CvSeq v_next)"},
+        { (char *)"CvContour_v_next_get", _wrap_CvContour_v_next_get, METH_VARARGS, (char *)"CvContour_v_next_get(CvContour self) -> CvSeq"},
+        { (char *)"CvContour_total_set", _wrap_CvContour_total_set, METH_VARARGS, (char *)"CvContour_total_set(CvContour self, int total)"},
+        { (char *)"CvContour_total_get", _wrap_CvContour_total_get, METH_VARARGS, (char *)"CvContour_total_get(CvContour self) -> int"},
+        { (char *)"CvContour_elem_size_set", _wrap_CvContour_elem_size_set, METH_VARARGS, (char *)"CvContour_elem_size_set(CvContour self, int elem_size)"},
+        { (char *)"CvContour_elem_size_get", _wrap_CvContour_elem_size_get, METH_VARARGS, (char *)"CvContour_elem_size_get(CvContour self) -> int"},
+        { (char *)"CvContour_block_max_set", _wrap_CvContour_block_max_set, METH_VARARGS, (char *)"CvContour_block_max_set(CvContour self, schar block_max)"},
+        { (char *)"CvContour_block_max_get", _wrap_CvContour_block_max_get, METH_VARARGS, (char *)"CvContour_block_max_get(CvContour self) -> schar"},
+        { (char *)"CvContour_ptr_set", _wrap_CvContour_ptr_set, METH_VARARGS, (char *)"CvContour_ptr_set(CvContour self, schar ptr)"},
+        { (char *)"CvContour_ptr_get", _wrap_CvContour_ptr_get, METH_VARARGS, (char *)"CvContour_ptr_get(CvContour self) -> schar"},
+        { (char *)"CvContour_delta_elems_set", _wrap_CvContour_delta_elems_set, METH_VARARGS, (char *)"CvContour_delta_elems_set(CvContour self, int delta_elems)"},
+        { (char *)"CvContour_delta_elems_get", _wrap_CvContour_delta_elems_get, METH_VARARGS, (char *)"CvContour_delta_elems_get(CvContour self) -> int"},
+        { (char *)"CvContour_storage_set", _wrap_CvContour_storage_set, METH_VARARGS, (char *)"CvContour_storage_set(CvContour self, CvMemStorage storage)"},
+        { (char *)"CvContour_storage_get", _wrap_CvContour_storage_get, METH_VARARGS, (char *)"CvContour_storage_get(CvContour self) -> CvMemStorage"},
+        { (char *)"CvContour_free_blocks_set", _wrap_CvContour_free_blocks_set, METH_VARARGS, (char *)"CvContour_free_blocks_set(CvContour self, CvSeqBlock free_blocks)"},
+        { (char *)"CvContour_free_blocks_get", _wrap_CvContour_free_blocks_get, METH_VARARGS, (char *)"CvContour_free_blocks_get(CvContour self) -> CvSeqBlock"},
+        { (char *)"CvContour_first_set", _wrap_CvContour_first_set, METH_VARARGS, (char *)"CvContour_first_set(CvContour self, CvSeqBlock first)"},
+        { (char *)"CvContour_first_get", _wrap_CvContour_first_get, METH_VARARGS, (char *)"CvContour_first_get(CvContour self) -> CvSeqBlock"},
+        { (char *)"CvContour_rect_set", _wrap_CvContour_rect_set, METH_VARARGS, (char *)"CvContour_rect_set(CvContour self, CvRect rect)"},
+        { (char *)"CvContour_rect_get", _wrap_CvContour_rect_get, METH_VARARGS, (char *)"CvContour_rect_get(CvContour self) -> CvRect"},
+        { (char *)"CvContour_color_set", _wrap_CvContour_color_set, METH_VARARGS, (char *)"CvContour_color_set(CvContour self, int color)"},
+        { (char *)"CvContour_color_get", _wrap_CvContour_color_get, METH_VARARGS, (char *)"CvContour_color_get(CvContour self) -> int"},
+        { (char *)"CvContour_reserved_set", _wrap_CvContour_reserved_set, METH_VARARGS, (char *)"CvContour_reserved_set(CvContour self, int reserved)"},
+        { (char *)"CvContour_reserved_get", _wrap_CvContour_reserved_get, METH_VARARGS, (char *)"CvContour_reserved_get(CvContour self) -> int"},
+        { (char *)"new_CvContour", _wrap_new_CvContour, METH_VARARGS, (char *)"new_CvContour() -> CvContour"},
+        { (char *)"delete_CvContour", _wrap_delete_CvContour, METH_VARARGS, (char *)"delete_CvContour(CvContour self)"},
         { (char *)"CvContour_swigregister", CvContour_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_header_size_set", _wrap_CvSeqWriter_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_header_size_get", _wrap_CvSeqWriter_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_seq_set", _wrap_CvSeqWriter_seq_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_seq_get", _wrap_CvSeqWriter_seq_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_block_set", _wrap_CvSeqWriter_block_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_block_get", _wrap_CvSeqWriter_block_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_ptr_set", _wrap_CvSeqWriter_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_ptr_get", _wrap_CvSeqWriter_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_block_min_set", _wrap_CvSeqWriter_block_min_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_block_min_get", _wrap_CvSeqWriter_block_min_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_block_max_set", _wrap_CvSeqWriter_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqWriter_block_max_get", _wrap_CvSeqWriter_block_max_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSeqWriter", _wrap_new_CvSeqWriter, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeqWriter", _wrap_delete_CvSeqWriter, METH_VARARGS, NULL},
+        { (char *)"CvSeqWriter_header_size_set", _wrap_CvSeqWriter_header_size_set, METH_VARARGS, (char *)"CvSeqWriter_header_size_set(CvSeqWriter self, int header_size)"},
+        { (char *)"CvSeqWriter_header_size_get", _wrap_CvSeqWriter_header_size_get, METH_VARARGS, (char *)"CvSeqWriter_header_size_get(CvSeqWriter self) -> int"},
+        { (char *)"CvSeqWriter_seq_set", _wrap_CvSeqWriter_seq_set, METH_VARARGS, (char *)"CvSeqWriter_seq_set(CvSeqWriter self, CvSeq seq)"},
+        { (char *)"CvSeqWriter_seq_get", _wrap_CvSeqWriter_seq_get, METH_VARARGS, (char *)"CvSeqWriter_seq_get(CvSeqWriter self) -> CvSeq"},
+        { (char *)"CvSeqWriter_block_set", _wrap_CvSeqWriter_block_set, METH_VARARGS, (char *)"CvSeqWriter_block_set(CvSeqWriter self, CvSeqBlock block)"},
+        { (char *)"CvSeqWriter_block_get", _wrap_CvSeqWriter_block_get, METH_VARARGS, (char *)"CvSeqWriter_block_get(CvSeqWriter self) -> CvSeqBlock"},
+        { (char *)"CvSeqWriter_ptr_set", _wrap_CvSeqWriter_ptr_set, METH_VARARGS, (char *)"CvSeqWriter_ptr_set(CvSeqWriter self, schar ptr)"},
+        { (char *)"CvSeqWriter_ptr_get", _wrap_CvSeqWriter_ptr_get, METH_VARARGS, (char *)"CvSeqWriter_ptr_get(CvSeqWriter self) -> schar"},
+        { (char *)"CvSeqWriter_block_min_set", _wrap_CvSeqWriter_block_min_set, METH_VARARGS, (char *)"CvSeqWriter_block_min_set(CvSeqWriter self, schar block_min)"},
+        { (char *)"CvSeqWriter_block_min_get", _wrap_CvSeqWriter_block_min_get, METH_VARARGS, (char *)"CvSeqWriter_block_min_get(CvSeqWriter self) -> schar"},
+        { (char *)"CvSeqWriter_block_max_set", _wrap_CvSeqWriter_block_max_set, METH_VARARGS, (char *)"CvSeqWriter_block_max_set(CvSeqWriter self, schar block_max)"},
+        { (char *)"CvSeqWriter_block_max_get", _wrap_CvSeqWriter_block_max_get, METH_VARARGS, (char *)"CvSeqWriter_block_max_get(CvSeqWriter self) -> schar"},
+        { (char *)"new_CvSeqWriter", _wrap_new_CvSeqWriter, METH_VARARGS, (char *)"new_CvSeqWriter() -> CvSeqWriter"},
+        { (char *)"delete_CvSeqWriter", _wrap_delete_CvSeqWriter, METH_VARARGS, (char *)"delete_CvSeqWriter(CvSeqWriter self)"},
         { (char *)"CvSeqWriter_swigregister", CvSeqWriter_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_header_size_set", _wrap_CvSeqReader_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_header_size_get", _wrap_CvSeqReader_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_seq_set", _wrap_CvSeqReader_seq_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_seq_get", _wrap_CvSeqReader_seq_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_block_set", _wrap_CvSeqReader_block_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_block_get", _wrap_CvSeqReader_block_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_ptr_set", _wrap_CvSeqReader_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_ptr_get", _wrap_CvSeqReader_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_block_min_set", _wrap_CvSeqReader_block_min_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_block_min_get", _wrap_CvSeqReader_block_min_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_block_max_set", _wrap_CvSeqReader_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_block_max_get", _wrap_CvSeqReader_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_delta_index_set", _wrap_CvSeqReader_delta_index_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_delta_index_get", _wrap_CvSeqReader_delta_index_get, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_prev_elem_set", _wrap_CvSeqReader_prev_elem_set, METH_VARARGS, NULL},
-        { (char *)"CvSeqReader_prev_elem_get", _wrap_CvSeqReader_prev_elem_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSeqReader", _wrap_new_CvSeqReader, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeqReader", _wrap_delete_CvSeqReader, METH_VARARGS, NULL},
+        { (char *)"CvSeqReader_header_size_set", _wrap_CvSeqReader_header_size_set, METH_VARARGS, (char *)"CvSeqReader_header_size_set(CvSeqReader self, int header_size)"},
+        { (char *)"CvSeqReader_header_size_get", _wrap_CvSeqReader_header_size_get, METH_VARARGS, (char *)"CvSeqReader_header_size_get(CvSeqReader self) -> int"},
+        { (char *)"CvSeqReader_seq_set", _wrap_CvSeqReader_seq_set, METH_VARARGS, (char *)"CvSeqReader_seq_set(CvSeqReader self, CvSeq seq)"},
+        { (char *)"CvSeqReader_seq_get", _wrap_CvSeqReader_seq_get, METH_VARARGS, (char *)"CvSeqReader_seq_get(CvSeqReader self) -> CvSeq"},
+        { (char *)"CvSeqReader_block_set", _wrap_CvSeqReader_block_set, METH_VARARGS, (char *)"CvSeqReader_block_set(CvSeqReader self, CvSeqBlock block)"},
+        { (char *)"CvSeqReader_block_get", _wrap_CvSeqReader_block_get, METH_VARARGS, (char *)"CvSeqReader_block_get(CvSeqReader self) -> CvSeqBlock"},
+        { (char *)"CvSeqReader_ptr_set", _wrap_CvSeqReader_ptr_set, METH_VARARGS, (char *)"CvSeqReader_ptr_set(CvSeqReader self, schar ptr)"},
+        { (char *)"CvSeqReader_ptr_get", _wrap_CvSeqReader_ptr_get, METH_VARARGS, (char *)"CvSeqReader_ptr_get(CvSeqReader self) -> schar"},
+        { (char *)"CvSeqReader_block_min_set", _wrap_CvSeqReader_block_min_set, METH_VARARGS, (char *)"CvSeqReader_block_min_set(CvSeqReader self, schar block_min)"},
+        { (char *)"CvSeqReader_block_min_get", _wrap_CvSeqReader_block_min_get, METH_VARARGS, (char *)"CvSeqReader_block_min_get(CvSeqReader self) -> schar"},
+        { (char *)"CvSeqReader_block_max_set", _wrap_CvSeqReader_block_max_set, METH_VARARGS, (char *)"CvSeqReader_block_max_set(CvSeqReader self, schar block_max)"},
+        { (char *)"CvSeqReader_block_max_get", _wrap_CvSeqReader_block_max_get, METH_VARARGS, (char *)"CvSeqReader_block_max_get(CvSeqReader self) -> schar"},
+        { (char *)"CvSeqReader_delta_index_set", _wrap_CvSeqReader_delta_index_set, METH_VARARGS, (char *)"CvSeqReader_delta_index_set(CvSeqReader self, int delta_index)"},
+        { (char *)"CvSeqReader_delta_index_get", _wrap_CvSeqReader_delta_index_get, METH_VARARGS, (char *)"CvSeqReader_delta_index_get(CvSeqReader self) -> int"},
+        { (char *)"CvSeqReader_prev_elem_set", _wrap_CvSeqReader_prev_elem_set, METH_VARARGS, (char *)"CvSeqReader_prev_elem_set(CvSeqReader self, schar prev_elem)"},
+        { (char *)"CvSeqReader_prev_elem_get", _wrap_CvSeqReader_prev_elem_get, METH_VARARGS, (char *)"CvSeqReader_prev_elem_get(CvSeqReader self) -> schar"},
+        { (char *)"new_CvSeqReader", _wrap_new_CvSeqReader, METH_VARARGS, (char *)"new_CvSeqReader() -> CvSeqReader"},
+        { (char *)"delete_CvSeqReader", _wrap_delete_CvSeqReader, METH_VARARGS, (char *)"delete_CvSeqReader(CvSeqReader self)"},
         { (char *)"CvSeqReader_swigregister", CvSeqReader_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvAttrList_attr_set", _wrap_CvAttrList_attr_set, METH_VARARGS, NULL},
-        { (char *)"CvAttrList_attr_get", _wrap_CvAttrList_attr_get, METH_VARARGS, NULL},
-        { (char *)"CvAttrList_next_set", _wrap_CvAttrList_next_set, METH_VARARGS, NULL},
-        { (char *)"CvAttrList_next_get", _wrap_CvAttrList_next_get, METH_VARARGS, NULL},
-        { (char *)"new_CvAttrList", _wrap_new_CvAttrList, METH_VARARGS, NULL},
-        { (char *)"delete_CvAttrList", _wrap_delete_CvAttrList, METH_VARARGS, NULL},
+        { (char *)"CvAttrList_attr_set", _wrap_CvAttrList_attr_set, METH_VARARGS, (char *)"CvAttrList_attr_set(CvAttrList self, char attr)"},
+        { (char *)"CvAttrList_attr_get", _wrap_CvAttrList_attr_get, METH_VARARGS, (char *)"CvAttrList_attr_get(CvAttrList self) -> char"},
+        { (char *)"CvAttrList_next_set", _wrap_CvAttrList_next_set, METH_VARARGS, (char *)"CvAttrList_next_set(CvAttrList self, CvAttrList next)"},
+        { (char *)"CvAttrList_next_get", _wrap_CvAttrList_next_get, METH_VARARGS, (char *)"CvAttrList_next_get(CvAttrList self) -> CvAttrList"},
+        { (char *)"new_CvAttrList", _wrap_new_CvAttrList, METH_VARARGS, (char *)"new_CvAttrList() -> CvAttrList"},
+        { (char *)"delete_CvAttrList", _wrap_delete_CvAttrList, METH_VARARGS, (char *)"delete_CvAttrList(CvAttrList self)"},
         { (char *)"CvAttrList_swigregister", CvAttrList_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvAttrList", _wrap_cvAttrList, METH_VARARGS, NULL},
-        { (char *)"CvString_len_set", _wrap_CvString_len_set, METH_VARARGS, NULL},
-        { (char *)"CvString_len_get", _wrap_CvString_len_get, METH_VARARGS, NULL},
-        { (char *)"CvString_ptr_set", _wrap_CvString_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvString_ptr_get", _wrap_CvString_ptr_get, METH_VARARGS, NULL},
-        { (char *)"new_CvString", _wrap_new_CvString, METH_VARARGS, NULL},
-        { (char *)"delete_CvString", _wrap_delete_CvString, METH_VARARGS, NULL},
+        { (char *)"cvAttrList", _wrap_cvAttrList, METH_VARARGS, (char *)"\n"
+               "cvAttrList(char attr = None, CvAttrList next = None) -> CvAttrList\n"
+               "cvAttrList(char attr = None) -> CvAttrList\n"
+               "cvAttrList() -> CvAttrList\n"
+               ""},
+        { (char *)"CvString_len_set", _wrap_CvString_len_set, METH_VARARGS, (char *)"CvString_len_set(CvString self, int len)"},
+        { (char *)"CvString_len_get", _wrap_CvString_len_get, METH_VARARGS, (char *)"CvString_len_get(CvString self) -> int"},
+        { (char *)"CvString_ptr_set", _wrap_CvString_ptr_set, METH_VARARGS, (char *)"CvString_ptr_set(CvString self, char ptr)"},
+        { (char *)"CvString_ptr_get", _wrap_CvString_ptr_get, METH_VARARGS, (char *)"CvString_ptr_get(CvString self) -> char"},
+        { (char *)"new_CvString", _wrap_new_CvString, METH_VARARGS, (char *)"new_CvString() -> CvString"},
+        { (char *)"delete_CvString", _wrap_delete_CvString, METH_VARARGS, (char *)"delete_CvString(CvString self)"},
         { (char *)"CvString_swigregister", CvString_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvStringHashNode_hashval_set", _wrap_CvStringHashNode_hashval_set, METH_VARARGS, NULL},
-        { (char *)"CvStringHashNode_hashval_get", _wrap_CvStringHashNode_hashval_get, METH_VARARGS, NULL},
-        { (char *)"CvStringHashNode_str_set", _wrap_CvStringHashNode_str_set, METH_VARARGS, NULL},
-        { (char *)"CvStringHashNode_str_get", _wrap_CvStringHashNode_str_get, METH_VARARGS, NULL},
-        { (char *)"CvStringHashNode_next_set", _wrap_CvStringHashNode_next_set, METH_VARARGS, NULL},
-        { (char *)"CvStringHashNode_next_get", _wrap_CvStringHashNode_next_get, METH_VARARGS, NULL},
-        { (char *)"new_CvStringHashNode", _wrap_new_CvStringHashNode, METH_VARARGS, NULL},
-        { (char *)"delete_CvStringHashNode", _wrap_delete_CvStringHashNode, METH_VARARGS, NULL},
+        { (char *)"CvStringHashNode_hashval_set", _wrap_CvStringHashNode_hashval_set, METH_VARARGS, (char *)"CvStringHashNode_hashval_set(CvStringHashNode self, unsigned int hashval)"},
+        { (char *)"CvStringHashNode_hashval_get", _wrap_CvStringHashNode_hashval_get, METH_VARARGS, (char *)"CvStringHashNode_hashval_get(CvStringHashNode self) -> unsigned int"},
+        { (char *)"CvStringHashNode_str_set", _wrap_CvStringHashNode_str_set, METH_VARARGS, (char *)"CvStringHashNode_str_set(CvStringHashNode self, CvString str)"},
+        { (char *)"CvStringHashNode_str_get", _wrap_CvStringHashNode_str_get, METH_VARARGS, (char *)"CvStringHashNode_str_get(CvStringHashNode self) -> CvString"},
+        { (char *)"CvStringHashNode_next_set", _wrap_CvStringHashNode_next_set, METH_VARARGS, (char *)"CvStringHashNode_next_set(CvStringHashNode self, CvStringHashNode next)"},
+        { (char *)"CvStringHashNode_next_get", _wrap_CvStringHashNode_next_get, METH_VARARGS, (char *)"CvStringHashNode_next_get(CvStringHashNode self) -> CvStringHashNode"},
+        { (char *)"new_CvStringHashNode", _wrap_new_CvStringHashNode, METH_VARARGS, (char *)"new_CvStringHashNode() -> CvStringHashNode"},
+        { (char *)"delete_CvStringHashNode", _wrap_delete_CvStringHashNode, METH_VARARGS, (char *)"delete_CvStringHashNode(CvStringHashNode self)"},
         { (char *)"CvStringHashNode_swigregister", CvStringHashNode_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_tag_set", _wrap_CvFileNode_tag_set, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_tag_get", _wrap_CvFileNode_tag_get, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_info_set", _wrap_CvFileNode_info_set, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_info_get", _wrap_CvFileNode_info_get, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_get", _wrap_CvFileNode_data_get, METH_VARARGS, NULL},
-        { (char *)"new_CvFileNode", _wrap_new_CvFileNode, METH_VARARGS, NULL},
-        { (char *)"delete_CvFileNode", _wrap_delete_CvFileNode, METH_VARARGS, NULL},
+        { (char *)"CvFileNode_tag_set", _wrap_CvFileNode_tag_set, METH_VARARGS, (char *)"CvFileNode_tag_set(CvFileNode self, int tag)"},
+        { (char *)"CvFileNode_tag_get", _wrap_CvFileNode_tag_get, METH_VARARGS, (char *)"CvFileNode_tag_get(CvFileNode self) -> int"},
+        { (char *)"CvFileNode_info_set", _wrap_CvFileNode_info_set, METH_VARARGS, (char *)"CvFileNode_info_set(CvFileNode self, CvTypeInfo info)"},
+        { (char *)"CvFileNode_info_get", _wrap_CvFileNode_info_get, METH_VARARGS, (char *)"CvFileNode_info_get(CvFileNode self) -> CvTypeInfo"},
+        { (char *)"CvFileNode_data_get", _wrap_CvFileNode_data_get, METH_VARARGS, (char *)"CvFileNode_data_get(CvFileNode self) -> CvFileNode_data"},
+        { (char *)"new_CvFileNode", _wrap_new_CvFileNode, METH_VARARGS, (char *)"new_CvFileNode() -> CvFileNode"},
+        { (char *)"delete_CvFileNode", _wrap_delete_CvFileNode, METH_VARARGS, (char *)"delete_CvFileNode(CvFileNode self)"},
         { (char *)"CvFileNode_swigregister", CvFileNode_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_f_set", _wrap_CvFileNode_data_f_set, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_f_get", _wrap_CvFileNode_data_f_get, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_i_set", _wrap_CvFileNode_data_i_set, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_i_get", _wrap_CvFileNode_data_i_get, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_str_set", _wrap_CvFileNode_data_str_set, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_str_get", _wrap_CvFileNode_data_str_get, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_seq_set", _wrap_CvFileNode_data_seq_set, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_seq_get", _wrap_CvFileNode_data_seq_get, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_map_set", _wrap_CvFileNode_data_map_set, METH_VARARGS, NULL},
-        { (char *)"CvFileNode_data_map_get", _wrap_CvFileNode_data_map_get, METH_VARARGS, NULL},
-        { (char *)"new_CvFileNode_data", _wrap_new_CvFileNode_data, METH_VARARGS, NULL},
-        { (char *)"delete_CvFileNode_data", _wrap_delete_CvFileNode_data, METH_VARARGS, NULL},
+        { (char *)"CvFileNode_data_f_set", _wrap_CvFileNode_data_f_set, METH_VARARGS, (char *)"CvFileNode_data_f_set(CvFileNode_data self, double f)"},
+        { (char *)"CvFileNode_data_f_get", _wrap_CvFileNode_data_f_get, METH_VARARGS, (char *)"CvFileNode_data_f_get(CvFileNode_data self) -> double"},
+        { (char *)"CvFileNode_data_i_set", _wrap_CvFileNode_data_i_set, METH_VARARGS, (char *)"CvFileNode_data_i_set(CvFileNode_data self, int i)"},
+        { (char *)"CvFileNode_data_i_get", _wrap_CvFileNode_data_i_get, METH_VARARGS, (char *)"CvFileNode_data_i_get(CvFileNode_data self) -> int"},
+        { (char *)"CvFileNode_data_str_set", _wrap_CvFileNode_data_str_set, METH_VARARGS, (char *)"CvFileNode_data_str_set(CvFileNode_data self, CvString str)"},
+        { (char *)"CvFileNode_data_str_get", _wrap_CvFileNode_data_str_get, METH_VARARGS, (char *)"CvFileNode_data_str_get(CvFileNode_data self) -> CvString"},
+        { (char *)"CvFileNode_data_seq_set", _wrap_CvFileNode_data_seq_set, METH_VARARGS, (char *)"CvFileNode_data_seq_set(CvFileNode_data self, CvSeq seq)"},
+        { (char *)"CvFileNode_data_seq_get", _wrap_CvFileNode_data_seq_get, METH_VARARGS, (char *)"CvFileNode_data_seq_get(CvFileNode_data self) -> CvSeq"},
+        { (char *)"CvFileNode_data_map_set", _wrap_CvFileNode_data_map_set, METH_VARARGS, (char *)"CvFileNode_data_map_set(CvFileNode_data self, CvFileNodeHash map)"},
+        { (char *)"CvFileNode_data_map_get", _wrap_CvFileNode_data_map_get, METH_VARARGS, (char *)"CvFileNode_data_map_get(CvFileNode_data self) -> CvFileNodeHash"},
+        { (char *)"new_CvFileNode_data", _wrap_new_CvFileNode_data, METH_VARARGS, (char *)"new_CvFileNode_data() -> CvFileNode_data"},
+        { (char *)"delete_CvFileNode_data", _wrap_delete_CvFileNode_data, METH_VARARGS, (char *)"delete_CvFileNode_data(CvFileNode_data self)"},
         { (char *)"CvFileNode_data_swigregister", CvFileNode_data_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_flags_set", _wrap_CvTypeInfo_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_flags_get", _wrap_CvTypeInfo_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_header_size_set", _wrap_CvTypeInfo_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_header_size_get", _wrap_CvTypeInfo_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_prev_set", _wrap_CvTypeInfo_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_prev_get", _wrap_CvTypeInfo_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_next_set", _wrap_CvTypeInfo_next_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_next_get", _wrap_CvTypeInfo_next_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_type_name_set", _wrap_CvTypeInfo_type_name_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_type_name_get", _wrap_CvTypeInfo_type_name_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_is_instance_set", _wrap_CvTypeInfo_is_instance_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_is_instance_get", _wrap_CvTypeInfo_is_instance_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_release_set", _wrap_CvTypeInfo_release_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_release_get", _wrap_CvTypeInfo_release_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_read_set", _wrap_CvTypeInfo_read_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_read_get", _wrap_CvTypeInfo_read_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_write_set", _wrap_CvTypeInfo_write_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_write_get", _wrap_CvTypeInfo_write_get, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_clone_set", _wrap_CvTypeInfo_clone_set, METH_VARARGS, NULL},
-        { (char *)"CvTypeInfo_clone_get", _wrap_CvTypeInfo_clone_get, METH_VARARGS, NULL},
-        { (char *)"new_CvTypeInfo", _wrap_new_CvTypeInfo, METH_VARARGS, NULL},
-        { (char *)"delete_CvTypeInfo", _wrap_delete_CvTypeInfo, METH_VARARGS, NULL},
+        { (char *)"CvTypeInfo_flags_set", _wrap_CvTypeInfo_flags_set, METH_VARARGS, (char *)"CvTypeInfo_flags_set(CvTypeInfo self, int flags)"},
+        { (char *)"CvTypeInfo_flags_get", _wrap_CvTypeInfo_flags_get, METH_VARARGS, (char *)"CvTypeInfo_flags_get(CvTypeInfo self) -> int"},
+        { (char *)"CvTypeInfo_header_size_set", _wrap_CvTypeInfo_header_size_set, METH_VARARGS, (char *)"CvTypeInfo_header_size_set(CvTypeInfo self, int header_size)"},
+        { (char *)"CvTypeInfo_header_size_get", _wrap_CvTypeInfo_header_size_get, METH_VARARGS, (char *)"CvTypeInfo_header_size_get(CvTypeInfo self) -> int"},
+        { (char *)"CvTypeInfo_prev_set", _wrap_CvTypeInfo_prev_set, METH_VARARGS, (char *)"CvTypeInfo_prev_set(CvTypeInfo self, CvTypeInfo prev)"},
+        { (char *)"CvTypeInfo_prev_get", _wrap_CvTypeInfo_prev_get, METH_VARARGS, (char *)"CvTypeInfo_prev_get(CvTypeInfo self) -> CvTypeInfo"},
+        { (char *)"CvTypeInfo_next_set", _wrap_CvTypeInfo_next_set, METH_VARARGS, (char *)"CvTypeInfo_next_set(CvTypeInfo self, CvTypeInfo next)"},
+        { (char *)"CvTypeInfo_next_get", _wrap_CvTypeInfo_next_get, METH_VARARGS, (char *)"CvTypeInfo_next_get(CvTypeInfo self) -> CvTypeInfo"},
+        { (char *)"CvTypeInfo_type_name_set", _wrap_CvTypeInfo_type_name_set, METH_VARARGS, (char *)"CvTypeInfo_type_name_set(CvTypeInfo self, char type_name)"},
+        { (char *)"CvTypeInfo_type_name_get", _wrap_CvTypeInfo_type_name_get, METH_VARARGS, (char *)"CvTypeInfo_type_name_get(CvTypeInfo self) -> char"},
+        { (char *)"CvTypeInfo_is_instance_set", _wrap_CvTypeInfo_is_instance_set, METH_VARARGS, (char *)"CvTypeInfo_is_instance_set(CvTypeInfo self, CvIsInstanceFunc is_instance)"},
+        { (char *)"CvTypeInfo_is_instance_get", _wrap_CvTypeInfo_is_instance_get, METH_VARARGS, (char *)"CvTypeInfo_is_instance_get(CvTypeInfo self) -> CvIsInstanceFunc"},
+        { (char *)"CvTypeInfo_release_set", _wrap_CvTypeInfo_release_set, METH_VARARGS, (char *)"CvTypeInfo_release_set(CvTypeInfo self, CvReleaseFunc release)"},
+        { (char *)"CvTypeInfo_release_get", _wrap_CvTypeInfo_release_get, METH_VARARGS, (char *)"CvTypeInfo_release_get(CvTypeInfo self) -> CvReleaseFunc"},
+        { (char *)"CvTypeInfo_read_set", _wrap_CvTypeInfo_read_set, METH_VARARGS, (char *)"CvTypeInfo_read_set(CvTypeInfo self, CvReadFunc read)"},
+        { (char *)"CvTypeInfo_read_get", _wrap_CvTypeInfo_read_get, METH_VARARGS, (char *)"CvTypeInfo_read_get(CvTypeInfo self) -> CvReadFunc"},
+        { (char *)"CvTypeInfo_write_set", _wrap_CvTypeInfo_write_set, METH_VARARGS, (char *)"CvTypeInfo_write_set(CvTypeInfo self, CvWriteFunc write)"},
+        { (char *)"CvTypeInfo_write_get", _wrap_CvTypeInfo_write_get, METH_VARARGS, (char *)"CvTypeInfo_write_get(CvTypeInfo self) -> CvWriteFunc"},
+        { (char *)"CvTypeInfo_clone_set", _wrap_CvTypeInfo_clone_set, METH_VARARGS, (char *)"CvTypeInfo_clone_set(CvTypeInfo self, CvCloneFunc clone)"},
+        { (char *)"CvTypeInfo_clone_get", _wrap_CvTypeInfo_clone_get, METH_VARARGS, (char *)"CvTypeInfo_clone_get(CvTypeInfo self) -> CvCloneFunc"},
+        { (char *)"new_CvTypeInfo", _wrap_new_CvTypeInfo, METH_VARARGS, (char *)"new_CvTypeInfo() -> CvTypeInfo"},
+        { (char *)"delete_CvTypeInfo", _wrap_delete_CvTypeInfo, METH_VARARGS, (char *)"delete_CvTypeInfo(CvTypeInfo self)"},
         { (char *)"CvTypeInfo_swigregister", CvTypeInfo_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_func_addr_set", _wrap_CvPluginFuncInfo_func_addr_set, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_func_addr_get", _wrap_CvPluginFuncInfo_func_addr_get, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_default_func_addr_set", _wrap_CvPluginFuncInfo_default_func_addr_set, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_default_func_addr_get", _wrap_CvPluginFuncInfo_default_func_addr_get, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_func_names_set", _wrap_CvPluginFuncInfo_func_names_set, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_func_names_get", _wrap_CvPluginFuncInfo_func_names_get, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_search_modules_set", _wrap_CvPluginFuncInfo_search_modules_set, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_search_modules_get", _wrap_CvPluginFuncInfo_search_modules_get, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_loaded_from_set", _wrap_CvPluginFuncInfo_loaded_from_set, METH_VARARGS, NULL},
-        { (char *)"CvPluginFuncInfo_loaded_from_get", _wrap_CvPluginFuncInfo_loaded_from_get, METH_VARARGS, NULL},
-        { (char *)"new_CvPluginFuncInfo", _wrap_new_CvPluginFuncInfo, METH_VARARGS, NULL},
-        { (char *)"delete_CvPluginFuncInfo", _wrap_delete_CvPluginFuncInfo, METH_VARARGS, NULL},
+        { (char *)"CvPluginFuncInfo_func_addr_set", _wrap_CvPluginFuncInfo_func_addr_set, METH_VARARGS, (char *)"CvPluginFuncInfo_func_addr_set(CvPluginFuncInfo self, void func_addr)"},
+        { (char *)"CvPluginFuncInfo_func_addr_get", _wrap_CvPluginFuncInfo_func_addr_get, METH_VARARGS, (char *)"CvPluginFuncInfo_func_addr_get(CvPluginFuncInfo self) -> void"},
+        { (char *)"CvPluginFuncInfo_default_func_addr_set", _wrap_CvPluginFuncInfo_default_func_addr_set, METH_VARARGS, (char *)"CvPluginFuncInfo_default_func_addr_set(CvPluginFuncInfo self, void default_func_addr)"},
+        { (char *)"CvPluginFuncInfo_default_func_addr_get", _wrap_CvPluginFuncInfo_default_func_addr_get, METH_VARARGS, (char *)"CvPluginFuncInfo_default_func_addr_get(CvPluginFuncInfo self) -> void"},
+        { (char *)"CvPluginFuncInfo_func_names_set", _wrap_CvPluginFuncInfo_func_names_set, METH_VARARGS, (char *)"CvPluginFuncInfo_func_names_set(CvPluginFuncInfo self, char func_names)"},
+        { (char *)"CvPluginFuncInfo_func_names_get", _wrap_CvPluginFuncInfo_func_names_get, METH_VARARGS, (char *)"CvPluginFuncInfo_func_names_get(CvPluginFuncInfo self) -> char"},
+        { (char *)"CvPluginFuncInfo_search_modules_set", _wrap_CvPluginFuncInfo_search_modules_set, METH_VARARGS, (char *)"CvPluginFuncInfo_search_modules_set(CvPluginFuncInfo self, int search_modules)"},
+        { (char *)"CvPluginFuncInfo_search_modules_get", _wrap_CvPluginFuncInfo_search_modules_get, METH_VARARGS, (char *)"CvPluginFuncInfo_search_modules_get(CvPluginFuncInfo self) -> int"},
+        { (char *)"CvPluginFuncInfo_loaded_from_set", _wrap_CvPluginFuncInfo_loaded_from_set, METH_VARARGS, (char *)"CvPluginFuncInfo_loaded_from_set(CvPluginFuncInfo self, int loaded_from)"},
+        { (char *)"CvPluginFuncInfo_loaded_from_get", _wrap_CvPluginFuncInfo_loaded_from_get, METH_VARARGS, (char *)"CvPluginFuncInfo_loaded_from_get(CvPluginFuncInfo self) -> int"},
+        { (char *)"new_CvPluginFuncInfo", _wrap_new_CvPluginFuncInfo, METH_VARARGS, (char *)"new_CvPluginFuncInfo() -> CvPluginFuncInfo"},
+        { (char *)"delete_CvPluginFuncInfo", _wrap_delete_CvPluginFuncInfo, METH_VARARGS, (char *)"delete_CvPluginFuncInfo(CvPluginFuncInfo self)"},
         { (char *)"CvPluginFuncInfo_swigregister", CvPluginFuncInfo_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvModuleInfo_next_set", _wrap_CvModuleInfo_next_set, METH_VARARGS, NULL},
-        { (char *)"CvModuleInfo_next_get", _wrap_CvModuleInfo_next_get, METH_VARARGS, NULL},
-        { (char *)"CvModuleInfo_name_set", _wrap_CvModuleInfo_name_set, METH_VARARGS, NULL},
-        { (char *)"CvModuleInfo_name_get", _wrap_CvModuleInfo_name_get, METH_VARARGS, NULL},
-        { (char *)"CvModuleInfo_version_set", _wrap_CvModuleInfo_version_set, METH_VARARGS, NULL},
-        { (char *)"CvModuleInfo_version_get", _wrap_CvModuleInfo_version_get, METH_VARARGS, NULL},
-        { (char *)"CvModuleInfo_func_tab_set", _wrap_CvModuleInfo_func_tab_set, METH_VARARGS, NULL},
-        { (char *)"CvModuleInfo_func_tab_get", _wrap_CvModuleInfo_func_tab_get, METH_VARARGS, NULL},
-        { (char *)"new_CvModuleInfo", _wrap_new_CvModuleInfo, METH_VARARGS, NULL},
-        { (char *)"delete_CvModuleInfo", _wrap_delete_CvModuleInfo, METH_VARARGS, NULL},
+        { (char *)"CvModuleInfo_next_set", _wrap_CvModuleInfo_next_set, METH_VARARGS, (char *)"CvModuleInfo_next_set(CvModuleInfo self, CvModuleInfo next)"},
+        { (char *)"CvModuleInfo_next_get", _wrap_CvModuleInfo_next_get, METH_VARARGS, (char *)"CvModuleInfo_next_get(CvModuleInfo self) -> CvModuleInfo"},
+        { (char *)"CvModuleInfo_name_set", _wrap_CvModuleInfo_name_set, METH_VARARGS, (char *)"CvModuleInfo_name_set(CvModuleInfo self, char name)"},
+        { (char *)"CvModuleInfo_name_get", _wrap_CvModuleInfo_name_get, METH_VARARGS, (char *)"CvModuleInfo_name_get(CvModuleInfo self) -> char"},
+        { (char *)"CvModuleInfo_version_set", _wrap_CvModuleInfo_version_set, METH_VARARGS, (char *)"CvModuleInfo_version_set(CvModuleInfo self, char version)"},
+        { (char *)"CvModuleInfo_version_get", _wrap_CvModuleInfo_version_get, METH_VARARGS, (char *)"CvModuleInfo_version_get(CvModuleInfo self) -> char"},
+        { (char *)"CvModuleInfo_func_tab_set", _wrap_CvModuleInfo_func_tab_set, METH_VARARGS, (char *)"CvModuleInfo_func_tab_set(CvModuleInfo self, CvPluginFuncInfo func_tab)"},
+        { (char *)"CvModuleInfo_func_tab_get", _wrap_CvModuleInfo_func_tab_get, METH_VARARGS, (char *)"CvModuleInfo_func_tab_get(CvModuleInfo self) -> CvPluginFuncInfo"},
+        { (char *)"new_CvModuleInfo", _wrap_new_CvModuleInfo, METH_VARARGS, (char *)"new_CvModuleInfo() -> CvModuleInfo"},
+        { (char *)"delete_CvModuleInfo", _wrap_delete_CvModuleInfo, METH_VARARGS, (char *)"delete_CvModuleInfo(CvModuleInfo self)"},
         { (char *)"CvModuleInfo_swigregister", CvModuleInfo_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvAlloc", _wrap_cvAlloc, METH_VARARGS, NULL},
-        { (char *)"cvFree_", _wrap_cvFree_, METH_VARARGS, NULL},
-        { (char *)"cvResetImageROI", _wrap_cvResetImageROI, METH_VARARGS, NULL},
-        { (char *)"cvCreateMatHeader", _wrap_cvCreateMatHeader, METH_VARARGS, NULL},
-        { (char *)"cvInitMatHeader", _wrap_cvInitMatHeader, METH_VARARGS, NULL},
-        { (char *)"cvCreateMat", _wrap_cvCreateMat, METH_VARARGS, NULL},
-        { (char *)"cvDecRefData", _wrap_cvDecRefData, METH_VARARGS, NULL},
-        { (char *)"cvIncRefData", _wrap_cvIncRefData, METH_VARARGS, NULL},
-        { (char *)"cvCloneMat", _wrap_cvCloneMat, METH_VARARGS, NULL},
-        { (char *)"cvGetSubRect", _wrap_cvGetSubRect, METH_VARARGS, NULL},
-        { (char *)"cvGetRows", _wrap_cvGetRows, METH_VARARGS, NULL},
-        { (char *)"cvGetRow", _wrap_cvGetRow, METH_VARARGS, NULL},
-        { (char *)"cvGetCols", _wrap_cvGetCols, METH_VARARGS, NULL},
-        { (char *)"cvGetCol", _wrap_cvGetCol, METH_VARARGS, NULL},
-        { (char *)"cvGetDiag", _wrap_cvGetDiag, METH_VARARGS, NULL},
-        { (char *)"cvScalarToRawData", _wrap_cvScalarToRawData, METH_VARARGS, NULL},
-        { (char *)"cvRawDataToScalar", _wrap_cvRawDataToScalar, METH_VARARGS, NULL},
-        { (char *)"cvCreateMatNDHeader", _wrap_cvCreateMatNDHeader, METH_VARARGS, NULL},
-        { (char *)"cvCreateMatND", _wrap_cvCreateMatND, METH_VARARGS, NULL},
-        { (char *)"cvInitMatNDHeader", _wrap_cvInitMatNDHeader, METH_VARARGS, NULL},
-        { (char *)"cvCloneMatND", _wrap_cvCloneMatND, METH_VARARGS, NULL},
-        { (char *)"cvCreateSparseMat", _wrap_cvCreateSparseMat, METH_VARARGS, NULL},
-        { (char *)"cvCloneSparseMat", _wrap_cvCloneSparseMat, METH_VARARGS, NULL},
-        { (char *)"cvInitSparseMatIterator", _wrap_cvInitSparseMatIterator, METH_VARARGS, NULL},
-        { (char *)"cvGetNextSparseNode", _wrap_cvGetNextSparseNode, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_count_set", _wrap_CvNArrayIterator_count_set, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_count_get", _wrap_CvNArrayIterator_count_get, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_dims_set", _wrap_CvNArrayIterator_dims_set, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_dims_get", _wrap_CvNArrayIterator_dims_get, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_size_set", _wrap_CvNArrayIterator_size_set, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_size_get", _wrap_CvNArrayIterator_size_get, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_ptr_set", _wrap_CvNArrayIterator_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_ptr_get", _wrap_CvNArrayIterator_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_stack_set", _wrap_CvNArrayIterator_stack_set, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_stack_get", _wrap_CvNArrayIterator_stack_get, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_hdr_set", _wrap_CvNArrayIterator_hdr_set, METH_VARARGS, NULL},
-        { (char *)"CvNArrayIterator_hdr_get", _wrap_CvNArrayIterator_hdr_get, METH_VARARGS, NULL},
-        { (char *)"new_CvNArrayIterator", _wrap_new_CvNArrayIterator, METH_VARARGS, NULL},
-        { (char *)"delete_CvNArrayIterator", _wrap_delete_CvNArrayIterator, METH_VARARGS, NULL},
+        { (char *)"cvAlloc", _wrap_cvAlloc, METH_VARARGS, (char *)"cvAlloc(size_t size) -> void"},
+        { (char *)"cvFree_", _wrap_cvFree_, METH_VARARGS, (char *)"cvFree_(void ptr)"},
+        { (char *)"cvResetImageROI", _wrap_cvResetImageROI, METH_VARARGS, (char *)"cvResetImageROI( image)"},
+        { (char *)"cvCreateMatHeader", _wrap_cvCreateMatHeader, METH_VARARGS, (char *)"cvCreateMatHeader(int rows, int cols, int type) -> CvMat"},
+        { (char *)"cvInitMatHeader", _wrap_cvInitMatHeader, METH_VARARGS, (char *)"\n"
+               "cvInitMatHeader(CvMat mat, int rows, int cols, int type, void data = None, \n"
+               "    int step = 0x7fffffff) -> CvMat\n"
+               ""},
+        { (char *)"cvCreateMat", _wrap_cvCreateMat, METH_VARARGS, (char *)"cvCreateMat(int rows, int cols, int type) -> CvMat"},
+        { (char *)"cvDecRefData", _wrap_cvDecRefData, METH_VARARGS, (char *)"cvDecRefData(CvArr arr)"},
+        { (char *)"cvIncRefData", _wrap_cvIncRefData, METH_VARARGS, (char *)"cvIncRefData(CvArr arr) -> int"},
+        { (char *)"cvCloneMat", _wrap_cvCloneMat, METH_VARARGS, (char *)"cvCloneMat(CvMat mat) -> CvMat"},
+        { (char *)"cvGetSubRect", _wrap_cvGetSubRect, METH_VARARGS, (char *)"cvGetSubRect(CvArr arr, CvRect rect) -> CvMat"},
+        { (char *)"cvGetRows", _wrap_cvGetRows, METH_VARARGS, (char *)"cvGetRows(CvArr arr, int start_row, int end_row, int delta_row = 1) -> CvMat"},
+        { (char *)"cvGetRow", _wrap_cvGetRow, METH_VARARGS, (char *)"cvGetRow(CvArr arr, int row) -> CvMat"},
+        { (char *)"cvGetCols", _wrap_cvGetCols, METH_VARARGS, (char *)"cvGetCols(CvArr arr, int start_col, int end_col) -> CvMat"},
+        { (char *)"cvGetCol", _wrap_cvGetCol, METH_VARARGS, (char *)"cvGetCol(CvArr arr, int col) -> CvMat"},
+        { (char *)"cvGetDiag", _wrap_cvGetDiag, METH_VARARGS, (char *)"cvGetDiag(CvArr arr, int diag = 0) -> CvMat"},
+        { (char *)"cvScalarToRawData", _wrap_cvScalarToRawData, METH_VARARGS, (char *)"cvScalarToRawData(CvScalar scalar, void data, int type, int extend_to_12 = 0)"},
+        { (char *)"cvRawDataToScalar", _wrap_cvRawDataToScalar, METH_VARARGS, (char *)"cvRawDataToScalar(void data, int type, CvScalar scalar)"},
+        { (char *)"cvCreateMatNDHeader", _wrap_cvCreateMatNDHeader, METH_VARARGS, (char *)"cvCreateMatNDHeader(int dims, int type) -> CvMatND"},
+        { (char *)"cvCreateMatND", _wrap_cvCreateMatND, METH_VARARGS, (char *)"cvCreateMatND(int dims, int type) -> CvMatND"},
+        { (char *)"cvInitMatNDHeader", _wrap_cvInitMatNDHeader, METH_VARARGS, (char *)"cvInitMatNDHeader(CvMatND mat, int dims, int type, void data = None) -> CvMatND"},
+        { (char *)"cvCloneMatND", _wrap_cvCloneMatND, METH_VARARGS, (char *)"cvCloneMatND(CvMatND mat) -> CvMatND"},
+        { (char *)"cvCreateSparseMat", _wrap_cvCreateSparseMat, METH_VARARGS, (char *)"cvCreateSparseMat(int dims, int type) -> CvSparseMat"},
+        { (char *)"cvCloneSparseMat", _wrap_cvCloneSparseMat, METH_VARARGS, (char *)"cvCloneSparseMat(CvSparseMat mat) -> CvSparseMat"},
+        { (char *)"cvInitSparseMatIterator", _wrap_cvInitSparseMatIterator, METH_VARARGS, (char *)"cvInitSparseMatIterator(CvSparseMat mat, CvSparseMatIterator mat_iterator) -> CvSparseNode"},
+        { (char *)"cvGetNextSparseNode", _wrap_cvGetNextSparseNode, METH_VARARGS, (char *)"cvGetNextSparseNode(CvSparseMatIterator mat_iterator) -> CvSparseNode"},
+        { (char *)"CvNArrayIterator_count_set", _wrap_CvNArrayIterator_count_set, METH_VARARGS, (char *)"CvNArrayIterator_count_set(CvNArrayIterator self, int count)"},
+        { (char *)"CvNArrayIterator_count_get", _wrap_CvNArrayIterator_count_get, METH_VARARGS, (char *)"CvNArrayIterator_count_get(CvNArrayIterator self) -> int"},
+        { (char *)"CvNArrayIterator_dims_set", _wrap_CvNArrayIterator_dims_set, METH_VARARGS, (char *)"CvNArrayIterator_dims_set(CvNArrayIterator self, int dims)"},
+        { (char *)"CvNArrayIterator_dims_get", _wrap_CvNArrayIterator_dims_get, METH_VARARGS, (char *)"CvNArrayIterator_dims_get(CvNArrayIterator self) -> int"},
+        { (char *)"CvNArrayIterator_size_set", _wrap_CvNArrayIterator_size_set, METH_VARARGS, (char *)"CvNArrayIterator_size_set(CvNArrayIterator self, CvSize size)"},
+        { (char *)"CvNArrayIterator_size_get", _wrap_CvNArrayIterator_size_get, METH_VARARGS, (char *)"CvNArrayIterator_size_get(CvNArrayIterator self) -> CvSize"},
+        { (char *)"CvNArrayIterator_ptr_set", _wrap_CvNArrayIterator_ptr_set, METH_VARARGS, (char *)"CvNArrayIterator_ptr_set(CvNArrayIterator self, uchar ptr)"},
+        { (char *)"CvNArrayIterator_ptr_get", _wrap_CvNArrayIterator_ptr_get, METH_VARARGS, (char *)"CvNArrayIterator_ptr_get(CvNArrayIterator self) -> uchar"},
+        { (char *)"CvNArrayIterator_stack_set", _wrap_CvNArrayIterator_stack_set, METH_VARARGS, (char *)"CvNArrayIterator_stack_set(CvNArrayIterator self, int stack)"},
+        { (char *)"CvNArrayIterator_stack_get", _wrap_CvNArrayIterator_stack_get, METH_VARARGS, (char *)"CvNArrayIterator_stack_get(CvNArrayIterator self) -> int"},
+        { (char *)"CvNArrayIterator_hdr_set", _wrap_CvNArrayIterator_hdr_set, METH_VARARGS, (char *)"CvNArrayIterator_hdr_set(CvNArrayIterator self, CvMatND hdr)"},
+        { (char *)"CvNArrayIterator_hdr_get", _wrap_CvNArrayIterator_hdr_get, METH_VARARGS, (char *)"CvNArrayIterator_hdr_get(CvNArrayIterator self) -> CvMatND"},
+        { (char *)"new_CvNArrayIterator", _wrap_new_CvNArrayIterator, METH_VARARGS, (char *)"new_CvNArrayIterator() -> CvNArrayIterator"},
+        { (char *)"delete_CvNArrayIterator", _wrap_delete_CvNArrayIterator, METH_VARARGS, (char *)"delete_CvNArrayIterator(CvNArrayIterator self)"},
         { (char *)"CvNArrayIterator_swigregister", CvNArrayIterator_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvInitNArrayIterator", _wrap_cvInitNArrayIterator, METH_VARARGS, NULL},
-        { (char *)"cvNextNArraySlice", _wrap_cvNextNArraySlice, METH_VARARGS, NULL},
-        { (char *)"cvGetElemType", _wrap_cvGetElemType, METH_VARARGS, NULL},
-        { (char *)"cvGetDims", _wrap_cvGetDims, METH_VARARGS, NULL},
-        { (char *)"cvGetDimSize", _wrap_cvGetDimSize, METH_VARARGS, NULL},
-        { (char *)"cvPtr1D", _wrap_cvPtr1D, METH_VARARGS, NULL},
-        { (char *)"cvPtr2D", _wrap_cvPtr2D, METH_VARARGS, NULL},
-        { (char *)"cvPtr3D", _wrap_cvPtr3D, METH_VARARGS, NULL},
-        { (char *)"cvPtrND", _wrap_cvPtrND, METH_VARARGS, NULL},
-        { (char *)"cvGet1D", _wrap_cvGet1D, METH_VARARGS, NULL},
-        { (char *)"cvGet2D", _wrap_cvGet2D, METH_VARARGS, NULL},
-        { (char *)"cvGet3D", _wrap_cvGet3D, METH_VARARGS, NULL},
-        { (char *)"cvGetND", _wrap_cvGetND, METH_VARARGS, NULL},
-        { (char *)"cvGetReal1D", _wrap_cvGetReal1D, METH_VARARGS, NULL},
-        { (char *)"cvGetReal2D", _wrap_cvGetReal2D, METH_VARARGS, NULL},
-        { (char *)"cvGetReal3D", _wrap_cvGetReal3D, METH_VARARGS, NULL},
-        { (char *)"cvGetRealND", _wrap_cvGetRealND, METH_VARARGS, NULL},
-        { (char *)"cvSet1D", _wrap_cvSet1D, METH_VARARGS, NULL},
-        { (char *)"cvSet2D", _wrap_cvSet2D, METH_VARARGS, NULL},
-        { (char *)"cvSet3D", _wrap_cvSet3D, METH_VARARGS, NULL},
-        { (char *)"cvSetND", _wrap_cvSetND, METH_VARARGS, NULL},
-        { (char *)"cvSetReal1D", _wrap_cvSetReal1D, METH_VARARGS, NULL},
-        { (char *)"cvSetReal2D", _wrap_cvSetReal2D, METH_VARARGS, NULL},
-        { (char *)"cvSetReal3D", _wrap_cvSetReal3D, METH_VARARGS, NULL},
-        { (char *)"cvSetRealND", _wrap_cvSetRealND, METH_VARARGS, NULL},
-        { (char *)"cvClearND", _wrap_cvClearND, METH_VARARGS, NULL},
-        { (char *)"cvGetMat", _wrap_cvGetMat, METH_VARARGS, NULL},
-        { (char *)"cvReshapeMatND", _wrap_cvReshapeMatND, METH_VARARGS, NULL},
-        { (char *)"cvReshape", _wrap_cvReshape, METH_VARARGS, NULL},
-        { (char *)"cvRepeat", _wrap_cvRepeat, METH_VARARGS, NULL},
-        { (char *)"cvCreateData", _wrap_cvCreateData, METH_VARARGS, NULL},
-        { (char *)"cvReleaseData", _wrap_cvReleaseData, METH_VARARGS, NULL},
-        { (char *)"cvSetData", _wrap_cvSetData, METH_VARARGS, NULL},
-        { (char *)"cvGetRawData", _wrap_cvGetRawData, METH_VARARGS, NULL},
-        { (char *)"cvGetSize", _wrap_cvGetSize, METH_VARARGS, NULL},
-        { (char *)"cvCopy", _wrap_cvCopy, METH_VARARGS, NULL},
-        { (char *)"cvSet", _wrap_cvSet, METH_VARARGS, NULL},
-        { (char *)"cvSetZero", _wrap_cvSetZero, METH_VARARGS, NULL},
-        { (char *)"cvSplit", _wrap_cvSplit, METH_VARARGS, NULL},
-        { (char *)"cvMerge", _wrap_cvMerge, METH_VARARGS, NULL},
-        { (char *)"cvMixChannels", _wrap_cvMixChannels, METH_VARARGS, NULL},
-        { (char *)"cvConvertScale", _wrap_cvConvertScale, METH_VARARGS, NULL},
-        { (char *)"cvConvertScaleAbs", _wrap_cvConvertScaleAbs, METH_VARARGS, NULL},
-        { (char *)"cvCheckTermCriteria", _wrap_cvCheckTermCriteria, METH_VARARGS, NULL},
-        { (char *)"cvAdd", _wrap_cvAdd, METH_VARARGS, NULL},
-        { (char *)"cvAddS", _wrap_cvAddS, METH_VARARGS, NULL},
-        { (char *)"cvSub", _wrap_cvSub, METH_VARARGS, NULL},
-        { (char *)"cvSubS", _wrap_cvSubS, METH_VARARGS, NULL},
-        { (char *)"cvSubRS", _wrap_cvSubRS, METH_VARARGS, NULL},
-        { (char *)"cvMul", _wrap_cvMul, METH_VARARGS, NULL},
-        { (char *)"cvDiv", _wrap_cvDiv, METH_VARARGS, NULL},
-        { (char *)"cvScaleAdd", _wrap_cvScaleAdd, METH_VARARGS, NULL},
-        { (char *)"cvAddWeighted", _wrap_cvAddWeighted, METH_VARARGS, NULL},
-        { (char *)"cvDotProduct", _wrap_cvDotProduct, METH_VARARGS, NULL},
-        { (char *)"cvAnd", _wrap_cvAnd, METH_VARARGS, NULL},
-        { (char *)"cvAndS", _wrap_cvAndS, METH_VARARGS, NULL},
-        { (char *)"cvOr", _wrap_cvOr, METH_VARARGS, NULL},
-        { (char *)"cvOrS", _wrap_cvOrS, METH_VARARGS, NULL},
-        { (char *)"cvXor", _wrap_cvXor, METH_VARARGS, NULL},
-        { (char *)"cvXorS", _wrap_cvXorS, METH_VARARGS, NULL},
-        { (char *)"cvNot", _wrap_cvNot, METH_VARARGS, NULL},
-        { (char *)"cvInRange", _wrap_cvInRange, METH_VARARGS, NULL},
-        { (char *)"cvInRangeS", _wrap_cvInRangeS, METH_VARARGS, NULL},
-        { (char *)"cvCmp", _wrap_cvCmp, METH_VARARGS, NULL},
-        { (char *)"cvCmpS", _wrap_cvCmpS, METH_VARARGS, NULL},
-        { (char *)"cvMin", _wrap_cvMin, METH_VARARGS, NULL},
-        { (char *)"cvMax", _wrap_cvMax, METH_VARARGS, NULL},
-        { (char *)"cvMinS", _wrap_cvMinS, METH_VARARGS, NULL},
-        { (char *)"cvMaxS", _wrap_cvMaxS, METH_VARARGS, NULL},
-        { (char *)"cvAbsDiff", _wrap_cvAbsDiff, METH_VARARGS, NULL},
-        { (char *)"cvAbsDiffS", _wrap_cvAbsDiffS, METH_VARARGS, NULL},
-        { (char *)"cvCartToPolar", _wrap_cvCartToPolar, METH_VARARGS, NULL},
-        { (char *)"cvPolarToCart", _wrap_cvPolarToCart, METH_VARARGS, NULL},
-        { (char *)"cvPow", _wrap_cvPow, METH_VARARGS, NULL},
-        { (char *)"cvExp", _wrap_cvExp, METH_VARARGS, NULL},
-        { (char *)"cvLog", _wrap_cvLog, METH_VARARGS, NULL},
-        { (char *)"cvFastArctan", _wrap_cvFastArctan, METH_VARARGS, NULL},
-        { (char *)"cvCbrt", _wrap_cvCbrt, METH_VARARGS, NULL},
-        { (char *)"cvCheckArr", _wrap_cvCheckArr, METH_VARARGS, NULL},
-        { (char *)"cvRandArr", _wrap_cvRandArr, METH_VARARGS, NULL},
-        { (char *)"cvRandShuffle", _wrap_cvRandShuffle, METH_VARARGS, NULL},
-        { (char *)"cvSort", _wrap_cvSort, METH_VARARGS, NULL},
-        { (char *)"cvSolveCubic", _wrap_cvSolveCubic, METH_VARARGS, NULL},
-        { (char *)"cvSolvePoly", _wrap_cvSolvePoly, METH_VARARGS, NULL},
-        { (char *)"cvCrossProduct", _wrap_cvCrossProduct, METH_VARARGS, NULL},
-        { (char *)"cvGEMM", _wrap_cvGEMM, METH_VARARGS, NULL},
-        { (char *)"cvTransform", _wrap_cvTransform, METH_VARARGS, NULL},
-        { (char *)"cvPerspectiveTransform", _wrap_cvPerspectiveTransform, METH_VARARGS, NULL},
-        { (char *)"cvMulTransposed", _wrap_cvMulTransposed, METH_VARARGS, NULL},
-        { (char *)"cvTranspose", _wrap_cvTranspose, METH_VARARGS, NULL},
-        { (char *)"cvCompleteSymm", _wrap_cvCompleteSymm, METH_VARARGS, NULL},
-        { (char *)"cvFlip", _wrap_cvFlip, METH_VARARGS, NULL},
-        { (char *)"cvSVD", _wrap_cvSVD, METH_VARARGS, NULL},
-        { (char *)"cvSVBkSb", _wrap_cvSVBkSb, METH_VARARGS, NULL},
-        { (char *)"cvInvert", _wrap_cvInvert, METH_VARARGS, NULL},
-        { (char *)"cvSolve", _wrap_cvSolve, METH_VARARGS, NULL},
-        { (char *)"cvDet", _wrap_cvDet, METH_VARARGS, NULL},
-        { (char *)"cvTrace", _wrap_cvTrace, METH_VARARGS, NULL},
-        { (char *)"cvEigenVV", _wrap_cvEigenVV, METH_VARARGS, NULL},
-        { (char *)"cvSetIdentity", _wrap_cvSetIdentity, METH_VARARGS, NULL},
-        { (char *)"cvRange", _wrap_cvRange, METH_VARARGS, NULL},
-        { (char *)"cvCalcCovarMatrix", _wrap_cvCalcCovarMatrix, METH_VARARGS, NULL},
-        { (char *)"cvCalcPCA", _wrap_cvCalcPCA, METH_VARARGS, NULL},
-        { (char *)"cvProjectPCA", _wrap_cvProjectPCA, METH_VARARGS, NULL},
-        { (char *)"cvBackProjectPCA", _wrap_cvBackProjectPCA, METH_VARARGS, NULL},
-        { (char *)"cvMahalanobis", _wrap_cvMahalanobis, METH_VARARGS, NULL},
-        { (char *)"cvSum", _wrap_cvSum, METH_VARARGS, NULL},
-        { (char *)"cvCountNonZero", _wrap_cvCountNonZero, METH_VARARGS, NULL},
-        { (char *)"cvAvg", _wrap_cvAvg, METH_VARARGS, NULL},
-        { (char *)"cvAvgSdv", _wrap_cvAvgSdv, METH_VARARGS, NULL},
-        { (char *)"cvMinMaxLoc", _wrap_cvMinMaxLoc, METH_VARARGS, NULL},
-        { (char *)"cvNorm", _wrap_cvNorm, METH_VARARGS, NULL},
-        { (char *)"cvNormalize", _wrap_cvNormalize, METH_VARARGS, NULL},
-        { (char *)"cvReduce", _wrap_cvReduce, METH_VARARGS, NULL},
-        { (char *)"cvDFT", _wrap_cvDFT, METH_VARARGS, NULL},
-        { (char *)"cvMulSpectrums", _wrap_cvMulSpectrums, METH_VARARGS, NULL},
-        { (char *)"cvGetOptimalDFTSize", _wrap_cvGetOptimalDFTSize, METH_VARARGS, NULL},
-        { (char *)"cvDCT", _wrap_cvDCT, METH_VARARGS, NULL},
-        { (char *)"cvSliceLength", _wrap_cvSliceLength, METH_VARARGS, NULL},
-        { (char *)"cvCreateMemStorage", _wrap_cvCreateMemStorage, METH_VARARGS, NULL},
-        { (char *)"cvCreateChildMemStorage", _wrap_cvCreateChildMemStorage, METH_VARARGS, NULL},
-        { (char *)"cvClearMemStorage", _wrap_cvClearMemStorage, METH_VARARGS, NULL},
-        { (char *)"cvSaveMemStoragePos", _wrap_cvSaveMemStoragePos, METH_VARARGS, NULL},
-        { (char *)"cvRestoreMemStoragePos", _wrap_cvRestoreMemStoragePos, METH_VARARGS, NULL},
-        { (char *)"cvMemStorageAlloc", _wrap_cvMemStorageAlloc, METH_VARARGS, NULL},
-        { (char *)"cvMemStorageAllocString", _wrap_cvMemStorageAllocString, METH_VARARGS, NULL},
-        { (char *)"cvCreateSeq", _wrap_cvCreateSeq, METH_VARARGS, NULL},
-        { (char *)"cvSetSeqBlockSize", _wrap_cvSetSeqBlockSize, METH_VARARGS, NULL},
-        { (char *)"cvSeqPush", _wrap_cvSeqPush, METH_VARARGS, NULL},
-        { (char *)"cvSeqPushFront", _wrap_cvSeqPushFront, METH_VARARGS, NULL},
-        { (char *)"cvSeqPop", _wrap_cvSeqPop, METH_VARARGS, NULL},
-        { (char *)"cvSeqPopFront", _wrap_cvSeqPopFront, METH_VARARGS, NULL},
-        { (char *)"cvSeqPushMulti", _wrap_cvSeqPushMulti, METH_VARARGS, NULL},
-        { (char *)"cvSeqPopMulti", _wrap_cvSeqPopMulti, METH_VARARGS, NULL},
-        { (char *)"cvSeqInsert", _wrap_cvSeqInsert, METH_VARARGS, NULL},
-        { (char *)"cvSeqRemove", _wrap_cvSeqRemove, METH_VARARGS, NULL},
-        { (char *)"cvClearSeq", _wrap_cvClearSeq, METH_VARARGS, NULL},
-        { (char *)"cvGetSeqElem", _wrap_cvGetSeqElem, METH_VARARGS, NULL},
-        { (char *)"cvSeqElemIdx", _wrap_cvSeqElemIdx, METH_VARARGS, NULL},
-        { (char *)"cvStartAppendToSeq", _wrap_cvStartAppendToSeq, METH_VARARGS, NULL},
-        { (char *)"cvStartWriteSeq", _wrap_cvStartWriteSeq, METH_VARARGS, NULL},
-        { (char *)"cvEndWriteSeq", _wrap_cvEndWriteSeq, METH_VARARGS, NULL},
-        { (char *)"cvFlushSeqWriter", _wrap_cvFlushSeqWriter, METH_VARARGS, NULL},
-        { (char *)"cvStartReadSeq", _wrap_cvStartReadSeq, METH_VARARGS, NULL},
-        { (char *)"cvGetSeqReaderPos", _wrap_cvGetSeqReaderPos, METH_VARARGS, NULL},
-        { (char *)"cvSetSeqReaderPos", _wrap_cvSetSeqReaderPos, METH_VARARGS, NULL},
-        { (char *)"cvMakeSeqHeaderForArray", _wrap_cvMakeSeqHeaderForArray, METH_VARARGS, NULL},
-        { (char *)"cvSeqSlice", _wrap_cvSeqSlice, METH_VARARGS, NULL},
-        { (char *)"cvCloneSeq", _wrap_cvCloneSeq, METH_VARARGS, NULL},
-        { (char *)"cvSeqRemoveSlice", _wrap_cvSeqRemoveSlice, METH_VARARGS, NULL},
-        { (char *)"cvSeqInsertSlice", _wrap_cvSeqInsertSlice, METH_VARARGS, NULL},
-        { (char *)"cvSeqSort", _wrap_cvSeqSort, METH_VARARGS, NULL},
-        { (char *)"cvSeqSearch", _wrap_cvSeqSearch, METH_VARARGS, NULL},
-        { (char *)"cvSeqInvert", _wrap_cvSeqInvert, METH_VARARGS, NULL},
-        { (char *)"cvSeqPartition", _wrap_cvSeqPartition, METH_VARARGS, NULL},
-        { (char *)"cvChangeSeqBlock", _wrap_cvChangeSeqBlock, METH_VARARGS, NULL},
-        { (char *)"cvCreateSeqBlock", _wrap_cvCreateSeqBlock, METH_VARARGS, NULL},
-        { (char *)"cvCreateSet", _wrap_cvCreateSet, METH_VARARGS, NULL},
-        { (char *)"cvSetAdd", _wrap_cvSetAdd, METH_VARARGS, NULL},
-        { (char *)"cvSetNew", _wrap_cvSetNew, METH_VARARGS, NULL},
-        { (char *)"cvSetRemoveByPtr", _wrap_cvSetRemoveByPtr, METH_VARARGS, NULL},
-        { (char *)"cvSetRemove", _wrap_cvSetRemove, METH_VARARGS, NULL},
-        { (char *)"cvGetSetElem", _wrap_cvGetSetElem, METH_VARARGS, NULL},
-        { (char *)"cvClearSet", _wrap_cvClearSet, METH_VARARGS, NULL},
-        { (char *)"cvCreateGraph", _wrap_cvCreateGraph, METH_VARARGS, NULL},
-        { (char *)"cvGraphAddVtx", _wrap_cvGraphAddVtx, METH_VARARGS, NULL},
-        { (char *)"cvGraphRemoveVtx", _wrap_cvGraphRemoveVtx, METH_VARARGS, NULL},
-        { (char *)"cvGraphRemoveVtxByPtr", _wrap_cvGraphRemoveVtxByPtr, METH_VARARGS, NULL},
-        { (char *)"cvGraphAddEdge", _wrap_cvGraphAddEdge, METH_VARARGS, NULL},
-        { (char *)"cvGraphAddEdgeByPtr", _wrap_cvGraphAddEdgeByPtr, METH_VARARGS, NULL},
-        { (char *)"cvGraphRemoveEdge", _wrap_cvGraphRemoveEdge, METH_VARARGS, NULL},
-        { (char *)"cvGraphRemoveEdgeByPtr", _wrap_cvGraphRemoveEdgeByPtr, METH_VARARGS, NULL},
-        { (char *)"cvFindGraphEdge", _wrap_cvFindGraphEdge, METH_VARARGS, NULL},
-        { (char *)"cvFindGraphEdgeByPtr", _wrap_cvFindGraphEdgeByPtr, METH_VARARGS, NULL},
-        { (char *)"cvClearGraph", _wrap_cvClearGraph, METH_VARARGS, NULL},
-        { (char *)"cvGraphVtxDegree", _wrap_cvGraphVtxDegree, METH_VARARGS, NULL},
-        { (char *)"cvGraphVtxDegreeByPtr", _wrap_cvGraphVtxDegreeByPtr, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_vtx_set", _wrap_CvGraphScanner_vtx_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_vtx_get", _wrap_CvGraphScanner_vtx_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_dst_set", _wrap_CvGraphScanner_dst_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_dst_get", _wrap_CvGraphScanner_dst_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_edge_set", _wrap_CvGraphScanner_edge_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_edge_get", _wrap_CvGraphScanner_edge_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_graph_set", _wrap_CvGraphScanner_graph_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_graph_get", _wrap_CvGraphScanner_graph_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_stack_set", _wrap_CvGraphScanner_stack_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_stack_get", _wrap_CvGraphScanner_stack_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_index_set", _wrap_CvGraphScanner_index_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_index_get", _wrap_CvGraphScanner_index_get, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_mask_set", _wrap_CvGraphScanner_mask_set, METH_VARARGS, NULL},
-        { (char *)"CvGraphScanner_mask_get", _wrap_CvGraphScanner_mask_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvGraphScanner", _wrap_delete_CvGraphScanner, METH_VARARGS, NULL},
+        { (char *)"cvInitNArrayIterator", _wrap_cvInitNArrayIterator, METH_VARARGS, (char *)"\n"
+               "cvInitNArrayIterator(int count, CvArr arrs, CvArr mask, CvMatND stubs, CvNArrayIterator array_iterator, \n"
+               "    int flags = 0) -> int\n"
+               ""},
+        { (char *)"cvNextNArraySlice", _wrap_cvNextNArraySlice, METH_VARARGS, (char *)"cvNextNArraySlice(CvNArrayIterator array_iterator) -> int"},
+        { (char *)"cvGetElemType", _wrap_cvGetElemType, METH_VARARGS, (char *)"cvGetElemType(CvArr arr) -> int"},
+        { (char *)"cvGetDims", _wrap_cvGetDims, METH_VARARGS, (char *)"cvGetDims(CvArr arr) -> int"},
+        { (char *)"cvGetDimSize", _wrap_cvGetDimSize, METH_VARARGS, (char *)"cvGetDimSize(CvArr arr, int index) -> int"},
+        { (char *)"cvPtr1D", _wrap_cvPtr1D, METH_VARARGS, (char *)"cvPtr1D(CvArr arr, int idx0, int type = None) -> uchar"},
+        { (char *)"cvPtr2D", _wrap_cvPtr2D, METH_VARARGS, (char *)"cvPtr2D(CvArr arr, int idx0, int idx1, int type = None) -> uchar"},
+        { (char *)"cvPtr3D", _wrap_cvPtr3D, METH_VARARGS, (char *)"cvPtr3D(CvArr arr, int idx0, int idx1, int idx2, int type = None) -> uchar"},
+        { (char *)"cvPtrND", _wrap_cvPtrND, METH_VARARGS, (char *)"\n"
+               "cvPtrND(CvArr arr, int idx, int type = None, int create_node = 1, \n"
+               "    unsigned int precalc_hashval = None) -> uchar\n"
+               ""},
+        { (char *)"cvGet1D", _wrap_cvGet1D, METH_VARARGS, (char *)"cvGet1D(CvArr arr, int idx0) -> CvScalar"},
+        { (char *)"cvGet2D", _wrap_cvGet2D, METH_VARARGS, (char *)"cvGet2D(CvArr arr, int idx0, int idx1) -> CvScalar"},
+        { (char *)"cvGet3D", _wrap_cvGet3D, METH_VARARGS, (char *)"cvGet3D(CvArr arr, int idx0, int idx1, int idx2) -> CvScalar"},
+        { (char *)"cvGetND", _wrap_cvGetND, METH_VARARGS, (char *)"cvGetND(CvArr arr, int idx) -> CvScalar"},
+        { (char *)"cvGetReal1D", _wrap_cvGetReal1D, METH_VARARGS, (char *)"cvGetReal1D(CvArr arr, int idx0) -> double"},
+        { (char *)"cvGetReal2D", _wrap_cvGetReal2D, METH_VARARGS, (char *)"cvGetReal2D(CvArr arr, int idx0, int idx1) -> double"},
+        { (char *)"cvGetReal3D", _wrap_cvGetReal3D, METH_VARARGS, (char *)"cvGetReal3D(CvArr arr, int idx0, int idx1, int idx2) -> double"},
+        { (char *)"cvGetRealND", _wrap_cvGetRealND, METH_VARARGS, (char *)"cvGetRealND(CvArr arr, int idx) -> double"},
+        { (char *)"cvSet1D", _wrap_cvSet1D, METH_VARARGS, (char *)"cvSet1D(CvArr arr, int idx0, CvScalar value)"},
+        { (char *)"cvSet2D", _wrap_cvSet2D, METH_VARARGS, (char *)"cvSet2D(CvArr arr, int idx0, int idx1, CvScalar value)"},
+        { (char *)"cvSet3D", _wrap_cvSet3D, METH_VARARGS, (char *)"cvSet3D(CvArr arr, int idx0, int idx1, int idx2, CvScalar value)"},
+        { (char *)"cvSetND", _wrap_cvSetND, METH_VARARGS, (char *)"cvSetND(CvArr arr, int idx, CvScalar value)"},
+        { (char *)"cvSetReal1D", _wrap_cvSetReal1D, METH_VARARGS, (char *)"cvSetReal1D(CvArr arr, int idx0, double value)"},
+        { (char *)"cvSetReal2D", _wrap_cvSetReal2D, METH_VARARGS, (char *)"cvSetReal2D(CvArr arr, int idx0, int idx1, double value)"},
+        { (char *)"cvSetReal3D", _wrap_cvSetReal3D, METH_VARARGS, (char *)"cvSetReal3D(CvArr arr, int idx0, int idx1, int idx2, double value)"},
+        { (char *)"cvSetRealND", _wrap_cvSetRealND, METH_VARARGS, (char *)"cvSetRealND(CvArr arr, int idx, double value)"},
+        { (char *)"cvClearND", _wrap_cvClearND, METH_VARARGS, (char *)"cvClearND(CvArr arr, int idx)"},
+        { (char *)"cvGetMat", _wrap_cvGetMat, METH_VARARGS, (char *)"cvGetMat(CvArr arr, int coi = None, int allowND = 0) -> CvMat"},
+        { (char *)"cvReshapeMatND", _wrap_cvReshapeMatND, METH_VARARGS, (char *)"\n"
+               "cvReshapeMatND(CvArr arr, int sizeof_header, CvArr header, int new_cn, \n"
+               "    int new_dims, int new_sizes) -> CvArr\n"
+               ""},
+        { (char *)"cvReshape", _wrap_cvReshape, METH_VARARGS, (char *)"cvReshape(CvArr arr, int new_cn, int new_rows = 0) -> CvMat"},
+        { (char *)"cvRepeat", _wrap_cvRepeat, METH_VARARGS, (char *)"cvRepeat(CvArr src, CvArr dst)"},
+        { (char *)"cvCreateData", _wrap_cvCreateData, METH_VARARGS, (char *)"cvCreateData(CvArr arr)"},
+        { (char *)"cvReleaseData", _wrap_cvReleaseData, METH_VARARGS, (char *)"cvReleaseData(CvArr arr)"},
+        { (char *)"cvSetData", _wrap_cvSetData, METH_VARARGS, (char *)"cvSetData(CvArr arr, void data, int step)"},
+        { (char *)"cvGetRawData", _wrap_cvGetRawData, METH_VARARGS, (char *)"cvGetRawData(CvArr arr, uchar data, int step = None, CvSize roi_size = None)"},
+        { (char *)"cvGetSize", _wrap_cvGetSize, METH_VARARGS, (char *)"cvGetSize(CvArr arr) -> CvSize"},
+        { (char *)"cvCopy", _wrap_cvCopy, METH_VARARGS, (char *)"cvCopy(CvArr src, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvSet", _wrap_cvSet, METH_VARARGS, (char *)"cvSet(CvArr arr, CvScalar value, CvArr mask = None)"},
+        { (char *)"cvSetZero", _wrap_cvSetZero, METH_VARARGS, (char *)"cvSetZero(CvArr arr)"},
+        { (char *)"cvSplit", _wrap_cvSplit, METH_VARARGS, (char *)"cvSplit(CvArr src, CvArr dst0, CvArr dst1, CvArr dst2, CvArr dst3)"},
+        { (char *)"cvMerge", _wrap_cvMerge, METH_VARARGS, (char *)"cvMerge(CvArr src0, CvArr src1, CvArr src2, CvArr src3, CvArr dst)"},
+        { (char *)"cvMixChannels", _wrap_cvMixChannels, METH_VARARGS, (char *)"\n"
+               "cvMixChannels(CvArr src, int src_count, CvArr dst, int dst_count, \n"
+               "    int from_to, int pair_count)\n"
+               ""},
+        { (char *)"cvConvertScale", _wrap_cvConvertScale, METH_VARARGS, (char *)"cvConvertScale(CvArr src, CvArr dst, double scale = 1, double shift = 0)"},
+        { (char *)"cvConvertScaleAbs", _wrap_cvConvertScaleAbs, METH_VARARGS, (char *)"cvConvertScaleAbs(CvArr src, CvArr dst, double scale = 1, double shift = 0)"},
+        { (char *)"cvCheckTermCriteria", _wrap_cvCheckTermCriteria, METH_VARARGS, (char *)"cvCheckTermCriteria(CvTermCriteria criteria, double default_eps, int default_max_iters) -> CvTermCriteria"},
+        { (char *)"cvAdd", _wrap_cvAdd, METH_VARARGS, (char *)"cvAdd(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvAddS", _wrap_cvAddS, METH_VARARGS, (char *)"cvAddS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvSub", _wrap_cvSub, METH_VARARGS, (char *)"cvSub(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvSubS", _wrap_cvSubS, METH_VARARGS, (char *)"cvSubS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvSubRS", _wrap_cvSubRS, METH_VARARGS, (char *)"cvSubRS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvMul", _wrap_cvMul, METH_VARARGS, (char *)"cvMul(CvArr src1, CvArr src2, CvArr dst, double scale = 1)"},
+        { (char *)"cvDiv", _wrap_cvDiv, METH_VARARGS, (char *)"cvDiv(CvArr src1, CvArr src2, CvArr dst, double scale = 1)"},
+        { (char *)"cvScaleAdd", _wrap_cvScaleAdd, METH_VARARGS, (char *)"cvScaleAdd(CvArr src1, CvScalar scale, CvArr src2, CvArr dst)"},
+        { (char *)"cvAddWeighted", _wrap_cvAddWeighted, METH_VARARGS, (char *)"\n"
+               "cvAddWeighted(CvArr src1, double alpha, CvArr src2, double beta, \n"
+               "    double gamma, CvArr dst)\n"
+               ""},
+        { (char *)"cvDotProduct", _wrap_cvDotProduct, METH_VARARGS, (char *)"cvDotProduct(CvArr src1, CvArr src2) -> double"},
+        { (char *)"cvAnd", _wrap_cvAnd, METH_VARARGS, (char *)"cvAnd(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvAndS", _wrap_cvAndS, METH_VARARGS, (char *)"cvAndS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvOr", _wrap_cvOr, METH_VARARGS, (char *)"cvOr(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvOrS", _wrap_cvOrS, METH_VARARGS, (char *)"cvOrS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvXor", _wrap_cvXor, METH_VARARGS, (char *)"cvXor(CvArr src1, CvArr src2, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvXorS", _wrap_cvXorS, METH_VARARGS, (char *)"cvXorS(CvArr src, CvScalar value, CvArr dst, CvArr mask = None)"},
+        { (char *)"cvNot", _wrap_cvNot, METH_VARARGS, (char *)"cvNot(CvArr src, CvArr dst)"},
+        { (char *)"cvInRange", _wrap_cvInRange, METH_VARARGS, (char *)"cvInRange(CvArr src, CvArr lower, CvArr upper, CvArr dst)"},
+        { (char *)"cvInRangeS", _wrap_cvInRangeS, METH_VARARGS, (char *)"cvInRangeS(CvArr src, CvScalar lower, CvScalar upper, CvArr dst)"},
+        { (char *)"cvCmp", _wrap_cvCmp, METH_VARARGS, (char *)"cvCmp(CvArr src1, CvArr src2, CvArr dst, int cmp_op)"},
+        { (char *)"cvCmpS", _wrap_cvCmpS, METH_VARARGS, (char *)"cvCmpS(CvArr src, double value, CvArr dst, int cmp_op)"},
+        { (char *)"cvMin", _wrap_cvMin, METH_VARARGS, (char *)"cvMin(CvArr src1, CvArr src2, CvArr dst)"},
+        { (char *)"cvMax", _wrap_cvMax, METH_VARARGS, (char *)"cvMax(CvArr src1, CvArr src2, CvArr dst)"},
+        { (char *)"cvMinS", _wrap_cvMinS, METH_VARARGS, (char *)"cvMinS(CvArr src, double value, CvArr dst)"},
+        { (char *)"cvMaxS", _wrap_cvMaxS, METH_VARARGS, (char *)"cvMaxS(CvArr src, double value, CvArr dst)"},
+        { (char *)"cvAbsDiff", _wrap_cvAbsDiff, METH_VARARGS, (char *)"cvAbsDiff(CvArr src1, CvArr src2, CvArr dst)"},
+        { (char *)"cvAbsDiffS", _wrap_cvAbsDiffS, METH_VARARGS, (char *)"cvAbsDiffS(CvArr src, CvArr dst, CvScalar value)"},
+        { (char *)"cvCartToPolar", _wrap_cvCartToPolar, METH_VARARGS, (char *)"\n"
+               "cvCartToPolar(CvArr x, CvArr y, CvArr magnitude, CvArr angle = None, \n"
+               "    int angle_in_degrees = 0)\n"
+               ""},
+        { (char *)"cvPolarToCart", _wrap_cvPolarToCart, METH_VARARGS, (char *)"cvPolarToCart(CvArr magnitude, CvArr angle, CvArr x, CvArr y, int angle_in_degrees = 0)"},
+        { (char *)"cvPow", _wrap_cvPow, METH_VARARGS, (char *)"cvPow(CvArr src, CvArr dst, double power)"},
+        { (char *)"cvExp", _wrap_cvExp, METH_VARARGS, (char *)"cvExp(CvArr src, CvArr dst)"},
+        { (char *)"cvLog", _wrap_cvLog, METH_VARARGS, (char *)"cvLog(CvArr src, CvArr dst)"},
+        { (char *)"cvFastArctan", _wrap_cvFastArctan, METH_VARARGS, (char *)"cvFastArctan(float y, float x) -> float"},
+        { (char *)"cvCbrt", _wrap_cvCbrt, METH_VARARGS, (char *)"cvCbrt(float value) -> float"},
+        { (char *)"cvCheckArr", _wrap_cvCheckArr, METH_VARARGS, (char *)"cvCheckArr(CvArr arr, int flags = 0, double min_val = 0, double max_val = 0) -> int"},
+        { (char *)"cvRandArr", _wrap_cvRandArr, METH_VARARGS, (char *)"\n"
+               "cvRandArr(CvRNG rng, CvArr arr, int dist_type, CvScalar param1, \n"
+               "    CvScalar param2)\n"
+               ""},
+        { (char *)"cvRandShuffle", _wrap_cvRandShuffle, METH_VARARGS, (char *)"cvRandShuffle(CvArr mat, CvRNG rng, double iter_factor = 1.)"},
+        { (char *)"cvSort", _wrap_cvSort, METH_VARARGS, (char *)"cvSort(CvArr src, CvArr dst = None, CvArr idxmat = None, int flags = 0)"},
+        { (char *)"cvSolveCubic", _wrap_cvSolveCubic, METH_VARARGS, (char *)"cvSolveCubic(CvMat coeffs) -> int"},
+        { (char *)"cvSolvePoly", _wrap_cvSolvePoly, METH_VARARGS, (char *)"cvSolvePoly(CvMat coeffs, int maxiter = 20, int fig = 100)"},
+        { (char *)"cvCrossProduct", _wrap_cvCrossProduct, METH_VARARGS, (char *)"cvCrossProduct(CvArr src1, CvArr src2, CvArr dst)"},
+        { (char *)"cvGEMM", _wrap_cvGEMM, METH_VARARGS, (char *)"\n"
+               "cvGEMM(CvArr src1, CvArr src2, double alpha, CvArr src3, double beta, \n"
+               "    CvArr dst, int tABC = 0)\n"
+               ""},
+        { (char *)"cvTransform", _wrap_cvTransform, METH_VARARGS, (char *)"cvTransform(CvArr src, CvArr dst, CvMat transmat, CvMat shiftvec = None)"},
+        { (char *)"cvPerspectiveTransform", _wrap_cvPerspectiveTransform, METH_VARARGS, (char *)"cvPerspectiveTransform(CvArr src, CvArr dst, CvMat mat)"},
+        { (char *)"cvMulTransposed", _wrap_cvMulTransposed, METH_VARARGS, (char *)"\n"
+               "cvMulTransposed(CvArr src, CvArr dst, int order, CvArr delta = None, \n"
+               "    double scale = 1.)\n"
+               ""},
+        { (char *)"cvTranspose", _wrap_cvTranspose, METH_VARARGS, (char *)"cvTranspose(CvArr src, CvArr dst)"},
+        { (char *)"cvCompleteSymm", _wrap_cvCompleteSymm, METH_VARARGS, (char *)"cvCompleteSymm(CvMat matrix, int LtoR = 0)"},
+        { (char *)"cvFlip", _wrap_cvFlip, METH_VARARGS, (char *)"cvFlip(CvArr src, CvArr dst = None, int flip_mode = 0)"},
+        { (char *)"cvSVD", _wrap_cvSVD, METH_VARARGS, (char *)"cvSVD(CvArr A, CvArr W, CvArr U = None, CvArr V = None, int flags = 0)"},
+        { (char *)"cvSVBkSb", _wrap_cvSVBkSb, METH_VARARGS, (char *)"cvSVBkSb(CvArr W, CvArr U, CvArr V, CvArr B, CvArr X, int flags)"},
+        { (char *)"cvInvert", _wrap_cvInvert, METH_VARARGS, (char *)"cvInvert(CvArr src, CvArr dst, int method = 0) -> double"},
+        { (char *)"cvSolve", _wrap_cvSolve, METH_VARARGS, (char *)"cvSolve(CvArr src1, CvArr src2, CvArr dst, int method = 0) -> int"},
+        { (char *)"cvDet", _wrap_cvDet, METH_VARARGS, (char *)"cvDet(CvArr mat) -> double"},
+        { (char *)"cvTrace", _wrap_cvTrace, METH_VARARGS, (char *)"cvTrace(CvArr mat) -> CvScalar"},
+        { (char *)"cvEigenVV", _wrap_cvEigenVV, METH_VARARGS, (char *)"cvEigenVV(CvArr mat, CvArr evects, CvArr evals, double eps = 0)"},
+        { (char *)"cvSetIdentity", _wrap_cvSetIdentity, METH_VARARGS, (char *)"cvSetIdentity(CvArr mat, CvScalar value = cvRealScalar(1))"},
+        { (char *)"cvRange", _wrap_cvRange, METH_VARARGS, (char *)"cvRange(CvArr mat, double start, double end) -> CvArr"},
+        { (char *)"cvCalcCovarMatrix", _wrap_cvCalcCovarMatrix, METH_VARARGS, (char *)"cvCalcCovarMatrix(CvArr vects, int count, CvArr cov_mat, CvArr avg, int flags)"},
+        { (char *)"cvCalcPCA", _wrap_cvCalcPCA, METH_VARARGS, (char *)"\n"
+               "cvCalcPCA(CvArr data, CvArr mean, CvArr eigenvals, CvArr eigenvects, \n"
+               "    int flags)\n"
+               ""},
+        { (char *)"cvProjectPCA", _wrap_cvProjectPCA, METH_VARARGS, (char *)"cvProjectPCA(CvArr data, CvArr mean, CvArr eigenvects, CvArr result)"},
+        { (char *)"cvBackProjectPCA", _wrap_cvBackProjectPCA, METH_VARARGS, (char *)"cvBackProjectPCA(CvArr proj, CvArr mean, CvArr eigenvects, CvArr result)"},
+        { (char *)"cvMahalanobis", _wrap_cvMahalanobis, METH_VARARGS, (char *)"cvMahalanobis(CvArr vec1, CvArr vec2, CvArr mat) -> double"},
+        { (char *)"cvSum", _wrap_cvSum, METH_VARARGS, (char *)"cvSum(CvArr arr) -> CvScalar"},
+        { (char *)"cvCountNonZero", _wrap_cvCountNonZero, METH_VARARGS, (char *)"cvCountNonZero(CvArr arr) -> int"},
+        { (char *)"cvAvg", _wrap_cvAvg, METH_VARARGS, (char *)"cvAvg(CvArr arr, CvArr mask = None) -> CvScalar"},
+        { (char *)"cvAvgSdv", _wrap_cvAvgSdv, METH_VARARGS, (char *)"cvAvgSdv(CvArr arr, CvScalar mean, CvScalar std_dev, CvArr mask = None)"},
+        { (char *)"cvMinMaxLoc", _wrap_cvMinMaxLoc, METH_VARARGS, (char *)"cvMinMaxLoc(CvArr arr, CvArr mask = None)"},
+        { (char *)"cvNorm", _wrap_cvNorm, METH_VARARGS, (char *)"cvNorm(CvArr arr1, CvArr arr2 = None, int norm_type = 4, CvArr mask = None) -> double"},
+        { (char *)"cvNormalize", _wrap_cvNormalize, METH_VARARGS, (char *)"\n"
+               "cvNormalize(CvArr src, CvArr dst, double a = 1., double b = 0., \n"
+               "    int norm_type = 4, CvArr mask = None)\n"
+               ""},
+        { (char *)"cvReduce", _wrap_cvReduce, METH_VARARGS, (char *)"cvReduce(CvArr src, CvArr dst, int dim = -1, int op = 0)"},
+        { (char *)"cvDFT", _wrap_cvDFT, METH_VARARGS, (char *)"cvDFT(CvArr src, CvArr dst, int flags, int nonzero_rows = 0)"},
+        { (char *)"cvMulSpectrums", _wrap_cvMulSpectrums, METH_VARARGS, (char *)"cvMulSpectrums(CvArr src1, CvArr src2, CvArr dst, int flags)"},
+        { (char *)"cvGetOptimalDFTSize", _wrap_cvGetOptimalDFTSize, METH_VARARGS, (char *)"cvGetOptimalDFTSize(int size0) -> int"},
+        { (char *)"cvDCT", _wrap_cvDCT, METH_VARARGS, (char *)"cvDCT(CvArr src, CvArr dst, int flags)"},
+        { (char *)"cvSliceLength", _wrap_cvSliceLength, METH_VARARGS, (char *)"cvSliceLength(CvSlice slice, CvSeq seq) -> int"},
+        { (char *)"cvCreateMemStorage", _wrap_cvCreateMemStorage, METH_VARARGS, (char *)"cvCreateMemStorage(int block_size = 0) -> CvMemStorage"},
+        { (char *)"cvCreateChildMemStorage", _wrap_cvCreateChildMemStorage, METH_VARARGS, (char *)"cvCreateChildMemStorage(CvMemStorage parent) -> CvMemStorage"},
+        { (char *)"cvClearMemStorage", _wrap_cvClearMemStorage, METH_VARARGS, (char *)"cvClearMemStorage(CvMemStorage storage)"},
+        { (char *)"cvSaveMemStoragePos", _wrap_cvSaveMemStoragePos, METH_VARARGS, (char *)"cvSaveMemStoragePos(CvMemStorage storage, CvMemStoragePos pos)"},
+        { (char *)"cvRestoreMemStoragePos", _wrap_cvRestoreMemStoragePos, METH_VARARGS, (char *)"cvRestoreMemStoragePos(CvMemStorage storage, CvMemStoragePos pos)"},
+        { (char *)"cvMemStorageAlloc", _wrap_cvMemStorageAlloc, METH_VARARGS, (char *)"cvMemStorageAlloc(CvMemStorage storage, size_t size) -> void"},
+        { (char *)"cvMemStorageAllocString", _wrap_cvMemStorageAllocString, METH_VARARGS, (char *)"cvMemStorageAllocString(CvMemStorage storage, char ptr, int len = -1) -> CvString"},
+        { (char *)"cvCreateSeq", _wrap_cvCreateSeq, METH_VARARGS, (char *)"cvCreateSeq(int seq_flags, int header_size, int elem_size, CvMemStorage storage) -> CvSeq"},
+        { (char *)"cvSetSeqBlockSize", _wrap_cvSetSeqBlockSize, METH_VARARGS, (char *)"cvSetSeqBlockSize(CvSeq seq, int delta_elems)"},
+        { (char *)"cvSeqPush", _wrap_cvSeqPush, METH_VARARGS, (char *)"cvSeqPush(CvSeq seq, void element = None) -> schar"},
+        { (char *)"cvSeqPushFront", _wrap_cvSeqPushFront, METH_VARARGS, (char *)"cvSeqPushFront(CvSeq seq, void element = None) -> schar"},
+        { (char *)"cvSeqPop", _wrap_cvSeqPop, METH_VARARGS, (char *)"cvSeqPop(CvSeq seq, void element = None)"},
+        { (char *)"cvSeqPopFront", _wrap_cvSeqPopFront, METH_VARARGS, (char *)"cvSeqPopFront(CvSeq seq, void element = None)"},
+        { (char *)"cvSeqPushMulti", _wrap_cvSeqPushMulti, METH_VARARGS, (char *)"cvSeqPushMulti(CvSeq seq, void elements, int count, int in_front = 0)"},
+        { (char *)"cvSeqPopMulti", _wrap_cvSeqPopMulti, METH_VARARGS, (char *)"cvSeqPopMulti(CvSeq seq, void elements, int count, int in_front = 0)"},
+        { (char *)"cvSeqInsert", _wrap_cvSeqInsert, METH_VARARGS, (char *)"cvSeqInsert(CvSeq seq, int before_index, void element = None) -> schar"},
+        { (char *)"cvSeqRemove", _wrap_cvSeqRemove, METH_VARARGS, (char *)"cvSeqRemove(CvSeq seq, int index)"},
+        { (char *)"cvClearSeq", _wrap_cvClearSeq, METH_VARARGS, (char *)"cvClearSeq(CvSeq seq)"},
+        { (char *)"cvGetSeqElem", _wrap_cvGetSeqElem, METH_VARARGS, (char *)"cvGetSeqElem(CvSeq seq, int index) -> schar"},
+        { (char *)"cvSeqElemIdx", _wrap_cvSeqElemIdx, METH_VARARGS, (char *)"cvSeqElemIdx(CvSeq seq, void element, CvSeqBlock block = None) -> int"},
+        { (char *)"cvStartAppendToSeq", _wrap_cvStartAppendToSeq, METH_VARARGS, (char *)"cvStartAppendToSeq(CvSeq seq, CvSeqWriter writer)"},
+        { (char *)"cvStartWriteSeq", _wrap_cvStartWriteSeq, METH_VARARGS, (char *)"\n"
+               "cvStartWriteSeq(int seq_flags, int header_size, int elem_size, CvMemStorage storage, \n"
+               "    CvSeqWriter writer)\n"
+               ""},
+        { (char *)"cvEndWriteSeq", _wrap_cvEndWriteSeq, METH_VARARGS, (char *)"cvEndWriteSeq(CvSeqWriter writer) -> CvSeq"},
+        { (char *)"cvFlushSeqWriter", _wrap_cvFlushSeqWriter, METH_VARARGS, (char *)"cvFlushSeqWriter(CvSeqWriter writer)"},
+        { (char *)"cvStartReadSeq", _wrap_cvStartReadSeq, METH_VARARGS, (char *)"cvStartReadSeq(CvSeq seq, CvSeqReader reader, int reverse = 0)"},
+        { (char *)"cvGetSeqReaderPos", _wrap_cvGetSeqReaderPos, METH_VARARGS, (char *)"cvGetSeqReaderPos(CvSeqReader reader) -> int"},
+        { (char *)"cvSetSeqReaderPos", _wrap_cvSetSeqReaderPos, METH_VARARGS, (char *)"cvSetSeqReaderPos(CvSeqReader reader, int index, int is_relative = 0)"},
+        { (char *)"cvMakeSeqHeaderForArray", _wrap_cvMakeSeqHeaderForArray, METH_VARARGS, (char *)"\n"
+               "cvMakeSeqHeaderForArray(int seq_type, int header_size, int elem_size, void elements, \n"
+               "    int total, CvSeq seq, CvSeqBlock block) -> CvSeq\n"
+               ""},
+        { (char *)"cvSeqSlice", _wrap_cvSeqSlice, METH_VARARGS, (char *)"\n"
+               "cvSeqSlice(CvSeq seq, CvSlice slice, CvMemStorage storage = None, \n"
+               "    int copy_data = 0) -> CvSeq\n"
+               ""},
+        { (char *)"cvCloneSeq", _wrap_cvCloneSeq, METH_VARARGS, (char *)"cvCloneSeq(CvSeq seq, CvMemStorage storage = None) -> CvSeq"},
+        { (char *)"cvSeqRemoveSlice", _wrap_cvSeqRemoveSlice, METH_VARARGS, (char *)"cvSeqRemoveSlice(CvSeq seq, CvSlice slice)"},
+        { (char *)"cvSeqInsertSlice", _wrap_cvSeqInsertSlice, METH_VARARGS, (char *)"cvSeqInsertSlice(CvSeq seq, int before_index, CvArr from_arr)"},
+        { (char *)"cvSeqSort", _wrap_cvSeqSort, METH_VARARGS, (char *)"cvSeqSort(CvSeq seq, CvCmpFunc func, void userdata = None)"},
+        { (char *)"cvSeqSearch", _wrap_cvSeqSearch, METH_VARARGS, (char *)"\n"
+               "cvSeqSearch(CvSeq seq, void elem, CvCmpFunc func, int is_sorted, \n"
+               "    int elem_idx, void userdata = None) -> schar\n"
+               ""},
+        { (char *)"cvSeqInvert", _wrap_cvSeqInvert, METH_VARARGS, (char *)"cvSeqInvert(CvSeq seq)"},
+        { (char *)"cvSeqPartition", _wrap_cvSeqPartition, METH_VARARGS, (char *)"\n"
+               "cvSeqPartition(CvSeq seq, CvMemStorage storage, CvSeq labels, CvCmpFunc is_equal, \n"
+               "    void userdata) -> int\n"
+               ""},
+        { (char *)"cvChangeSeqBlock", _wrap_cvChangeSeqBlock, METH_VARARGS, (char *)"cvChangeSeqBlock(void reader, int direction)"},
+        { (char *)"cvCreateSeqBlock", _wrap_cvCreateSeqBlock, METH_VARARGS, (char *)"cvCreateSeqBlock(CvSeqWriter writer)"},
+        { (char *)"cvCreateSet", _wrap_cvCreateSet, METH_VARARGS, (char *)"cvCreateSet(int set_flags, int header_size, int elem_size, CvMemStorage storage) -> CvSet"},
+        { (char *)"cvSetAdd", _wrap_cvSetAdd, METH_VARARGS, (char *)"cvSetAdd(CvSet set_header, CvSetElem elem = None, CvSetElem inserted_elem = None) -> int"},
+        { (char *)"cvSetNew", _wrap_cvSetNew, METH_VARARGS, (char *)"cvSetNew(CvSet set_header) -> CvSetElem"},
+        { (char *)"cvSetRemoveByPtr", _wrap_cvSetRemoveByPtr, METH_VARARGS, (char *)"cvSetRemoveByPtr(CvSet set_header, void elem)"},
+        { (char *)"cvSetRemove", _wrap_cvSetRemove, METH_VARARGS, (char *)"cvSetRemove(CvSet set_header, int index)"},
+        { (char *)"cvGetSetElem", _wrap_cvGetSetElem, METH_VARARGS, (char *)"cvGetSetElem(CvSet set_header, int index) -> CvSetElem"},
+        { (char *)"cvClearSet", _wrap_cvClearSet, METH_VARARGS, (char *)"cvClearSet(CvSet set_header)"},
+        { (char *)"cvCreateGraph", _wrap_cvCreateGraph, METH_VARARGS, (char *)"\n"
+               "cvCreateGraph(int graph_flags, int header_size, int vtx_size, int edge_size, \n"
+               "    CvMemStorage storage) -> CvGraph\n"
+               ""},
+        { (char *)"cvGraphAddVtx", _wrap_cvGraphAddVtx, METH_VARARGS, (char *)"cvGraphAddVtx(CvGraph graph, CvGraphVtx vtx = None, CvGraphVtx inserted_vtx = None) -> int"},
+        { (char *)"cvGraphRemoveVtx", _wrap_cvGraphRemoveVtx, METH_VARARGS, (char *)"cvGraphRemoveVtx(CvGraph graph, int index) -> int"},
+        { (char *)"cvGraphRemoveVtxByPtr", _wrap_cvGraphRemoveVtxByPtr, METH_VARARGS, (char *)"cvGraphRemoveVtxByPtr(CvGraph graph, CvGraphVtx vtx) -> int"},
+        { (char *)"cvGraphAddEdge", _wrap_cvGraphAddEdge, METH_VARARGS, (char *)"\n"
+               "cvGraphAddEdge(CvGraph graph, int start_idx, int end_idx, CvGraphEdge edge = None, \n"
+               "    CvGraphEdge inserted_edge = None) -> int\n"
+               ""},
+        { (char *)"cvGraphAddEdgeByPtr", _wrap_cvGraphAddEdgeByPtr, METH_VARARGS, (char *)"\n"
+               "cvGraphAddEdgeByPtr(CvGraph graph, CvGraphVtx start_vtx, CvGraphVtx end_vtx, \n"
+               "    CvGraphEdge edge = None, CvGraphEdge inserted_edge = None) -> int\n"
+               ""},
+        { (char *)"cvGraphRemoveEdge", _wrap_cvGraphRemoveEdge, METH_VARARGS, (char *)"cvGraphRemoveEdge(CvGraph graph, int start_idx, int end_idx)"},
+        { (char *)"cvGraphRemoveEdgeByPtr", _wrap_cvGraphRemoveEdgeByPtr, METH_VARARGS, (char *)"cvGraphRemoveEdgeByPtr(CvGraph graph, CvGraphVtx start_vtx, CvGraphVtx end_vtx)"},
+        { (char *)"cvFindGraphEdge", _wrap_cvFindGraphEdge, METH_VARARGS, (char *)"cvFindGraphEdge(CvGraph graph, int start_idx, int end_idx) -> CvGraphEdge"},
+        { (char *)"cvFindGraphEdgeByPtr", _wrap_cvFindGraphEdgeByPtr, METH_VARARGS, (char *)"cvFindGraphEdgeByPtr(CvGraph graph, CvGraphVtx start_vtx, CvGraphVtx end_vtx) -> CvGraphEdge"},
+        { (char *)"cvClearGraph", _wrap_cvClearGraph, METH_VARARGS, (char *)"cvClearGraph(CvGraph graph)"},
+        { (char *)"cvGraphVtxDegree", _wrap_cvGraphVtxDegree, METH_VARARGS, (char *)"cvGraphVtxDegree(CvGraph graph, int vtx_idx) -> int"},
+        { (char *)"cvGraphVtxDegreeByPtr", _wrap_cvGraphVtxDegreeByPtr, METH_VARARGS, (char *)"cvGraphVtxDegreeByPtr(CvGraph graph, CvGraphVtx vtx) -> int"},
+        { (char *)"CvGraphScanner_vtx_set", _wrap_CvGraphScanner_vtx_set, METH_VARARGS, (char *)"CvGraphScanner_vtx_set(CvGraphScanner self, CvGraphVtx vtx)"},
+        { (char *)"CvGraphScanner_vtx_get", _wrap_CvGraphScanner_vtx_get, METH_VARARGS, (char *)"CvGraphScanner_vtx_get(CvGraphScanner self) -> CvGraphVtx"},
+        { (char *)"CvGraphScanner_dst_set", _wrap_CvGraphScanner_dst_set, METH_VARARGS, (char *)"CvGraphScanner_dst_set(CvGraphScanner self, CvGraphVtx dst)"},
+        { (char *)"CvGraphScanner_dst_get", _wrap_CvGraphScanner_dst_get, METH_VARARGS, (char *)"CvGraphScanner_dst_get(CvGraphScanner self) -> CvGraphVtx"},
+        { (char *)"CvGraphScanner_edge_set", _wrap_CvGraphScanner_edge_set, METH_VARARGS, (char *)"CvGraphScanner_edge_set(CvGraphScanner self, CvGraphEdge edge)"},
+        { (char *)"CvGraphScanner_edge_get", _wrap_CvGraphScanner_edge_get, METH_VARARGS, (char *)"CvGraphScanner_edge_get(CvGraphScanner self) -> CvGraphEdge"},
+        { (char *)"CvGraphScanner_graph_set", _wrap_CvGraphScanner_graph_set, METH_VARARGS, (char *)"CvGraphScanner_graph_set(CvGraphScanner self, CvGraph graph)"},
+        { (char *)"CvGraphScanner_graph_get", _wrap_CvGraphScanner_graph_get, METH_VARARGS, (char *)"CvGraphScanner_graph_get(CvGraphScanner self) -> CvGraph"},
+        { (char *)"CvGraphScanner_stack_set", _wrap_CvGraphScanner_stack_set, METH_VARARGS, (char *)"CvGraphScanner_stack_set(CvGraphScanner self, CvSeq stack)"},
+        { (char *)"CvGraphScanner_stack_get", _wrap_CvGraphScanner_stack_get, METH_VARARGS, (char *)"CvGraphScanner_stack_get(CvGraphScanner self) -> CvSeq"},
+        { (char *)"CvGraphScanner_index_set", _wrap_CvGraphScanner_index_set, METH_VARARGS, (char *)"CvGraphScanner_index_set(CvGraphScanner self, int index)"},
+        { (char *)"CvGraphScanner_index_get", _wrap_CvGraphScanner_index_get, METH_VARARGS, (char *)"CvGraphScanner_index_get(CvGraphScanner self) -> int"},
+        { (char *)"CvGraphScanner_mask_set", _wrap_CvGraphScanner_mask_set, METH_VARARGS, (char *)"CvGraphScanner_mask_set(CvGraphScanner self, int mask)"},
+        { (char *)"CvGraphScanner_mask_get", _wrap_CvGraphScanner_mask_get, METH_VARARGS, (char *)"CvGraphScanner_mask_get(CvGraphScanner self) -> int"},
+        { (char *)"delete_CvGraphScanner", _wrap_delete_CvGraphScanner, METH_VARARGS, (char *)"delete_CvGraphScanner(CvGraphScanner self)"},
         { (char *)"CvGraphScanner_swigregister", CvGraphScanner_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvCreateGraphScanner", _wrap_cvCreateGraphScanner, METH_VARARGS, NULL},
-        { (char *)"cvNextGraphItem", _wrap_cvNextGraphItem, METH_VARARGS, NULL},
-        { (char *)"cvCloneGraph", _wrap_cvCloneGraph, METH_VARARGS, NULL},
-        { (char *)"cvLine", _wrap_cvLine, METH_VARARGS, NULL},
-        { (char *)"cvRectangle", _wrap_cvRectangle, METH_VARARGS, NULL},
-        { (char *)"cvCircle", _wrap_cvCircle, METH_VARARGS, NULL},
-        { (char *)"cvEllipse", _wrap_cvEllipse, METH_VARARGS, NULL},
-        { (char *)"cvEllipseBox", _wrap_cvEllipseBox, METH_VARARGS, NULL},
-        { (char *)"cvFillConvexPoly", _wrap_cvFillConvexPoly, METH_VARARGS, NULL},
-        { (char *)"cvFillPoly", _wrap_cvFillPoly, METH_VARARGS, NULL},
-        { (char *)"cvPolyLine", _wrap_cvPolyLine, METH_VARARGS, NULL},
-        { (char *)"cvClipLine", _wrap_cvClipLine, METH_VARARGS, NULL},
-        { (char *)"cvInitLineIterator", _wrap_cvInitLineIterator, METH_VARARGS, NULL},
-        { (char *)"CvFont_font_face_set", _wrap_CvFont_font_face_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_font_face_get", _wrap_CvFont_font_face_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_ascii_set", _wrap_CvFont_ascii_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_ascii_get", _wrap_CvFont_ascii_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_greek_set", _wrap_CvFont_greek_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_greek_get", _wrap_CvFont_greek_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_cyrillic_set", _wrap_CvFont_cyrillic_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_cyrillic_get", _wrap_CvFont_cyrillic_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_hscale_set", _wrap_CvFont_hscale_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_hscale_get", _wrap_CvFont_hscale_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_vscale_set", _wrap_CvFont_vscale_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_vscale_get", _wrap_CvFont_vscale_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_shear_set", _wrap_CvFont_shear_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_shear_get", _wrap_CvFont_shear_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_thickness_set", _wrap_CvFont_thickness_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_thickness_get", _wrap_CvFont_thickness_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_dx_set", _wrap_CvFont_dx_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_dx_get", _wrap_CvFont_dx_get, METH_VARARGS, NULL},
-        { (char *)"CvFont_line_type_set", _wrap_CvFont_line_type_set, METH_VARARGS, NULL},
-        { (char *)"CvFont_line_type_get", _wrap_CvFont_line_type_get, METH_VARARGS, NULL},
-        { (char *)"new_CvFont", _wrap_new_CvFont, METH_VARARGS, NULL},
-        { (char *)"delete_CvFont", _wrap_delete_CvFont, METH_VARARGS, NULL},
+        { (char *)"cvCreateGraphScanner", _wrap_cvCreateGraphScanner, METH_VARARGS, (char *)"cvCreateGraphScanner(CvGraph graph, CvGraphVtx vtx = None, int mask = -1) -> CvGraphScanner"},
+        { (char *)"cvNextGraphItem", _wrap_cvNextGraphItem, METH_VARARGS, (char *)"cvNextGraphItem(CvGraphScanner scanner) -> int"},
+        { (char *)"cvCloneGraph", _wrap_cvCloneGraph, METH_VARARGS, (char *)"cvCloneGraph(CvGraph graph, CvMemStorage storage) -> CvGraph"},
+        { (char *)"cvLine", _wrap_cvLine, METH_VARARGS, (char *)"\n"
+               "cvLine(CvArr img, CvPoint pt1, CvPoint pt2, CvScalar color, \n"
+               "    int thickness = 1, int line_type = 8, int shift = 0)\n"
+               ""},
+        { (char *)"cvRectangle", _wrap_cvRectangle, METH_VARARGS, (char *)"\n"
+               "cvRectangle(CvArr img, CvPoint pt1, CvPoint pt2, CvScalar color, \n"
+               "    int thickness = 1, int line_type = 8, int shift = 0)\n"
+               ""},
+        { (char *)"cvCircle", _wrap_cvCircle, METH_VARARGS, (char *)"\n"
+               "cvCircle(CvArr img, CvPoint center, int radius, CvScalar color, \n"
+               "    int thickness = 1, int line_type = 8, int shift = 0)\n"
+               ""},
+        { (char *)"cvEllipse", _wrap_cvEllipse, METH_VARARGS, (char *)"\n"
+               "cvEllipse(CvArr img, CvPoint center, CvSize axes, double angle, \n"
+               "    double start_angle, double end_angle, CvScalar color, \n"
+               "    int thickness = 1, int line_type = 8, \n"
+               "    int shift = 0)\n"
+               ""},
+        { (char *)"cvEllipseBox", _wrap_cvEllipseBox, METH_VARARGS, (char *)"\n"
+               "cvEllipseBox(CvArr img, CvBox2D box, CvScalar color, int thickness = 1, \n"
+               "    int line_type = 8, int shift = 0)\n"
+               ""},
+        { (char *)"cvFillConvexPoly", _wrap_cvFillConvexPoly, METH_VARARGS, (char *)"\n"
+               "cvFillConvexPoly(CvArr img, CvPoint pts, CvScalar color, int line_type = 8, \n"
+               "    int shift = 0)\n"
+               ""},
+        { (char *)"cvFillPoly", _wrap_cvFillPoly, METH_VARARGS, (char *)"\n"
+               "cvFillPoly(CvArr img, CvPoint pts, CvScalar color, int line_type = 8, \n"
+               "    int shift = 0)\n"
+               ""},
+        { (char *)"cvPolyLine", _wrap_cvPolyLine, METH_VARARGS, (char *)"\n"
+               "cvPolyLine(CvArr img, CvPoint pts, int is_closed, CvScalar color, \n"
+               "    int thickness = 1, int line_type = 8, int shift = 0)\n"
+               ""},
+        { (char *)"cvClipLine", _wrap_cvClipLine, METH_VARARGS, (char *)"cvClipLine(CvSize img_size, CvPoint pt1, CvPoint pt2) -> int"},
+        { (char *)"cvInitLineIterator", _wrap_cvInitLineIterator, METH_VARARGS, (char *)"\n"
+               "cvInitLineIterator(CvArr image, CvPoint pt1, CvPoint pt2, CvLineIterator line_iterator, \n"
+               "    int connectivity = 8, int left_to_right = 0) -> int\n"
+               ""},
+        { (char *)"CvFont_font_face_set", _wrap_CvFont_font_face_set, METH_VARARGS, (char *)"CvFont_font_face_set(CvFont self, int font_face)"},
+        { (char *)"CvFont_font_face_get", _wrap_CvFont_font_face_get, METH_VARARGS, (char *)"CvFont_font_face_get(CvFont self) -> int"},
+        { (char *)"CvFont_ascii_set", _wrap_CvFont_ascii_set, METH_VARARGS, (char *)"CvFont_ascii_set(CvFont self, int ascii)"},
+        { (char *)"CvFont_ascii_get", _wrap_CvFont_ascii_get, METH_VARARGS, (char *)"CvFont_ascii_get(CvFont self) -> int"},
+        { (char *)"CvFont_greek_set", _wrap_CvFont_greek_set, METH_VARARGS, (char *)"CvFont_greek_set(CvFont self, int greek)"},
+        { (char *)"CvFont_greek_get", _wrap_CvFont_greek_get, METH_VARARGS, (char *)"CvFont_greek_get(CvFont self) -> int"},
+        { (char *)"CvFont_cyrillic_set", _wrap_CvFont_cyrillic_set, METH_VARARGS, (char *)"CvFont_cyrillic_set(CvFont self, int cyrillic)"},
+        { (char *)"CvFont_cyrillic_get", _wrap_CvFont_cyrillic_get, METH_VARARGS, (char *)"CvFont_cyrillic_get(CvFont self) -> int"},
+        { (char *)"CvFont_hscale_set", _wrap_CvFont_hscale_set, METH_VARARGS, (char *)"CvFont_hscale_set(CvFont self, float hscale)"},
+        { (char *)"CvFont_hscale_get", _wrap_CvFont_hscale_get, METH_VARARGS, (char *)"CvFont_hscale_get(CvFont self) -> float"},
+        { (char *)"CvFont_vscale_set", _wrap_CvFont_vscale_set, METH_VARARGS, (char *)"CvFont_vscale_set(CvFont self, float vscale)"},
+        { (char *)"CvFont_vscale_get", _wrap_CvFont_vscale_get, METH_VARARGS, (char *)"CvFont_vscale_get(CvFont self) -> float"},
+        { (char *)"CvFont_shear_set", _wrap_CvFont_shear_set, METH_VARARGS, (char *)"CvFont_shear_set(CvFont self, float shear)"},
+        { (char *)"CvFont_shear_get", _wrap_CvFont_shear_get, METH_VARARGS, (char *)"CvFont_shear_get(CvFont self) -> float"},
+        { (char *)"CvFont_thickness_set", _wrap_CvFont_thickness_set, METH_VARARGS, (char *)"CvFont_thickness_set(CvFont self, int thickness)"},
+        { (char *)"CvFont_thickness_get", _wrap_CvFont_thickness_get, METH_VARARGS, (char *)"CvFont_thickness_get(CvFont self) -> int"},
+        { (char *)"CvFont_dx_set", _wrap_CvFont_dx_set, METH_VARARGS, (char *)"CvFont_dx_set(CvFont self, float dx)"},
+        { (char *)"CvFont_dx_get", _wrap_CvFont_dx_get, METH_VARARGS, (char *)"CvFont_dx_get(CvFont self) -> float"},
+        { (char *)"CvFont_line_type_set", _wrap_CvFont_line_type_set, METH_VARARGS, (char *)"CvFont_line_type_set(CvFont self, int line_type)"},
+        { (char *)"CvFont_line_type_get", _wrap_CvFont_line_type_get, METH_VARARGS, (char *)"CvFont_line_type_get(CvFont self) -> int"},
+        { (char *)"new_CvFont", _wrap_new_CvFont, METH_VARARGS, (char *)"new_CvFont() -> CvFont"},
+        { (char *)"delete_CvFont", _wrap_delete_CvFont, METH_VARARGS, (char *)"delete_CvFont(CvFont self)"},
         { (char *)"CvFont_swigregister", CvFont_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvInitFont", _wrap_cvInitFont, METH_VARARGS, NULL},
-        { (char *)"cvFont", _wrap_cvFont, METH_VARARGS, NULL},
-        { (char *)"cvPutText", _wrap_cvPutText, METH_VARARGS, NULL},
-        { (char *)"cvGetTextSize", _wrap_cvGetTextSize, METH_VARARGS, NULL},
-        { (char *)"cvColorToScalar", _wrap_cvColorToScalar, METH_VARARGS, NULL},
-        { (char *)"cvEllipse2Poly", _wrap_cvEllipse2Poly, METH_VARARGS, NULL},
-        { (char *)"cvDrawContours", _wrap_cvDrawContours, METH_VARARGS, NULL},
-        { (char *)"cvLUT", _wrap_cvLUT, METH_VARARGS, NULL},
-        { (char *)"CvTreeNodeIterator_node_set", _wrap_CvTreeNodeIterator_node_set, METH_VARARGS, NULL},
-        { (char *)"CvTreeNodeIterator_node_get", _wrap_CvTreeNodeIterator_node_get, METH_VARARGS, NULL},
-        { (char *)"CvTreeNodeIterator_level_set", _wrap_CvTreeNodeIterator_level_set, METH_VARARGS, NULL},
-        { (char *)"CvTreeNodeIterator_level_get", _wrap_CvTreeNodeIterator_level_get, METH_VARARGS, NULL},
-        { (char *)"CvTreeNodeIterator_max_level_set", _wrap_CvTreeNodeIterator_max_level_set, METH_VARARGS, NULL},
-        { (char *)"CvTreeNodeIterator_max_level_get", _wrap_CvTreeNodeIterator_max_level_get, METH_VARARGS, NULL},
-        { (char *)"new_CvTreeNodeIterator", _wrap_new_CvTreeNodeIterator, METH_VARARGS, NULL},
-        { (char *)"delete_CvTreeNodeIterator", _wrap_delete_CvTreeNodeIterator, METH_VARARGS, NULL},
+        { (char *)"cvInitFont", _wrap_cvInitFont, METH_VARARGS, (char *)"\n"
+               "cvInitFont(CvFont font, double hscale, double vscale, double shear = 0, \n"
+               "    int thickness = 1, int line_type = 8)\n"
+               ""},
+        { (char *)"cvFont", _wrap_cvFont, METH_VARARGS, (char *)"cvFont(double scale, int thickness = 1) -> CvFont"},
+        { (char *)"cvPutText", _wrap_cvPutText, METH_VARARGS, (char *)"cvPutText(CvArr img, char text, CvPoint org, CvFont font, CvScalar color)"},
+        { (char *)"cvGetTextSize", _wrap_cvGetTextSize, METH_VARARGS, (char *)"cvGetTextSize(char text_string, CvFont font)"},
+        { (char *)"cvColorToScalar", _wrap_cvColorToScalar, METH_VARARGS, (char *)"cvColorToScalar(double packed_color, int arrtype) -> CvScalar"},
+        { (char *)"cvEllipse2Poly", _wrap_cvEllipse2Poly, METH_VARARGS, (char *)"\n"
+               "cvEllipse2Poly(CvPoint center, CvSize axes, int angle, int arc_start, \n"
+               "    int arc_end, CvPoint pts, int delta) -> int\n"
+               ""},
+        { (char *)"cvDrawContours", _wrap_cvDrawContours, METH_VARARGS, (char *)"\n"
+               "cvDrawContours(CvArr img, CvSeq contour, CvScalar external_color, \n"
+               "    CvScalar hole_color, int max_level, int thickness = 1, \n"
+               "    int line_type = 8, CvPoint offset = cvPoint(0,0))\n"
+               ""},
+        { (char *)"cvLUT", _wrap_cvLUT, METH_VARARGS, (char *)"cvLUT(CvArr src, CvArr dst, CvArr lut)"},
+        { (char *)"CvTreeNodeIterator_node_set", _wrap_CvTreeNodeIterator_node_set, METH_VARARGS, (char *)"CvTreeNodeIterator_node_set(CvTreeNodeIterator self, void node)"},
+        { (char *)"CvTreeNodeIterator_node_get", _wrap_CvTreeNodeIterator_node_get, METH_VARARGS, (char *)"CvTreeNodeIterator_node_get(CvTreeNodeIterator self) -> void"},
+        { (char *)"CvTreeNodeIterator_level_set", _wrap_CvTreeNodeIterator_level_set, METH_VARARGS, (char *)"CvTreeNodeIterator_level_set(CvTreeNodeIterator self, int level)"},
+        { (char *)"CvTreeNodeIterator_level_get", _wrap_CvTreeNodeIterator_level_get, METH_VARARGS, (char *)"CvTreeNodeIterator_level_get(CvTreeNodeIterator self) -> int"},
+        { (char *)"CvTreeNodeIterator_max_level_set", _wrap_CvTreeNodeIterator_max_level_set, METH_VARARGS, (char *)"CvTreeNodeIterator_max_level_set(CvTreeNodeIterator self, int max_level)"},
+        { (char *)"CvTreeNodeIterator_max_level_get", _wrap_CvTreeNodeIterator_max_level_get, METH_VARARGS, (char *)"CvTreeNodeIterator_max_level_get(CvTreeNodeIterator self) -> int"},
+        { (char *)"new_CvTreeNodeIterator", _wrap_new_CvTreeNodeIterator, METH_VARARGS, (char *)"new_CvTreeNodeIterator() -> CvTreeNodeIterator"},
+        { (char *)"delete_CvTreeNodeIterator", _wrap_delete_CvTreeNodeIterator, METH_VARARGS, (char *)"delete_CvTreeNodeIterator(CvTreeNodeIterator self)"},
         { (char *)"CvTreeNodeIterator_swigregister", CvTreeNodeIterator_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvInitTreeNodeIterator", _wrap_cvInitTreeNodeIterator, METH_VARARGS, NULL},
-        { (char *)"cvNextTreeNode", _wrap_cvNextTreeNode, METH_VARARGS, NULL},
-        { (char *)"cvPrevTreeNode", _wrap_cvPrevTreeNode, METH_VARARGS, NULL},
-        { (char *)"cvInsertNodeIntoTree", _wrap_cvInsertNodeIntoTree, METH_VARARGS, NULL},
-        { (char *)"cvRemoveNodeFromTree", _wrap_cvRemoveNodeFromTree, METH_VARARGS, NULL},
-        { (char *)"cvTreeToNodeSeq", _wrap_cvTreeToNodeSeq, METH_VARARGS, NULL},
-        { (char *)"cvKMeans2", _wrap_cvKMeans2, METH_VARARGS, NULL},
-        { (char *)"cvRegisterModule", _wrap_cvRegisterModule, METH_VARARGS, NULL},
-        { (char *)"cvUseOptimized", _wrap_cvUseOptimized, METH_VARARGS, NULL},
-        { (char *)"cvGetModuleInfo", _wrap_cvGetModuleInfo, METH_VARARGS, NULL},
-        { (char *)"cvGetErrStatus", _wrap_cvGetErrStatus, METH_VARARGS, NULL},
-        { (char *)"cvSetErrStatus", _wrap_cvSetErrStatus, METH_VARARGS, NULL},
-        { (char *)"cvGetErrMode", _wrap_cvGetErrMode, METH_VARARGS, NULL},
-        { (char *)"cvSetErrMode", _wrap_cvSetErrMode, METH_VARARGS, NULL},
-        { (char *)"cvError", _wrap_cvError, METH_VARARGS, NULL},
-        { (char *)"cvErrorStr", _wrap_cvErrorStr, METH_VARARGS, NULL},
-        { (char *)"cvGetErrInfo", _wrap_cvGetErrInfo, METH_VARARGS, NULL},
-        { (char *)"cvErrorFromIppStatus", _wrap_cvErrorFromIppStatus, METH_VARARGS, NULL},
-        { (char *)"cvRedirectError", _wrap_cvRedirectError, METH_VARARGS, NULL},
-        { (char *)"cvNulDevReport", _wrap_cvNulDevReport, METH_VARARGS, NULL},
-        { (char *)"cvStdErrReport", _wrap_cvStdErrReport, METH_VARARGS, NULL},
-        { (char *)"cvGuiBoxReport", _wrap_cvGuiBoxReport, METH_VARARGS, NULL},
-        { (char *)"cvSetMemoryManager", _wrap_cvSetMemoryManager, METH_VARARGS, NULL},
-        { (char *)"cvSetIPLAllocators", _wrap_cvSetIPLAllocators, METH_VARARGS, NULL},
-        { (char *)"cvOpenFileStorage", _wrap_cvOpenFileStorage, METH_VARARGS, NULL},
-        { (char *)"cvReleaseFileStorage", _wrap_cvReleaseFileStorage, METH_VARARGS, NULL},
-        { (char *)"cvAttrValue", _wrap_cvAttrValue, METH_VARARGS, NULL},
-        { (char *)"cvStartWriteStruct", _wrap_cvStartWriteStruct, METH_VARARGS, NULL},
-        { (char *)"cvEndWriteStruct", _wrap_cvEndWriteStruct, METH_VARARGS, NULL},
-        { (char *)"cvWriteInt", _wrap_cvWriteInt, METH_VARARGS, NULL},
-        { (char *)"cvWriteReal", _wrap_cvWriteReal, METH_VARARGS, NULL},
-        { (char *)"cvWriteString", _wrap_cvWriteString, METH_VARARGS, NULL},
-        { (char *)"cvWriteComment", _wrap_cvWriteComment, METH_VARARGS, NULL},
-        { (char *)"cvWrite", _wrap_cvWrite, METH_VARARGS, NULL},
-        { (char *)"cvStartNextStream", _wrap_cvStartNextStream, METH_VARARGS, NULL},
-        { (char *)"cvWriteRawData", _wrap_cvWriteRawData, METH_VARARGS, NULL},
-        { (char *)"cvGetHashedKey", _wrap_cvGetHashedKey, METH_VARARGS, NULL},
-        { (char *)"cvGetRootFileNode", _wrap_cvGetRootFileNode, METH_VARARGS, NULL},
-        { (char *)"cvGetFileNode", _wrap_cvGetFileNode, METH_VARARGS, NULL},
-        { (char *)"cvGetFileNodeByName", _wrap_cvGetFileNodeByName, METH_VARARGS, NULL},
-        { (char *)"cvReadInt", _wrap_cvReadInt, METH_VARARGS, NULL},
-        { (char *)"cvReadIntByName", _wrap_cvReadIntByName, METH_VARARGS, NULL},
-        { (char *)"cvReadReal", _wrap_cvReadReal, METH_VARARGS, NULL},
-        { (char *)"cvReadRealByName", _wrap_cvReadRealByName, METH_VARARGS, NULL},
-        { (char *)"cvReadString", _wrap_cvReadString, METH_VARARGS, NULL},
-        { (char *)"cvReadStringByName", _wrap_cvReadStringByName, METH_VARARGS, NULL},
-        { (char *)"cvRead", _wrap_cvRead, METH_VARARGS, NULL},
-        { (char *)"cvReadByName", _wrap_cvReadByName, METH_VARARGS, NULL},
-        { (char *)"cvStartReadRawData", _wrap_cvStartReadRawData, METH_VARARGS, NULL},
-        { (char *)"cvReadRawDataSlice", _wrap_cvReadRawDataSlice, METH_VARARGS, NULL},
-        { (char *)"cvReadRawData", _wrap_cvReadRawData, METH_VARARGS, NULL},
-        { (char *)"cvWriteFileNode", _wrap_cvWriteFileNode, METH_VARARGS, NULL},
-        { (char *)"cvGetFileNodeName", _wrap_cvGetFileNodeName, METH_VARARGS, NULL},
-        { (char *)"cvRegisterType", _wrap_cvRegisterType, METH_VARARGS, NULL},
-        { (char *)"cvUnregisterType", _wrap_cvUnregisterType, METH_VARARGS, NULL},
-        { (char *)"cvFirstType", _wrap_cvFirstType, METH_VARARGS, NULL},
-        { (char *)"cvFindType", _wrap_cvFindType, METH_VARARGS, NULL},
-        { (char *)"cvTypeOf", _wrap_cvTypeOf, METH_VARARGS, NULL},
-        { (char *)"cvClone", _wrap_cvClone, METH_VARARGS, NULL},
-        { (char *)"cvSave", _wrap_cvSave, METH_VARARGS, NULL},
-        { (char *)"cvLoad", _wrap_cvLoad, METH_VARARGS, NULL},
-        { (char *)"cvGetTickCount", _wrap_cvGetTickCount, METH_VARARGS, NULL},
-        { (char *)"cvGetTickFrequency", _wrap_cvGetTickFrequency, METH_VARARGS, NULL},
-        { (char *)"cvGetNumThreads", _wrap_cvGetNumThreads, METH_VARARGS, NULL},
-        { (char *)"cvSetNumThreads", _wrap_cvSetNumThreads, METH_VARARGS, NULL},
-        { (char *)"cvGetThreadNum", _wrap_cvGetThreadNum, METH_VARARGS, NULL},
-        { (char *)"cvSetImageIOFunctions", _wrap_cvSetImageIOFunctions, METH_VARARGS, NULL},
-        { (char *)"new_CvImage", _wrap_new_CvImage, METH_VARARGS, NULL},
-        { (char *)"delete_CvImage", _wrap_delete_CvImage, METH_VARARGS, NULL},
-        { (char *)"CvImage_clone", _wrap_CvImage_clone, METH_VARARGS, NULL},
-        { (char *)"CvImage_create", _wrap_CvImage_create, METH_VARARGS, NULL},
-        { (char *)"CvImage_release", _wrap_CvImage_release, METH_VARARGS, NULL},
-        { (char *)"CvImage_clear", _wrap_CvImage_clear, METH_VARARGS, NULL},
-        { (char *)"CvImage_attach", _wrap_CvImage_attach, METH_VARARGS, NULL},
-        { (char *)"CvImage_detach", _wrap_CvImage_detach, METH_VARARGS, NULL},
-        { (char *)"CvImage_load", _wrap_CvImage_load, METH_VARARGS, NULL},
-        { (char *)"CvImage_read", _wrap_CvImage_read, METH_VARARGS, NULL},
-        { (char *)"CvImage_save", _wrap_CvImage_save, METH_VARARGS, NULL},
-        { (char *)"CvImage_write", _wrap_CvImage_write, METH_VARARGS, NULL},
-        { (char *)"CvImage_show", _wrap_CvImage_show, METH_VARARGS, NULL},
-        { (char *)"CvImage_is_valid", _wrap_CvImage_is_valid, METH_VARARGS, NULL},
-        { (char *)"CvImage_width", _wrap_CvImage_width, METH_VARARGS, NULL},
-        { (char *)"CvImage_height", _wrap_CvImage_height, METH_VARARGS, NULL},
-        { (char *)"CvImage_size", _wrap_CvImage_size, METH_VARARGS, NULL},
-        { (char *)"CvImage_roi_size", _wrap_CvImage_roi_size, METH_VARARGS, NULL},
-        { (char *)"CvImage_roi", _wrap_CvImage_roi, METH_VARARGS, NULL},
-        { (char *)"CvImage_coi", _wrap_CvImage_coi, METH_VARARGS, NULL},
-        { (char *)"CvImage_set_roi", _wrap_CvImage_set_roi, METH_VARARGS, NULL},
-        { (char *)"CvImage_reset_roi", _wrap_CvImage_reset_roi, METH_VARARGS, NULL},
-        { (char *)"CvImage_set_coi", _wrap_CvImage_set_coi, METH_VARARGS, NULL},
-        { (char *)"CvImage_depth", _wrap_CvImage_depth, METH_VARARGS, NULL},
-        { (char *)"CvImage_channels", _wrap_CvImage_channels, METH_VARARGS, NULL},
-        { (char *)"CvImage_pix_size", _wrap_CvImage_pix_size, METH_VARARGS, NULL},
-        { (char *)"CvImage_data", _wrap_CvImage_data, METH_VARARGS, NULL},
-        { (char *)"CvImage_step", _wrap_CvImage_step, METH_VARARGS, NULL},
-        { (char *)"CvImage_origin", _wrap_CvImage_origin, METH_VARARGS, NULL},
-        { (char *)"CvImage_roi_row", _wrap_CvImage_roi_row, METH_VARARGS, NULL},
-        { (char *)"CvImage_asIplImage", _wrap_CvImage_asIplImage, METH_VARARGS, NULL},
+        { (char *)"cvInitTreeNodeIterator", _wrap_cvInitTreeNodeIterator, METH_VARARGS, (char *)"cvInitTreeNodeIterator(CvTreeNodeIterator tree_iterator, void first, int max_level)"},
+        { (char *)"cvNextTreeNode", _wrap_cvNextTreeNode, METH_VARARGS, (char *)"cvNextTreeNode(CvTreeNodeIterator tree_iterator) -> void"},
+        { (char *)"cvPrevTreeNode", _wrap_cvPrevTreeNode, METH_VARARGS, (char *)"cvPrevTreeNode(CvTreeNodeIterator tree_iterator) -> void"},
+        { (char *)"cvInsertNodeIntoTree", _wrap_cvInsertNodeIntoTree, METH_VARARGS, (char *)"cvInsertNodeIntoTree(void node, void parent, void frame)"},
+        { (char *)"cvRemoveNodeFromTree", _wrap_cvRemoveNodeFromTree, METH_VARARGS, (char *)"cvRemoveNodeFromTree(void node, void frame)"},
+        { (char *)"cvTreeToNodeSeq", _wrap_cvTreeToNodeSeq, METH_VARARGS, (char *)"cvTreeToNodeSeq(void first, int header_size, CvMemStorage storage) -> CvSeq"},
+        { (char *)"cvKMeans2", _wrap_cvKMeans2, METH_VARARGS, (char *)"\n"
+               "cvKMeans2(CvArr samples, int cluster_count, CvArr labels, CvTermCriteria termcrit, \n"
+               "    int attempts = 1, CvRNG rng = None, \n"
+               "    int flags = 0, CvArr _centers = None, \n"
+               "    double compactness = None) -> int\n"
+               ""},
+        { (char *)"cvRegisterModule", _wrap_cvRegisterModule, METH_VARARGS, (char *)"cvRegisterModule(CvModuleInfo module_info) -> int"},
+        { (char *)"cvUseOptimized", _wrap_cvUseOptimized, METH_VARARGS, (char *)"cvUseOptimized(int on_off) -> int"},
+        { (char *)"cvGetModuleInfo", _wrap_cvGetModuleInfo, METH_VARARGS, (char *)"cvGetModuleInfo(char module_name, char version, char loaded_addon_plugins)"},
+        { (char *)"cvGetErrStatus", _wrap_cvGetErrStatus, METH_VARARGS, (char *)"cvGetErrStatus() -> int"},
+        { (char *)"cvSetErrStatus", _wrap_cvSetErrStatus, METH_VARARGS, (char *)"cvSetErrStatus(int status)"},
+        { (char *)"cvGetErrMode", _wrap_cvGetErrMode, METH_VARARGS, (char *)"cvGetErrMode() -> int"},
+        { (char *)"cvSetErrMode", _wrap_cvSetErrMode, METH_VARARGS, (char *)"cvSetErrMode(int mode) -> int"},
+        { (char *)"cvError", _wrap_cvError, METH_VARARGS, (char *)"\n"
+               "cvError(int status, char func_name, char err_msg, char file_name, \n"
+               "    int line)\n"
+               ""},
+        { (char *)"cvErrorStr", _wrap_cvErrorStr, METH_VARARGS, (char *)"cvErrorStr(int status) -> char"},
+        { (char *)"cvGetErrInfo", _wrap_cvGetErrInfo, METH_VARARGS, (char *)"\n"
+               "cvGetErrInfo(char errcode_desc, char description, char filename, \n"
+               "    int line) -> int\n"
+               ""},
+        { (char *)"cvErrorFromIppStatus", _wrap_cvErrorFromIppStatus, METH_VARARGS, (char *)"cvErrorFromIppStatus(int ipp_status) -> int"},
+        { (char *)"cvRedirectError", _wrap_cvRedirectError, METH_VARARGS, (char *)"\n"
+               "cvRedirectError(CvErrorCallback error_handler, void userdata = None, \n"
+               "    void prev_userdata = None) -> CvErrorCallback\n"
+               ""},
+        { (char *)"cvNulDevReport", _wrap_cvNulDevReport, METH_VARARGS, (char *)"\n"
+               "cvNulDevReport(int status, char func_name, char err_msg, char file_name, \n"
+               "    int line, void userdata) -> int\n"
+               ""},
+        { (char *)"cvStdErrReport", _wrap_cvStdErrReport, METH_VARARGS, (char *)"\n"
+               "cvStdErrReport(int status, char func_name, char err_msg, char file_name, \n"
+               "    int line, void userdata) -> int\n"
+               ""},
+        { (char *)"cvGuiBoxReport", _wrap_cvGuiBoxReport, METH_VARARGS, (char *)"\n"
+               "cvGuiBoxReport(int status, char func_name, char err_msg, char file_name, \n"
+               "    int line, void userdata) -> int\n"
+               ""},
+        { (char *)"cvSetMemoryManager", _wrap_cvSetMemoryManager, METH_VARARGS, (char *)"\n"
+               "cvSetMemoryManager(CvAllocFunc alloc_func = None, CvFreeFunc free_func = None, \n"
+               "    void userdata = None)\n"
+               ""},
+        { (char *)"cvSetIPLAllocators", _wrap_cvSetIPLAllocators, METH_VARARGS, (char *)"\n"
+               "cvSetIPLAllocators(Cv_iplCreateImageHeader create_header, Cv_iplAllocateImageData allocate_data, \n"
+               "    Cv_iplDeallocate deallocate, \n"
+               "    Cv_iplCreateROI create_roi, Cv_iplCloneImage clone_image)\n"
+               ""},
+        { (char *)"cvOpenFileStorage", _wrap_cvOpenFileStorage, METH_VARARGS, (char *)"cvOpenFileStorage(char filename, CvMemStorage memstorage, int flags) -> CvFileStorage"},
+        { (char *)"cvReleaseFileStorage", _wrap_cvReleaseFileStorage, METH_VARARGS, (char *)"cvReleaseFileStorage(CvFileStorage fs)"},
+        { (char *)"cvAttrValue", _wrap_cvAttrValue, METH_VARARGS, (char *)"cvAttrValue(CvAttrList attr, char attr_name) -> char"},
+        { (char *)"cvStartWriteStruct", _wrap_cvStartWriteStruct, METH_VARARGS, (char *)"\n"
+               "cvStartWriteStruct(CvFileStorage fs, char name, int struct_flags, char type_name = None, \n"
+               "    CvAttrList attributes = cvAttrList())\n"
+               ""},
+        { (char *)"cvEndWriteStruct", _wrap_cvEndWriteStruct, METH_VARARGS, (char *)"cvEndWriteStruct(CvFileStorage fs)"},
+        { (char *)"cvWriteInt", _wrap_cvWriteInt, METH_VARARGS, (char *)"cvWriteInt(CvFileStorage fs, char name, int value)"},
+        { (char *)"cvWriteReal", _wrap_cvWriteReal, METH_VARARGS, (char *)"cvWriteReal(CvFileStorage fs, char name, double value)"},
+        { (char *)"cvWriteString", _wrap_cvWriteString, METH_VARARGS, (char *)"cvWriteString(CvFileStorage fs, char name, char str, int quote = 0)"},
+        { (char *)"cvWriteComment", _wrap_cvWriteComment, METH_VARARGS, (char *)"cvWriteComment(CvFileStorage fs, char comment, int eol_comment)"},
+        { (char *)"cvWrite", _wrap_cvWrite, METH_VARARGS, (char *)"cvWrite(CvFileStorage fs, char name, void ptr, CvAttrList attributes = cvAttrList())"},
+        { (char *)"cvStartNextStream", _wrap_cvStartNextStream, METH_VARARGS, (char *)"cvStartNextStream(CvFileStorage fs)"},
+        { (char *)"cvWriteRawData", _wrap_cvWriteRawData, METH_VARARGS, (char *)"cvWriteRawData(CvFileStorage fs, void src, int len, char dt)"},
+        { (char *)"cvGetHashedKey", _wrap_cvGetHashedKey, METH_VARARGS, (char *)"cvGetHashedKey(CvFileStorage fs, char name, int len = -1, int create_missing = 0) -> CvStringHashNode"},
+        { (char *)"cvGetRootFileNode", _wrap_cvGetRootFileNode, METH_VARARGS, (char *)"cvGetRootFileNode(CvFileStorage fs, int stream_index = 0) -> CvFileNode"},
+        { (char *)"cvGetFileNode", _wrap_cvGetFileNode, METH_VARARGS, (char *)"\n"
+               "cvGetFileNode(CvFileStorage fs, CvFileNode map, CvStringHashNode key, \n"
+               "    int create_missing = 0) -> CvFileNode\n"
+               ""},
+        { (char *)"cvGetFileNodeByName", _wrap_cvGetFileNodeByName, METH_VARARGS, (char *)"cvGetFileNodeByName(CvFileStorage fs, CvFileNode map, char name) -> CvFileNode"},
+        { (char *)"cvReadInt", _wrap_cvReadInt, METH_VARARGS, (char *)"cvReadInt(CvFileNode node, int default_value = 0) -> int"},
+        { (char *)"cvReadIntByName", _wrap_cvReadIntByName, METH_VARARGS, (char *)"cvReadIntByName(CvFileStorage fs, CvFileNode map, char name, int default_value = 0) -> int"},
+        { (char *)"cvReadReal", _wrap_cvReadReal, METH_VARARGS, (char *)"cvReadReal(CvFileNode node, double default_value = 0.) -> double"},
+        { (char *)"cvReadRealByName", _wrap_cvReadRealByName, METH_VARARGS, (char *)"cvReadRealByName(CvFileStorage fs, CvFileNode map, char name, double default_value = 0.) -> double"},
+        { (char *)"cvReadString", _wrap_cvReadString, METH_VARARGS, (char *)"cvReadString(CvFileNode node, char default_value = None) -> char"},
+        { (char *)"cvReadStringByName", _wrap_cvReadStringByName, METH_VARARGS, (char *)"cvReadStringByName(CvFileStorage fs, CvFileNode map, char name, char default_value = None) -> char"},
+        { (char *)"cvRead", _wrap_cvRead, METH_VARARGS, (char *)"cvRead(CvFileStorage fs, CvFileNode node, CvAttrList attributes = None) -> void"},
+        { (char *)"cvReadByName", _wrap_cvReadByName, METH_VARARGS, (char *)"cvReadByName(CvFileStorage fs, CvFileNode map, char name, CvAttrList attributes = None) -> void"},
+        { (char *)"cvStartReadRawData", _wrap_cvStartReadRawData, METH_VARARGS, (char *)"cvStartReadRawData(CvFileStorage fs, CvFileNode src, CvSeqReader reader)"},
+        { (char *)"cvReadRawDataSlice", _wrap_cvReadRawDataSlice, METH_VARARGS, (char *)"\n"
+               "cvReadRawDataSlice(CvFileStorage fs, CvSeqReader reader, int count, void dst, \n"
+               "    char dt)\n"
+               ""},
+        { (char *)"cvReadRawData", _wrap_cvReadRawData, METH_VARARGS, (char *)"cvReadRawData(CvFileStorage fs, CvFileNode src, void dst, char dt)"},
+        { (char *)"cvWriteFileNode", _wrap_cvWriteFileNode, METH_VARARGS, (char *)"\n"
+               "cvWriteFileNode(CvFileStorage fs, char new_node_name, CvFileNode node, \n"
+               "    int embed)\n"
+               ""},
+        { (char *)"cvGetFileNodeName", _wrap_cvGetFileNodeName, METH_VARARGS, (char *)"cvGetFileNodeName(CvFileNode node) -> char"},
+        { (char *)"cvRegisterType", _wrap_cvRegisterType, METH_VARARGS, (char *)"cvRegisterType(CvTypeInfo info)"},
+        { (char *)"cvUnregisterType", _wrap_cvUnregisterType, METH_VARARGS, (char *)"cvUnregisterType(char type_name)"},
+        { (char *)"cvFirstType", _wrap_cvFirstType, METH_VARARGS, (char *)"cvFirstType() -> CvTypeInfo"},
+        { (char *)"cvFindType", _wrap_cvFindType, METH_VARARGS, (char *)"cvFindType(char type_name) -> CvTypeInfo"},
+        { (char *)"cvTypeOf", _wrap_cvTypeOf, METH_VARARGS, (char *)"cvTypeOf(void struct_ptr) -> CvTypeInfo"},
+        { (char *)"cvClone", _wrap_cvClone, METH_VARARGS, (char *)"cvClone(void struct_ptr) -> void"},
+        { (char *)"cvSave", _wrap_cvSave, METH_VARARGS, (char *)"\n"
+               "cvSave(char filename, void struct_ptr, char name = None, char comment = None, \n"
+               "    CvAttrList attributes = cvAttrList())\n"
+               ""},
+        { (char *)"cvLoad", _wrap_cvLoad, METH_VARARGS, (char *)"\n"
+               "cvLoad(char filename, CvMemStorage memstorage = None, char name = None, \n"
+               "    char real_name = None) -> void\n"
+               ""},
+        { (char *)"cvGetTickCount", _wrap_cvGetTickCount, METH_VARARGS, (char *)"cvGetTickCount() -> int64"},
+        { (char *)"cvGetTickFrequency", _wrap_cvGetTickFrequency, METH_VARARGS, (char *)"cvGetTickFrequency() -> double"},
+        { (char *)"cvGetNumThreads", _wrap_cvGetNumThreads, METH_VARARGS, (char *)"cvGetNumThreads() -> int"},
+        { (char *)"cvSetNumThreads", _wrap_cvSetNumThreads, METH_VARARGS, (char *)"cvSetNumThreads(int threads = 0)"},
+        { (char *)"cvGetThreadNum", _wrap_cvGetThreadNum, METH_VARARGS, (char *)"cvGetThreadNum() -> int"},
+        { (char *)"cvSetImageIOFunctions", _wrap_cvSetImageIOFunctions, METH_VARARGS, (char *)"\n"
+               "cvSetImageIOFunctions(CvLoadImageFunc _load_image, CvLoadImageMFunc _load_image_m, \n"
+               "    CvSaveImageFunc _save_image, CvShowImageFunc _show_image) -> int\n"
+               ""},
+        { (char *)"new_CvImage", _wrap_new_CvImage, METH_VARARGS, (char *)"\n"
+               "CvImage()\n"
+               "CvImage(CvSize size, int depth, int channels)\n"
+               "CvImage( img)\n"
+               "CvImage(CvImage img)\n"
+               "CvImage(char filename, char imgname = None, int color = -1)\n"
+               "CvImage(char filename, char imgname = None)\n"
+               "CvImage(char filename)\n"
+               "CvImage(CvFileStorage fs, char mapname, char imgname)\n"
+               "new_CvImage(CvFileStorage fs, char seqname, int idx) -> CvImage\n"
+               ""},
+        { (char *)"delete_CvImage", _wrap_delete_CvImage, METH_VARARGS, (char *)"delete_CvImage(CvImage self)"},
+        { (char *)"CvImage_clone", _wrap_CvImage_clone, METH_VARARGS, (char *)"CvImage_clone(CvImage self) -> CvImage"},
+        { (char *)"CvImage_create", _wrap_CvImage_create, METH_VARARGS, (char *)"CvImage_create(CvImage self, CvSize size, int depth, int channels)"},
+        { (char *)"CvImage_release", _wrap_CvImage_release, METH_VARARGS, (char *)"CvImage_release(CvImage self)"},
+        { (char *)"CvImage_clear", _wrap_CvImage_clear, METH_VARARGS, (char *)"CvImage_clear(CvImage self)"},
+        { (char *)"CvImage_attach", _wrap_CvImage_attach, METH_VARARGS, (char *)"\n"
+               "attach( img, bool use_refcount = True)\n"
+               "CvImage_attach(CvImage self,  img)\n"
+               ""},
+        { (char *)"CvImage_detach", _wrap_CvImage_detach, METH_VARARGS, (char *)"CvImage_detach(CvImage self)"},
+        { (char *)"CvImage_load", _wrap_CvImage_load, METH_VARARGS, (char *)"\n"
+               "load(char filename, char imgname = None, int color = -1) -> bool\n"
+               "load(char filename, char imgname = None) -> bool\n"
+               "CvImage_load(CvImage self, char filename) -> bool\n"
+               ""},
+        { (char *)"CvImage_read", _wrap_CvImage_read, METH_VARARGS, (char *)"\n"
+               "read(CvFileStorage fs, char mapname, char imgname) -> bool\n"
+               "CvImage_read(CvImage self, CvFileStorage fs, char seqname, int idx) -> bool\n"
+               ""},
+        { (char *)"CvImage_save", _wrap_CvImage_save, METH_VARARGS, (char *)"\n"
+               "save(char filename, char imgname, int params = None)\n"
+               "CvImage_save(CvImage self, char filename, char imgname)\n"
+               ""},
+        { (char *)"CvImage_write", _wrap_CvImage_write, METH_VARARGS, (char *)"CvImage_write(CvImage self, CvFileStorage fs, char imgname)"},
+        { (char *)"CvImage_show", _wrap_CvImage_show, METH_VARARGS, (char *)"CvImage_show(CvImage self, char window_name)"},
+        { (char *)"CvImage_is_valid", _wrap_CvImage_is_valid, METH_VARARGS, (char *)"CvImage_is_valid(CvImage self) -> bool"},
+        { (char *)"CvImage_width", _wrap_CvImage_width, METH_VARARGS, (char *)"CvImage_width(CvImage self) -> int"},
+        { (char *)"CvImage_height", _wrap_CvImage_height, METH_VARARGS, (char *)"CvImage_height(CvImage self) -> int"},
+        { (char *)"CvImage_size", _wrap_CvImage_size, METH_VARARGS, (char *)"CvImage_size(CvImage self) -> CvSize"},
+        { (char *)"CvImage_roi_size", _wrap_CvImage_roi_size, METH_VARARGS, (char *)"CvImage_roi_size(CvImage self) -> CvSize"},
+        { (char *)"CvImage_roi", _wrap_CvImage_roi, METH_VARARGS, (char *)"CvImage_roi(CvImage self) -> CvRect"},
+        { (char *)"CvImage_coi", _wrap_CvImage_coi, METH_VARARGS, (char *)"CvImage_coi(CvImage self) -> int"},
+        { (char *)"CvImage_set_roi", _wrap_CvImage_set_roi, METH_VARARGS, (char *)"CvImage_set_roi(CvImage self, CvRect roi)"},
+        { (char *)"CvImage_reset_roi", _wrap_CvImage_reset_roi, METH_VARARGS, (char *)"CvImage_reset_roi(CvImage self)"},
+        { (char *)"CvImage_set_coi", _wrap_CvImage_set_coi, METH_VARARGS, (char *)"CvImage_set_coi(CvImage self, int coi)"},
+        { (char *)"CvImage_depth", _wrap_CvImage_depth, METH_VARARGS, (char *)"CvImage_depth(CvImage self) -> int"},
+        { (char *)"CvImage_channels", _wrap_CvImage_channels, METH_VARARGS, (char *)"CvImage_channels(CvImage self) -> int"},
+        { (char *)"CvImage_pix_size", _wrap_CvImage_pix_size, METH_VARARGS, (char *)"CvImage_pix_size(CvImage self) -> int"},
+        { (char *)"CvImage_data", _wrap_CvImage_data, METH_VARARGS, (char *)"\n"
+               "data() -> uchar\n"
+               "CvImage_data(CvImage self) -> uchar\n"
+               ""},
+        { (char *)"CvImage_step", _wrap_CvImage_step, METH_VARARGS, (char *)"CvImage_step(CvImage self) -> int"},
+        { (char *)"CvImage_origin", _wrap_CvImage_origin, METH_VARARGS, (char *)"CvImage_origin(CvImage self) -> int"},
+        { (char *)"CvImage_roi_row", _wrap_CvImage_roi_row, METH_VARARGS, (char *)"\n"
+               "roi_row(int y) -> uchar\n"
+               "CvImage_roi_row(CvImage self, int y) -> uchar\n"
+               ""},
+        { (char *)"CvImage_asIplImage", _wrap_CvImage_asIplImage, METH_VARARGS, (char *)"CvImage_asIplImage(CvImage self)"},
         { (char *)"CvImage_swigregister", CvImage_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_CvMatrix", _wrap_new_CvMatrix, METH_VARARGS, NULL},
-        { (char *)"delete_CvMatrix", _wrap_delete_CvMatrix, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_clone", _wrap_CvMatrix_clone, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_set", _wrap_CvMatrix_set, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_create", _wrap_CvMatrix_create, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_addref", _wrap_CvMatrix_addref, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_release", _wrap_CvMatrix_release, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_clear", _wrap_CvMatrix_clear, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_load", _wrap_CvMatrix_load, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_read", _wrap_CvMatrix_read, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_save", _wrap_CvMatrix_save, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_write", _wrap_CvMatrix_write, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_show", _wrap_CvMatrix_show, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_is_valid", _wrap_CvMatrix_is_valid, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_rows", _wrap_CvMatrix_rows, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_cols", _wrap_CvMatrix_cols, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_size", _wrap_CvMatrix_size, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_type", _wrap_CvMatrix_type, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_depth", _wrap_CvMatrix_depth, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_channels", _wrap_CvMatrix_channels, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_pix_size", _wrap_CvMatrix_pix_size, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_data", _wrap_CvMatrix_data, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_step", _wrap_CvMatrix_step, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_set_data", _wrap_CvMatrix_set_data, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_row", _wrap_CvMatrix_row, METH_VARARGS, NULL},
-        { (char *)"CvMatrix_asCvMat", _wrap_CvMatrix_asCvMat, METH_VARARGS, NULL},
+        { (char *)"new_CvMatrix", _wrap_new_CvMatrix, METH_VARARGS, (char *)"\n"
+               "CvMatrix()\n"
+               "CvMatrix(int rows, int cols, int type)\n"
+               "CvMatrix(int rows, int cols, int type, CvMat hdr, void data = None, \n"
+               "    int step = 0x7fffffff)\n"
+               "CvMatrix(int rows, int cols, int type, CvMat hdr, void data = None)\n"
+               "CvMatrix(int rows, int cols, int type, CvMat hdr)\n"
+               "CvMatrix(int rows, int cols, int type, CvMemStorage storage, \n"
+               "    bool alloc_data = True)\n"
+               "CvMatrix(int rows, int cols, int type, CvMemStorage storage)\n"
+               "CvMatrix(int rows, int cols, int type, void data, int step = 0x7fffffff)\n"
+               "CvMatrix(int rows, int cols, int type, void data)\n"
+               "CvMatrix(CvMat m)\n"
+               "CvMatrix(CvMatrix m)\n"
+               "CvMatrix(char filename, char matname = None, int color = -1)\n"
+               "CvMatrix(char filename, char matname = None)\n"
+               "CvMatrix(char filename)\n"
+               "CvMatrix(CvFileStorage fs, char mapname, char matname)\n"
+               "new_CvMatrix(CvFileStorage fs, char seqname, int idx) -> CvMatrix\n"
+               ""},
+        { (char *)"delete_CvMatrix", _wrap_delete_CvMatrix, METH_VARARGS, (char *)"delete_CvMatrix(CvMatrix self)"},
+        { (char *)"CvMatrix_clone", _wrap_CvMatrix_clone, METH_VARARGS, (char *)"CvMatrix_clone(CvMatrix self) -> CvMatrix"},
+        { (char *)"CvMatrix_set", _wrap_CvMatrix_set, METH_VARARGS, (char *)"CvMatrix_set(CvMatrix self, CvMat m, bool add_ref)"},
+        { (char *)"CvMatrix_create", _wrap_CvMatrix_create, METH_VARARGS, (char *)"CvMatrix_create(CvMatrix self, int rows, int cols, int type)"},
+        { (char *)"CvMatrix_addref", _wrap_CvMatrix_addref, METH_VARARGS, (char *)"CvMatrix_addref(CvMatrix self)"},
+        { (char *)"CvMatrix_release", _wrap_CvMatrix_release, METH_VARARGS, (char *)"CvMatrix_release(CvMatrix self)"},
+        { (char *)"CvMatrix_clear", _wrap_CvMatrix_clear, METH_VARARGS, (char *)"CvMatrix_clear(CvMatrix self)"},
+        { (char *)"CvMatrix_load", _wrap_CvMatrix_load, METH_VARARGS, (char *)"\n"
+               "load(char filename, char matname = None, int color = -1) -> bool\n"
+               "load(char filename, char matname = None) -> bool\n"
+               "CvMatrix_load(CvMatrix self, char filename) -> bool\n"
+               ""},
+        { (char *)"CvMatrix_read", _wrap_CvMatrix_read, METH_VARARGS, (char *)"\n"
+               "read(CvFileStorage fs, char mapname, char matname) -> bool\n"
+               "CvMatrix_read(CvMatrix self, CvFileStorage fs, char seqname, int idx) -> bool\n"
+               ""},
+        { (char *)"CvMatrix_save", _wrap_CvMatrix_save, METH_VARARGS, (char *)"\n"
+               "save(char filename, char matname, int params = None)\n"
+               "CvMatrix_save(CvMatrix self, char filename, char matname)\n"
+               ""},
+        { (char *)"CvMatrix_write", _wrap_CvMatrix_write, METH_VARARGS, (char *)"CvMatrix_write(CvMatrix self, CvFileStorage fs, char matname)"},
+        { (char *)"CvMatrix_show", _wrap_CvMatrix_show, METH_VARARGS, (char *)"CvMatrix_show(CvMatrix self, char window_name)"},
+        { (char *)"CvMatrix_is_valid", _wrap_CvMatrix_is_valid, METH_VARARGS, (char *)"CvMatrix_is_valid(CvMatrix self) -> bool"},
+        { (char *)"CvMatrix_rows", _wrap_CvMatrix_rows, METH_VARARGS, (char *)"CvMatrix_rows(CvMatrix self) -> int"},
+        { (char *)"CvMatrix_cols", _wrap_CvMatrix_cols, METH_VARARGS, (char *)"CvMatrix_cols(CvMatrix self) -> int"},
+        { (char *)"CvMatrix_size", _wrap_CvMatrix_size, METH_VARARGS, (char *)"CvMatrix_size(CvMatrix self) -> CvSize"},
+        { (char *)"CvMatrix_type", _wrap_CvMatrix_type, METH_VARARGS, (char *)"CvMatrix_type(CvMatrix self) -> int"},
+        { (char *)"CvMatrix_depth", _wrap_CvMatrix_depth, METH_VARARGS, (char *)"CvMatrix_depth(CvMatrix self) -> int"},
+        { (char *)"CvMatrix_channels", _wrap_CvMatrix_channels, METH_VARARGS, (char *)"CvMatrix_channels(CvMatrix self) -> int"},
+        { (char *)"CvMatrix_pix_size", _wrap_CvMatrix_pix_size, METH_VARARGS, (char *)"CvMatrix_pix_size(CvMatrix self) -> int"},
+        { (char *)"CvMatrix_data", _wrap_CvMatrix_data, METH_VARARGS, (char *)"\n"
+               "data() -> uchar\n"
+               "CvMatrix_data(CvMatrix self) -> uchar\n"
+               ""},
+        { (char *)"CvMatrix_step", _wrap_CvMatrix_step, METH_VARARGS, (char *)"CvMatrix_step(CvMatrix self) -> int"},
+        { (char *)"CvMatrix_set_data", _wrap_CvMatrix_set_data, METH_VARARGS, (char *)"\n"
+               "set_data(void data, int step = 0x7fffffff)\n"
+               "CvMatrix_set_data(CvMatrix self, void data)\n"
+               ""},
+        { (char *)"CvMatrix_row", _wrap_CvMatrix_row, METH_VARARGS, (char *)"\n"
+               "row(int i) -> uchar\n"
+               "CvMatrix_row(CvMatrix self, int i) -> uchar\n"
+               ""},
+        { (char *)"CvMatrix_asCvMat", _wrap_CvMatrix_asCvMat, METH_VARARGS, (char *)"CvMatrix_asCvMat(CvMatrix self) -> CvMat"},
         { (char *)"CvMatrix_swigregister", CvMatrix_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_CvModule", _wrap_new_CvModule, METH_VARARGS, NULL},
-        { (char *)"delete_CvModule", _wrap_delete_CvModule, METH_VARARGS, NULL},
-        { (char *)"CvModule_info_set", _wrap_CvModule_info_set, METH_VARARGS, NULL},
-        { (char *)"CvModule_info_get", _wrap_CvModule_info_get, METH_VARARGS, NULL},
+        { (char *)"new_CvModule", _wrap_new_CvModule, METH_VARARGS, (char *)"new_CvModule(CvModuleInfo _info) -> CvModule"},
+        { (char *)"delete_CvModule", _wrap_delete_CvModule, METH_VARARGS, (char *)"delete_CvModule(CvModule self)"},
+        { (char *)"CvModule_info_set", _wrap_CvModule_info_set, METH_VARARGS, (char *)"CvModule_info_set(CvModule self, CvModuleInfo info)"},
+        { (char *)"CvModule_info_get", _wrap_CvModule_info_get, METH_VARARGS, (char *)"CvModule_info_get(CvModule self) -> CvModuleInfo"},
         { (char *)"CvModule_first_get", _wrap_CvModule_first_get, METH_VARARGS, NULL},
         { (char *)"CvModule_first_set", _wrap_CvModule_first_set, METH_VARARGS, NULL},
         { (char *)"CvModule_last_get", _wrap_CvModule_last_get, METH_VARARGS, NULL},
         { (char *)"CvModule_last_set", _wrap_CvModule_last_set, METH_VARARGS, NULL},
         { (char *)"CvModule_swigregister", CvModule_swigregister, METH_VARARGS, NULL},
-        { (char *)"new_CvType", _wrap_new_CvType, METH_VARARGS, NULL},
-        { (char *)"delete_CvType", _wrap_delete_CvType, METH_VARARGS, NULL},
-        { (char *)"CvType_info_set", _wrap_CvType_info_set, METH_VARARGS, NULL},
-        { (char *)"CvType_info_get", _wrap_CvType_info_get, METH_VARARGS, NULL},
+        { (char *)"new_CvType", _wrap_new_CvType, METH_VARARGS, (char *)"\n"
+               "CvType(char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release = 0, \n"
+               "    CvReadFunc read = 0, CvWriteFunc write = 0, \n"
+               "    CvCloneFunc clone = 0)\n"
+               "CvType(char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release = 0, \n"
+               "    CvReadFunc read = 0, CvWriteFunc write = 0)\n"
+               "CvType(char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release = 0, \n"
+               "    CvReadFunc read = 0)\n"
+               "CvType(char type_name, CvIsInstanceFunc is_instance, CvReleaseFunc release = 0)\n"
+               "new_CvType(char type_name, CvIsInstanceFunc is_instance) -> CvType\n"
+               ""},
+        { (char *)"delete_CvType", _wrap_delete_CvType, METH_VARARGS, (char *)"delete_CvType(CvType self)"},
+        { (char *)"CvType_info_set", _wrap_CvType_info_set, METH_VARARGS, (char *)"CvType_info_set(CvType self, CvTypeInfo info)"},
+        { (char *)"CvType_info_get", _wrap_CvType_info_get, METH_VARARGS, (char *)"CvType_info_get(CvType self) -> CvTypeInfo"},
         { (char *)"CvType_first_get", _wrap_CvType_first_get, METH_VARARGS, NULL},
         { (char *)"CvType_first_set", _wrap_CvType_first_set, METH_VARARGS, NULL},
         { (char *)"CvType_last_get", _wrap_CvType_last_get, METH_VARARGS, NULL},
         { (char *)"CvType_last_set", _wrap_CvType_last_set, METH_VARARGS, NULL},
         { (char *)"CvType_swigregister", CvType_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m00_set", _wrap_CvMoments_m00_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m00_get", _wrap_CvMoments_m00_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m10_set", _wrap_CvMoments_m10_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m10_get", _wrap_CvMoments_m10_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m01_set", _wrap_CvMoments_m01_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m01_get", _wrap_CvMoments_m01_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m20_set", _wrap_CvMoments_m20_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m20_get", _wrap_CvMoments_m20_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m11_set", _wrap_CvMoments_m11_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m11_get", _wrap_CvMoments_m11_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m02_set", _wrap_CvMoments_m02_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m02_get", _wrap_CvMoments_m02_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m30_set", _wrap_CvMoments_m30_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m30_get", _wrap_CvMoments_m30_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m21_set", _wrap_CvMoments_m21_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m21_get", _wrap_CvMoments_m21_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m12_set", _wrap_CvMoments_m12_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m12_get", _wrap_CvMoments_m12_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m03_set", _wrap_CvMoments_m03_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_m03_get", _wrap_CvMoments_m03_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu20_set", _wrap_CvMoments_mu20_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu20_get", _wrap_CvMoments_mu20_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu11_set", _wrap_CvMoments_mu11_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu11_get", _wrap_CvMoments_mu11_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu02_set", _wrap_CvMoments_mu02_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu02_get", _wrap_CvMoments_mu02_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu30_set", _wrap_CvMoments_mu30_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu30_get", _wrap_CvMoments_mu30_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu21_set", _wrap_CvMoments_mu21_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu21_get", _wrap_CvMoments_mu21_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu12_set", _wrap_CvMoments_mu12_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu12_get", _wrap_CvMoments_mu12_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu03_set", _wrap_CvMoments_mu03_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_mu03_get", _wrap_CvMoments_mu03_get, METH_VARARGS, NULL},
-        { (char *)"CvMoments_inv_sqrt_m00_set", _wrap_CvMoments_inv_sqrt_m00_set, METH_VARARGS, NULL},
-        { (char *)"CvMoments_inv_sqrt_m00_get", _wrap_CvMoments_inv_sqrt_m00_get, METH_VARARGS, NULL},
-        { (char *)"new_CvMoments", _wrap_new_CvMoments, METH_VARARGS, NULL},
-        { (char *)"delete_CvMoments", _wrap_delete_CvMoments, METH_VARARGS, NULL},
+        { (char *)"CvMoments_m00_set", _wrap_CvMoments_m00_set, METH_VARARGS, (char *)"CvMoments_m00_set(CvMoments self, double m00)"},
+        { (char *)"CvMoments_m00_get", _wrap_CvMoments_m00_get, METH_VARARGS, (char *)"CvMoments_m00_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m10_set", _wrap_CvMoments_m10_set, METH_VARARGS, (char *)"CvMoments_m10_set(CvMoments self, double m10)"},
+        { (char *)"CvMoments_m10_get", _wrap_CvMoments_m10_get, METH_VARARGS, (char *)"CvMoments_m10_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m01_set", _wrap_CvMoments_m01_set, METH_VARARGS, (char *)"CvMoments_m01_set(CvMoments self, double m01)"},
+        { (char *)"CvMoments_m01_get", _wrap_CvMoments_m01_get, METH_VARARGS, (char *)"CvMoments_m01_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m20_set", _wrap_CvMoments_m20_set, METH_VARARGS, (char *)"CvMoments_m20_set(CvMoments self, double m20)"},
+        { (char *)"CvMoments_m20_get", _wrap_CvMoments_m20_get, METH_VARARGS, (char *)"CvMoments_m20_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m11_set", _wrap_CvMoments_m11_set, METH_VARARGS, (char *)"CvMoments_m11_set(CvMoments self, double m11)"},
+        { (char *)"CvMoments_m11_get", _wrap_CvMoments_m11_get, METH_VARARGS, (char *)"CvMoments_m11_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m02_set", _wrap_CvMoments_m02_set, METH_VARARGS, (char *)"CvMoments_m02_set(CvMoments self, double m02)"},
+        { (char *)"CvMoments_m02_get", _wrap_CvMoments_m02_get, METH_VARARGS, (char *)"CvMoments_m02_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m30_set", _wrap_CvMoments_m30_set, METH_VARARGS, (char *)"CvMoments_m30_set(CvMoments self, double m30)"},
+        { (char *)"CvMoments_m30_get", _wrap_CvMoments_m30_get, METH_VARARGS, (char *)"CvMoments_m30_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m21_set", _wrap_CvMoments_m21_set, METH_VARARGS, (char *)"CvMoments_m21_set(CvMoments self, double m21)"},
+        { (char *)"CvMoments_m21_get", _wrap_CvMoments_m21_get, METH_VARARGS, (char *)"CvMoments_m21_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m12_set", _wrap_CvMoments_m12_set, METH_VARARGS, (char *)"CvMoments_m12_set(CvMoments self, double m12)"},
+        { (char *)"CvMoments_m12_get", _wrap_CvMoments_m12_get, METH_VARARGS, (char *)"CvMoments_m12_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_m03_set", _wrap_CvMoments_m03_set, METH_VARARGS, (char *)"CvMoments_m03_set(CvMoments self, double m03)"},
+        { (char *)"CvMoments_m03_get", _wrap_CvMoments_m03_get, METH_VARARGS, (char *)"CvMoments_m03_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_mu20_set", _wrap_CvMoments_mu20_set, METH_VARARGS, (char *)"CvMoments_mu20_set(CvMoments self, double mu20)"},
+        { (char *)"CvMoments_mu20_get", _wrap_CvMoments_mu20_get, METH_VARARGS, (char *)"CvMoments_mu20_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_mu11_set", _wrap_CvMoments_mu11_set, METH_VARARGS, (char *)"CvMoments_mu11_set(CvMoments self, double mu11)"},
+        { (char *)"CvMoments_mu11_get", _wrap_CvMoments_mu11_get, METH_VARARGS, (char *)"CvMoments_mu11_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_mu02_set", _wrap_CvMoments_mu02_set, METH_VARARGS, (char *)"CvMoments_mu02_set(CvMoments self, double mu02)"},
+        { (char *)"CvMoments_mu02_get", _wrap_CvMoments_mu02_get, METH_VARARGS, (char *)"CvMoments_mu02_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_mu30_set", _wrap_CvMoments_mu30_set, METH_VARARGS, (char *)"CvMoments_mu30_set(CvMoments self, double mu30)"},
+        { (char *)"CvMoments_mu30_get", _wrap_CvMoments_mu30_get, METH_VARARGS, (char *)"CvMoments_mu30_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_mu21_set", _wrap_CvMoments_mu21_set, METH_VARARGS, (char *)"CvMoments_mu21_set(CvMoments self, double mu21)"},
+        { (char *)"CvMoments_mu21_get", _wrap_CvMoments_mu21_get, METH_VARARGS, (char *)"CvMoments_mu21_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_mu12_set", _wrap_CvMoments_mu12_set, METH_VARARGS, (char *)"CvMoments_mu12_set(CvMoments self, double mu12)"},
+        { (char *)"CvMoments_mu12_get", _wrap_CvMoments_mu12_get, METH_VARARGS, (char *)"CvMoments_mu12_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_mu03_set", _wrap_CvMoments_mu03_set, METH_VARARGS, (char *)"CvMoments_mu03_set(CvMoments self, double mu03)"},
+        { (char *)"CvMoments_mu03_get", _wrap_CvMoments_mu03_get, METH_VARARGS, (char *)"CvMoments_mu03_get(CvMoments self) -> double"},
+        { (char *)"CvMoments_inv_sqrt_m00_set", _wrap_CvMoments_inv_sqrt_m00_set, METH_VARARGS, (char *)"CvMoments_inv_sqrt_m00_set(CvMoments self, double inv_sqrt_m00)"},
+        { (char *)"CvMoments_inv_sqrt_m00_get", _wrap_CvMoments_inv_sqrt_m00_get, METH_VARARGS, (char *)"CvMoments_inv_sqrt_m00_get(CvMoments self) -> double"},
+        { (char *)"new_CvMoments", _wrap_new_CvMoments, METH_VARARGS, (char *)"new_CvMoments() -> CvMoments"},
+        { (char *)"delete_CvMoments", _wrap_delete_CvMoments, METH_VARARGS, (char *)"delete_CvMoments(CvMoments self)"},
         { (char *)"CvMoments_swigregister", CvMoments_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu1_set", _wrap_CvHuMoments_hu1_set, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu1_get", _wrap_CvHuMoments_hu1_get, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu2_set", _wrap_CvHuMoments_hu2_set, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu2_get", _wrap_CvHuMoments_hu2_get, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu3_set", _wrap_CvHuMoments_hu3_set, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu3_get", _wrap_CvHuMoments_hu3_get, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu4_set", _wrap_CvHuMoments_hu4_set, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu4_get", _wrap_CvHuMoments_hu4_get, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu5_set", _wrap_CvHuMoments_hu5_set, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu5_get", _wrap_CvHuMoments_hu5_get, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu6_set", _wrap_CvHuMoments_hu6_set, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu6_get", _wrap_CvHuMoments_hu6_get, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu7_set", _wrap_CvHuMoments_hu7_set, METH_VARARGS, NULL},
-        { (char *)"CvHuMoments_hu7_get", _wrap_CvHuMoments_hu7_get, METH_VARARGS, NULL},
-        { (char *)"new_CvHuMoments", _wrap_new_CvHuMoments, METH_VARARGS, NULL},
-        { (char *)"delete_CvHuMoments", _wrap_delete_CvHuMoments, METH_VARARGS, NULL},
+        { (char *)"CvHuMoments_hu1_set", _wrap_CvHuMoments_hu1_set, METH_VARARGS, (char *)"CvHuMoments_hu1_set(CvHuMoments self, double hu1)"},
+        { (char *)"CvHuMoments_hu1_get", _wrap_CvHuMoments_hu1_get, METH_VARARGS, (char *)"CvHuMoments_hu1_get(CvHuMoments self) -> double"},
+        { (char *)"CvHuMoments_hu2_set", _wrap_CvHuMoments_hu2_set, METH_VARARGS, (char *)"CvHuMoments_hu2_set(CvHuMoments self, double hu2)"},
+        { (char *)"CvHuMoments_hu2_get", _wrap_CvHuMoments_hu2_get, METH_VARARGS, (char *)"CvHuMoments_hu2_get(CvHuMoments self) -> double"},
+        { (char *)"CvHuMoments_hu3_set", _wrap_CvHuMoments_hu3_set, METH_VARARGS, (char *)"CvHuMoments_hu3_set(CvHuMoments self, double hu3)"},
+        { (char *)"CvHuMoments_hu3_get", _wrap_CvHuMoments_hu3_get, METH_VARARGS, (char *)"CvHuMoments_hu3_get(CvHuMoments self) -> double"},
+        { (char *)"CvHuMoments_hu4_set", _wrap_CvHuMoments_hu4_set, METH_VARARGS, (char *)"CvHuMoments_hu4_set(CvHuMoments self, double hu4)"},
+        { (char *)"CvHuMoments_hu4_get", _wrap_CvHuMoments_hu4_get, METH_VARARGS, (char *)"CvHuMoments_hu4_get(CvHuMoments self) -> double"},
+        { (char *)"CvHuMoments_hu5_set", _wrap_CvHuMoments_hu5_set, METH_VARARGS, (char *)"CvHuMoments_hu5_set(CvHuMoments self, double hu5)"},
+        { (char *)"CvHuMoments_hu5_get", _wrap_CvHuMoments_hu5_get, METH_VARARGS, (char *)"CvHuMoments_hu5_get(CvHuMoments self) -> double"},
+        { (char *)"CvHuMoments_hu6_set", _wrap_CvHuMoments_hu6_set, METH_VARARGS, (char *)"CvHuMoments_hu6_set(CvHuMoments self, double hu6)"},
+        { (char *)"CvHuMoments_hu6_get", _wrap_CvHuMoments_hu6_get, METH_VARARGS, (char *)"CvHuMoments_hu6_get(CvHuMoments self) -> double"},
+        { (char *)"CvHuMoments_hu7_set", _wrap_CvHuMoments_hu7_set, METH_VARARGS, (char *)"CvHuMoments_hu7_set(CvHuMoments self, double hu7)"},
+        { (char *)"CvHuMoments_hu7_get", _wrap_CvHuMoments_hu7_get, METH_VARARGS, (char *)"CvHuMoments_hu7_get(CvHuMoments self) -> double"},
+        { (char *)"new_CvHuMoments", _wrap_new_CvHuMoments, METH_VARARGS, (char *)"new_CvHuMoments() -> CvHuMoments"},
+        { (char *)"delete_CvHuMoments", _wrap_delete_CvHuMoments, METH_VARARGS, (char *)"delete_CvHuMoments(CvHuMoments self)"},
         { (char *)"CvHuMoments_swigregister", CvHuMoments_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvConnectedComp_area_set", _wrap_CvConnectedComp_area_set, METH_VARARGS, NULL},
-        { (char *)"CvConnectedComp_area_get", _wrap_CvConnectedComp_area_get, METH_VARARGS, NULL},
-        { (char *)"CvConnectedComp_value_set", _wrap_CvConnectedComp_value_set, METH_VARARGS, NULL},
-        { (char *)"CvConnectedComp_value_get", _wrap_CvConnectedComp_value_get, METH_VARARGS, NULL},
-        { (char *)"CvConnectedComp_rect_set", _wrap_CvConnectedComp_rect_set, METH_VARARGS, NULL},
-        { (char *)"CvConnectedComp_rect_get", _wrap_CvConnectedComp_rect_get, METH_VARARGS, NULL},
-        { (char *)"CvConnectedComp_contour_set", _wrap_CvConnectedComp_contour_set, METH_VARARGS, NULL},
-        { (char *)"CvConnectedComp_contour_get", _wrap_CvConnectedComp_contour_get, METH_VARARGS, NULL},
-        { (char *)"new_CvConnectedComp", _wrap_new_CvConnectedComp, METH_VARARGS, NULL},
-        { (char *)"delete_CvConnectedComp", _wrap_delete_CvConnectedComp, METH_VARARGS, NULL},
+        { (char *)"CvConnectedComp_area_set", _wrap_CvConnectedComp_area_set, METH_VARARGS, (char *)"CvConnectedComp_area_set(CvConnectedComp self, double area)"},
+        { (char *)"CvConnectedComp_area_get", _wrap_CvConnectedComp_area_get, METH_VARARGS, (char *)"CvConnectedComp_area_get(CvConnectedComp self) -> double"},
+        { (char *)"CvConnectedComp_value_set", _wrap_CvConnectedComp_value_set, METH_VARARGS, (char *)"CvConnectedComp_value_set(CvConnectedComp self, CvScalar value)"},
+        { (char *)"CvConnectedComp_value_get", _wrap_CvConnectedComp_value_get, METH_VARARGS, (char *)"CvConnectedComp_value_get(CvConnectedComp self) -> CvScalar"},
+        { (char *)"CvConnectedComp_rect_set", _wrap_CvConnectedComp_rect_set, METH_VARARGS, (char *)"CvConnectedComp_rect_set(CvConnectedComp self, CvRect rect)"},
+        { (char *)"CvConnectedComp_rect_get", _wrap_CvConnectedComp_rect_get, METH_VARARGS, (char *)"CvConnectedComp_rect_get(CvConnectedComp self) -> CvRect"},
+        { (char *)"CvConnectedComp_contour_set", _wrap_CvConnectedComp_contour_set, METH_VARARGS, (char *)"CvConnectedComp_contour_set(CvConnectedComp self, CvSeq contour)"},
+        { (char *)"CvConnectedComp_contour_get", _wrap_CvConnectedComp_contour_get, METH_VARARGS, (char *)"CvConnectedComp_contour_get(CvConnectedComp self) -> CvSeq"},
+        { (char *)"new_CvConnectedComp", _wrap_new_CvConnectedComp, METH_VARARGS, (char *)"new_CvConnectedComp() -> CvConnectedComp"},
+        { (char *)"delete_CvConnectedComp", _wrap_delete_CvConnectedComp, METH_VARARGS, (char *)"delete_CvConnectedComp(CvConnectedComp self)"},
         { (char *)"CvConnectedComp_swigregister", CvConnectedComp_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_header_size_set", _wrap_CvChainPtReader_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_header_size_get", _wrap_CvChainPtReader_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_seq_set", _wrap_CvChainPtReader_seq_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_seq_get", _wrap_CvChainPtReader_seq_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_block_set", _wrap_CvChainPtReader_block_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_block_get", _wrap_CvChainPtReader_block_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_ptr_set", _wrap_CvChainPtReader_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_ptr_get", _wrap_CvChainPtReader_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_block_min_set", _wrap_CvChainPtReader_block_min_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_block_min_get", _wrap_CvChainPtReader_block_min_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_block_max_set", _wrap_CvChainPtReader_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_block_max_get", _wrap_CvChainPtReader_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_delta_index_set", _wrap_CvChainPtReader_delta_index_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_delta_index_get", _wrap_CvChainPtReader_delta_index_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_prev_elem_set", _wrap_CvChainPtReader_prev_elem_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_prev_elem_get", _wrap_CvChainPtReader_prev_elem_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_code_set", _wrap_CvChainPtReader_code_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_code_get", _wrap_CvChainPtReader_code_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_pt_set", _wrap_CvChainPtReader_pt_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_pt_get", _wrap_CvChainPtReader_pt_get, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_deltas_set", _wrap_CvChainPtReader_deltas_set, METH_VARARGS, NULL},
-        { (char *)"CvChainPtReader_deltas_get", _wrap_CvChainPtReader_deltas_get, METH_VARARGS, NULL},
-        { (char *)"new_CvChainPtReader", _wrap_new_CvChainPtReader, METH_VARARGS, NULL},
-        { (char *)"delete_CvChainPtReader", _wrap_delete_CvChainPtReader, METH_VARARGS, NULL},
+        { (char *)"CvChainPtReader_header_size_set", _wrap_CvChainPtReader_header_size_set, METH_VARARGS, (char *)"CvChainPtReader_header_size_set(CvChainPtReader self, int header_size)"},
+        { (char *)"CvChainPtReader_header_size_get", _wrap_CvChainPtReader_header_size_get, METH_VARARGS, (char *)"CvChainPtReader_header_size_get(CvChainPtReader self) -> int"},
+        { (char *)"CvChainPtReader_seq_set", _wrap_CvChainPtReader_seq_set, METH_VARARGS, (char *)"CvChainPtReader_seq_set(CvChainPtReader self, CvSeq seq)"},
+        { (char *)"CvChainPtReader_seq_get", _wrap_CvChainPtReader_seq_get, METH_VARARGS, (char *)"CvChainPtReader_seq_get(CvChainPtReader self) -> CvSeq"},
+        { (char *)"CvChainPtReader_block_set", _wrap_CvChainPtReader_block_set, METH_VARARGS, (char *)"CvChainPtReader_block_set(CvChainPtReader self, CvSeqBlock block)"},
+        { (char *)"CvChainPtReader_block_get", _wrap_CvChainPtReader_block_get, METH_VARARGS, (char *)"CvChainPtReader_block_get(CvChainPtReader self) -> CvSeqBlock"},
+        { (char *)"CvChainPtReader_ptr_set", _wrap_CvChainPtReader_ptr_set, METH_VARARGS, (char *)"CvChainPtReader_ptr_set(CvChainPtReader self, schar ptr)"},
+        { (char *)"CvChainPtReader_ptr_get", _wrap_CvChainPtReader_ptr_get, METH_VARARGS, (char *)"CvChainPtReader_ptr_get(CvChainPtReader self) -> schar"},
+        { (char *)"CvChainPtReader_block_min_set", _wrap_CvChainPtReader_block_min_set, METH_VARARGS, (char *)"CvChainPtReader_block_min_set(CvChainPtReader self, schar block_min)"},
+        { (char *)"CvChainPtReader_block_min_get", _wrap_CvChainPtReader_block_min_get, METH_VARARGS, (char *)"CvChainPtReader_block_min_get(CvChainPtReader self) -> schar"},
+        { (char *)"CvChainPtReader_block_max_set", _wrap_CvChainPtReader_block_max_set, METH_VARARGS, (char *)"CvChainPtReader_block_max_set(CvChainPtReader self, schar block_max)"},
+        { (char *)"CvChainPtReader_block_max_get", _wrap_CvChainPtReader_block_max_get, METH_VARARGS, (char *)"CvChainPtReader_block_max_get(CvChainPtReader self) -> schar"},
+        { (char *)"CvChainPtReader_delta_index_set", _wrap_CvChainPtReader_delta_index_set, METH_VARARGS, (char *)"CvChainPtReader_delta_index_set(CvChainPtReader self, int delta_index)"},
+        { (char *)"CvChainPtReader_delta_index_get", _wrap_CvChainPtReader_delta_index_get, METH_VARARGS, (char *)"CvChainPtReader_delta_index_get(CvChainPtReader self) -> int"},
+        { (char *)"CvChainPtReader_prev_elem_set", _wrap_CvChainPtReader_prev_elem_set, METH_VARARGS, (char *)"CvChainPtReader_prev_elem_set(CvChainPtReader self, schar prev_elem)"},
+        { (char *)"CvChainPtReader_prev_elem_get", _wrap_CvChainPtReader_prev_elem_get, METH_VARARGS, (char *)"CvChainPtReader_prev_elem_get(CvChainPtReader self) -> schar"},
+        { (char *)"CvChainPtReader_code_set", _wrap_CvChainPtReader_code_set, METH_VARARGS, (char *)"CvChainPtReader_code_set(CvChainPtReader self, char code)"},
+        { (char *)"CvChainPtReader_code_get", _wrap_CvChainPtReader_code_get, METH_VARARGS, (char *)"CvChainPtReader_code_get(CvChainPtReader self) -> char"},
+        { (char *)"CvChainPtReader_pt_set", _wrap_CvChainPtReader_pt_set, METH_VARARGS, (char *)"CvChainPtReader_pt_set(CvChainPtReader self, CvPoint pt)"},
+        { (char *)"CvChainPtReader_pt_get", _wrap_CvChainPtReader_pt_get, METH_VARARGS, (char *)"CvChainPtReader_pt_get(CvChainPtReader self) -> CvPoint"},
+        { (char *)"CvChainPtReader_deltas_set", _wrap_CvChainPtReader_deltas_set, METH_VARARGS, (char *)"CvChainPtReader_deltas_set(CvChainPtReader self, schar deltas)"},
+        { (char *)"CvChainPtReader_deltas_get", _wrap_CvChainPtReader_deltas_get, METH_VARARGS, (char *)"CvChainPtReader_deltas_get(CvChainPtReader self) -> schar"},
+        { (char *)"new_CvChainPtReader", _wrap_new_CvChainPtReader, METH_VARARGS, (char *)"new_CvChainPtReader() -> CvChainPtReader"},
+        { (char *)"delete_CvChainPtReader", _wrap_delete_CvChainPtReader, METH_VARARGS, (char *)"delete_CvChainPtReader(CvChainPtReader self)"},
         { (char *)"CvChainPtReader_swigregister", CvChainPtReader_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_flags_set", _wrap_CvContourTree_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_flags_get", _wrap_CvContourTree_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_header_size_set", _wrap_CvContourTree_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_header_size_get", _wrap_CvContourTree_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_h_prev_set", _wrap_CvContourTree_h_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_h_prev_get", _wrap_CvContourTree_h_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_h_next_set", _wrap_CvContourTree_h_next_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_h_next_get", _wrap_CvContourTree_h_next_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_v_prev_set", _wrap_CvContourTree_v_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_v_prev_get", _wrap_CvContourTree_v_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_v_next_set", _wrap_CvContourTree_v_next_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_v_next_get", _wrap_CvContourTree_v_next_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_total_set", _wrap_CvContourTree_total_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_total_get", _wrap_CvContourTree_total_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_elem_size_set", _wrap_CvContourTree_elem_size_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_elem_size_get", _wrap_CvContourTree_elem_size_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_block_max_set", _wrap_CvContourTree_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_block_max_get", _wrap_CvContourTree_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_ptr_set", _wrap_CvContourTree_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_ptr_get", _wrap_CvContourTree_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_delta_elems_set", _wrap_CvContourTree_delta_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_delta_elems_get", _wrap_CvContourTree_delta_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_storage_set", _wrap_CvContourTree_storage_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_storage_get", _wrap_CvContourTree_storage_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_free_blocks_set", _wrap_CvContourTree_free_blocks_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_free_blocks_get", _wrap_CvContourTree_free_blocks_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_first_set", _wrap_CvContourTree_first_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_first_get", _wrap_CvContourTree_first_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_p1_set", _wrap_CvContourTree_p1_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_p1_get", _wrap_CvContourTree_p1_get, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_p2_set", _wrap_CvContourTree_p2_set, METH_VARARGS, NULL},
-        { (char *)"CvContourTree_p2_get", _wrap_CvContourTree_p2_get, METH_VARARGS, NULL},
-        { (char *)"new_CvContourTree", _wrap_new_CvContourTree, METH_VARARGS, NULL},
-        { (char *)"delete_CvContourTree", _wrap_delete_CvContourTree, METH_VARARGS, NULL},
+        { (char *)"CvContourTree_flags_set", _wrap_CvContourTree_flags_set, METH_VARARGS, (char *)"CvContourTree_flags_set(CvContourTree self, int flags)"},
+        { (char *)"CvContourTree_flags_get", _wrap_CvContourTree_flags_get, METH_VARARGS, (char *)"CvContourTree_flags_get(CvContourTree self) -> int"},
+        { (char *)"CvContourTree_header_size_set", _wrap_CvContourTree_header_size_set, METH_VARARGS, (char *)"CvContourTree_header_size_set(CvContourTree self, int header_size)"},
+        { (char *)"CvContourTree_header_size_get", _wrap_CvContourTree_header_size_get, METH_VARARGS, (char *)"CvContourTree_header_size_get(CvContourTree self) -> int"},
+        { (char *)"CvContourTree_h_prev_set", _wrap_CvContourTree_h_prev_set, METH_VARARGS, (char *)"CvContourTree_h_prev_set(CvContourTree self, CvSeq h_prev)"},
+        { (char *)"CvContourTree_h_prev_get", _wrap_CvContourTree_h_prev_get, METH_VARARGS, (char *)"CvContourTree_h_prev_get(CvContourTree self) -> CvSeq"},
+        { (char *)"CvContourTree_h_next_set", _wrap_CvContourTree_h_next_set, METH_VARARGS, (char *)"CvContourTree_h_next_set(CvContourTree self, CvSeq h_next)"},
+        { (char *)"CvContourTree_h_next_get", _wrap_CvContourTree_h_next_get, METH_VARARGS, (char *)"CvContourTree_h_next_get(CvContourTree self) -> CvSeq"},
+        { (char *)"CvContourTree_v_prev_set", _wrap_CvContourTree_v_prev_set, METH_VARARGS, (char *)"CvContourTree_v_prev_set(CvContourTree self, CvSeq v_prev)"},
+        { (char *)"CvContourTree_v_prev_get", _wrap_CvContourTree_v_prev_get, METH_VARARGS, (char *)"CvContourTree_v_prev_get(CvContourTree self) -> CvSeq"},
+        { (char *)"CvContourTree_v_next_set", _wrap_CvContourTree_v_next_set, METH_VARARGS, (char *)"CvContourTree_v_next_set(CvContourTree self, CvSeq v_next)"},
+        { (char *)"CvContourTree_v_next_get", _wrap_CvContourTree_v_next_get, METH_VARARGS, (char *)"CvContourTree_v_next_get(CvContourTree self) -> CvSeq"},
+        { (char *)"CvContourTree_total_set", _wrap_CvContourTree_total_set, METH_VARARGS, (char *)"CvContourTree_total_set(CvContourTree self, int total)"},
+        { (char *)"CvContourTree_total_get", _wrap_CvContourTree_total_get, METH_VARARGS, (char *)"CvContourTree_total_get(CvContourTree self) -> int"},
+        { (char *)"CvContourTree_elem_size_set", _wrap_CvContourTree_elem_size_set, METH_VARARGS, (char *)"CvContourTree_elem_size_set(CvContourTree self, int elem_size)"},
+        { (char *)"CvContourTree_elem_size_get", _wrap_CvContourTree_elem_size_get, METH_VARARGS, (char *)"CvContourTree_elem_size_get(CvContourTree self) -> int"},
+        { (char *)"CvContourTree_block_max_set", _wrap_CvContourTree_block_max_set, METH_VARARGS, (char *)"CvContourTree_block_max_set(CvContourTree self, schar block_max)"},
+        { (char *)"CvContourTree_block_max_get", _wrap_CvContourTree_block_max_get, METH_VARARGS, (char *)"CvContourTree_block_max_get(CvContourTree self) -> schar"},
+        { (char *)"CvContourTree_ptr_set", _wrap_CvContourTree_ptr_set, METH_VARARGS, (char *)"CvContourTree_ptr_set(CvContourTree self, schar ptr)"},
+        { (char *)"CvContourTree_ptr_get", _wrap_CvContourTree_ptr_get, METH_VARARGS, (char *)"CvContourTree_ptr_get(CvContourTree self) -> schar"},
+        { (char *)"CvContourTree_delta_elems_set", _wrap_CvContourTree_delta_elems_set, METH_VARARGS, (char *)"CvContourTree_delta_elems_set(CvContourTree self, int delta_elems)"},
+        { (char *)"CvContourTree_delta_elems_get", _wrap_CvContourTree_delta_elems_get, METH_VARARGS, (char *)"CvContourTree_delta_elems_get(CvContourTree self) -> int"},
+        { (char *)"CvContourTree_storage_set", _wrap_CvContourTree_storage_set, METH_VARARGS, (char *)"CvContourTree_storage_set(CvContourTree self, CvMemStorage storage)"},
+        { (char *)"CvContourTree_storage_get", _wrap_CvContourTree_storage_get, METH_VARARGS, (char *)"CvContourTree_storage_get(CvContourTree self) -> CvMemStorage"},
+        { (char *)"CvContourTree_free_blocks_set", _wrap_CvContourTree_free_blocks_set, METH_VARARGS, (char *)"CvContourTree_free_blocks_set(CvContourTree self, CvSeqBlock free_blocks)"},
+        { (char *)"CvContourTree_free_blocks_get", _wrap_CvContourTree_free_blocks_get, METH_VARARGS, (char *)"CvContourTree_free_blocks_get(CvContourTree self) -> CvSeqBlock"},
+        { (char *)"CvContourTree_first_set", _wrap_CvContourTree_first_set, METH_VARARGS, (char *)"CvContourTree_first_set(CvContourTree self, CvSeqBlock first)"},
+        { (char *)"CvContourTree_first_get", _wrap_CvContourTree_first_get, METH_VARARGS, (char *)"CvContourTree_first_get(CvContourTree self) -> CvSeqBlock"},
+        { (char *)"CvContourTree_p1_set", _wrap_CvContourTree_p1_set, METH_VARARGS, (char *)"CvContourTree_p1_set(CvContourTree self, CvPoint p1)"},
+        { (char *)"CvContourTree_p1_get", _wrap_CvContourTree_p1_get, METH_VARARGS, (char *)"CvContourTree_p1_get(CvContourTree self) -> CvPoint"},
+        { (char *)"CvContourTree_p2_set", _wrap_CvContourTree_p2_set, METH_VARARGS, (char *)"CvContourTree_p2_set(CvContourTree self, CvPoint p2)"},
+        { (char *)"CvContourTree_p2_get", _wrap_CvContourTree_p2_get, METH_VARARGS, (char *)"CvContourTree_p2_get(CvContourTree self) -> CvPoint"},
+        { (char *)"new_CvContourTree", _wrap_new_CvContourTree, METH_VARARGS, (char *)"new_CvContourTree() -> CvContourTree"},
+        { (char *)"delete_CvContourTree", _wrap_delete_CvContourTree, METH_VARARGS, (char *)"delete_CvContourTree(CvContourTree self)"},
         { (char *)"CvContourTree_swigregister", CvContourTree_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvConvexityDefect_start_set", _wrap_CvConvexityDefect_start_set, METH_VARARGS, NULL},
-        { (char *)"CvConvexityDefect_start_get", _wrap_CvConvexityDefect_start_get, METH_VARARGS, NULL},
-        { (char *)"CvConvexityDefect_end_set", _wrap_CvConvexityDefect_end_set, METH_VARARGS, NULL},
-        { (char *)"CvConvexityDefect_end_get", _wrap_CvConvexityDefect_end_get, METH_VARARGS, NULL},
-        { (char *)"CvConvexityDefect_depth_point_set", _wrap_CvConvexityDefect_depth_point_set, METH_VARARGS, NULL},
-        { (char *)"CvConvexityDefect_depth_point_get", _wrap_CvConvexityDefect_depth_point_get, METH_VARARGS, NULL},
-        { (char *)"CvConvexityDefect_depth_set", _wrap_CvConvexityDefect_depth_set, METH_VARARGS, NULL},
-        { (char *)"CvConvexityDefect_depth_get", _wrap_CvConvexityDefect_depth_get, METH_VARARGS, NULL},
-        { (char *)"new_CvConvexityDefect", _wrap_new_CvConvexityDefect, METH_VARARGS, NULL},
-        { (char *)"delete_CvConvexityDefect", _wrap_delete_CvConvexityDefect, METH_VARARGS, NULL},
+        { (char *)"CvConvexityDefect_start_set", _wrap_CvConvexityDefect_start_set, METH_VARARGS, (char *)"CvConvexityDefect_start_set(CvConvexityDefect self, CvPoint start)"},
+        { (char *)"CvConvexityDefect_start_get", _wrap_CvConvexityDefect_start_get, METH_VARARGS, (char *)"CvConvexityDefect_start_get(CvConvexityDefect self) -> CvPoint"},
+        { (char *)"CvConvexityDefect_end_set", _wrap_CvConvexityDefect_end_set, METH_VARARGS, (char *)"CvConvexityDefect_end_set(CvConvexityDefect self, CvPoint end)"},
+        { (char *)"CvConvexityDefect_end_get", _wrap_CvConvexityDefect_end_get, METH_VARARGS, (char *)"CvConvexityDefect_end_get(CvConvexityDefect self) -> CvPoint"},
+        { (char *)"CvConvexityDefect_depth_point_set", _wrap_CvConvexityDefect_depth_point_set, METH_VARARGS, (char *)"CvConvexityDefect_depth_point_set(CvConvexityDefect self, CvPoint depth_point)"},
+        { (char *)"CvConvexityDefect_depth_point_get", _wrap_CvConvexityDefect_depth_point_get, METH_VARARGS, (char *)"CvConvexityDefect_depth_point_get(CvConvexityDefect self) -> CvPoint"},
+        { (char *)"CvConvexityDefect_depth_set", _wrap_CvConvexityDefect_depth_set, METH_VARARGS, (char *)"CvConvexityDefect_depth_set(CvConvexityDefect self, float depth)"},
+        { (char *)"CvConvexityDefect_depth_get", _wrap_CvConvexityDefect_depth_get, METH_VARARGS, (char *)"CvConvexityDefect_depth_get(CvConvexityDefect self) -> float"},
+        { (char *)"new_CvConvexityDefect", _wrap_new_CvConvexityDefect, METH_VARARGS, (char *)"new_CvConvexityDefect() -> CvConvexityDefect"},
+        { (char *)"delete_CvConvexityDefect", _wrap_delete_CvConvexityDefect, METH_VARARGS, (char *)"delete_CvConvexityDefect(CvConvexityDefect self)"},
         { (char *)"CvConvexityDefect_swigregister", CvConvexityDefect_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvQuadEdge2D_flags_set", _wrap_CvQuadEdge2D_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvQuadEdge2D_flags_get", _wrap_CvQuadEdge2D_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvQuadEdge2D_pt_set", _wrap_CvQuadEdge2D_pt_set, METH_VARARGS, NULL},
-        { (char *)"CvQuadEdge2D_pt_get", _wrap_CvQuadEdge2D_pt_get, METH_VARARGS, NULL},
-        { (char *)"CvQuadEdge2D_next_set", _wrap_CvQuadEdge2D_next_set, METH_VARARGS, NULL},
-        { (char *)"CvQuadEdge2D_next_get", _wrap_CvQuadEdge2D_next_get, METH_VARARGS, NULL},
-        { (char *)"new_CvQuadEdge2D", _wrap_new_CvQuadEdge2D, METH_VARARGS, NULL},
-        { (char *)"delete_CvQuadEdge2D", _wrap_delete_CvQuadEdge2D, METH_VARARGS, NULL},
+        { (char *)"CvQuadEdge2D_flags_set", _wrap_CvQuadEdge2D_flags_set, METH_VARARGS, (char *)"CvQuadEdge2D_flags_set(CvQuadEdge2D self, int flags)"},
+        { (char *)"CvQuadEdge2D_flags_get", _wrap_CvQuadEdge2D_flags_get, METH_VARARGS, (char *)"CvQuadEdge2D_flags_get(CvQuadEdge2D self) -> int"},
+        { (char *)"CvQuadEdge2D_pt_set", _wrap_CvQuadEdge2D_pt_set, METH_VARARGS, (char *)"CvQuadEdge2D_pt_set(CvQuadEdge2D self, CvSubdiv2DPoint pt)"},
+        { (char *)"CvQuadEdge2D_pt_get", _wrap_CvQuadEdge2D_pt_get, METH_VARARGS, (char *)"CvQuadEdge2D_pt_get(CvQuadEdge2D self) -> CvSubdiv2DPoint"},
+        { (char *)"CvQuadEdge2D_next_set", _wrap_CvQuadEdge2D_next_set, METH_VARARGS, (char *)"CvQuadEdge2D_next_set(CvQuadEdge2D self, CvSubdiv2DEdge next)"},
+        { (char *)"CvQuadEdge2D_next_get", _wrap_CvQuadEdge2D_next_get, METH_VARARGS, (char *)"CvQuadEdge2D_next_get(CvQuadEdge2D self) -> CvSubdiv2DEdge"},
+        { (char *)"new_CvQuadEdge2D", _wrap_new_CvQuadEdge2D, METH_VARARGS, (char *)"new_CvQuadEdge2D() -> CvQuadEdge2D"},
+        { (char *)"delete_CvQuadEdge2D", _wrap_delete_CvQuadEdge2D, METH_VARARGS, (char *)"delete_CvQuadEdge2D(CvQuadEdge2D self)"},
         { (char *)"CvQuadEdge2D_swigregister", CvQuadEdge2D_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DPoint_flags_set", _wrap_CvSubdiv2DPoint_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DPoint_flags_get", _wrap_CvSubdiv2DPoint_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DPoint_first_set", _wrap_CvSubdiv2DPoint_first_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DPoint_first_get", _wrap_CvSubdiv2DPoint_first_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DPoint_pt_set", _wrap_CvSubdiv2DPoint_pt_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2DPoint_pt_get", _wrap_CvSubdiv2DPoint_pt_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSubdiv2DPoint", _wrap_new_CvSubdiv2DPoint, METH_VARARGS, NULL},
-        { (char *)"delete_CvSubdiv2DPoint", _wrap_delete_CvSubdiv2DPoint, METH_VARARGS, NULL},
+        { (char *)"CvSubdiv2DPoint_flags_set", _wrap_CvSubdiv2DPoint_flags_set, METH_VARARGS, (char *)"CvSubdiv2DPoint_flags_set(CvSubdiv2DPoint self, int flags)"},
+        { (char *)"CvSubdiv2DPoint_flags_get", _wrap_CvSubdiv2DPoint_flags_get, METH_VARARGS, (char *)"CvSubdiv2DPoint_flags_get(CvSubdiv2DPoint self) -> int"},
+        { (char *)"CvSubdiv2DPoint_first_set", _wrap_CvSubdiv2DPoint_first_set, METH_VARARGS, (char *)"CvSubdiv2DPoint_first_set(CvSubdiv2DPoint self, CvSubdiv2DEdge first)"},
+        { (char *)"CvSubdiv2DPoint_first_get", _wrap_CvSubdiv2DPoint_first_get, METH_VARARGS, (char *)"CvSubdiv2DPoint_first_get(CvSubdiv2DPoint self) -> CvSubdiv2DEdge"},
+        { (char *)"CvSubdiv2DPoint_pt_set", _wrap_CvSubdiv2DPoint_pt_set, METH_VARARGS, (char *)"CvSubdiv2DPoint_pt_set(CvSubdiv2DPoint self, CvPoint2D32f pt)"},
+        { (char *)"CvSubdiv2DPoint_pt_get", _wrap_CvSubdiv2DPoint_pt_get, METH_VARARGS, (char *)"CvSubdiv2DPoint_pt_get(CvSubdiv2DPoint self) -> CvPoint2D32f"},
+        { (char *)"new_CvSubdiv2DPoint", _wrap_new_CvSubdiv2DPoint, METH_VARARGS, (char *)"new_CvSubdiv2DPoint() -> CvSubdiv2DPoint"},
+        { (char *)"delete_CvSubdiv2DPoint", _wrap_delete_CvSubdiv2DPoint, METH_VARARGS, (char *)"delete_CvSubdiv2DPoint(CvSubdiv2DPoint self)"},
         { (char *)"CvSubdiv2DPoint_swigregister", CvSubdiv2DPoint_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_flags_set", _wrap_CvSubdiv2D_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_flags_get", _wrap_CvSubdiv2D_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_header_size_set", _wrap_CvSubdiv2D_header_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_header_size_get", _wrap_CvSubdiv2D_header_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_h_prev_set", _wrap_CvSubdiv2D_h_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_h_prev_get", _wrap_CvSubdiv2D_h_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_h_next_set", _wrap_CvSubdiv2D_h_next_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_h_next_get", _wrap_CvSubdiv2D_h_next_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_v_prev_set", _wrap_CvSubdiv2D_v_prev_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_v_prev_get", _wrap_CvSubdiv2D_v_prev_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_v_next_set", _wrap_CvSubdiv2D_v_next_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_v_next_get", _wrap_CvSubdiv2D_v_next_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_total_set", _wrap_CvSubdiv2D_total_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_total_get", _wrap_CvSubdiv2D_total_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_elem_size_set", _wrap_CvSubdiv2D_elem_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_elem_size_get", _wrap_CvSubdiv2D_elem_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_block_max_set", _wrap_CvSubdiv2D_block_max_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_block_max_get", _wrap_CvSubdiv2D_block_max_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_ptr_set", _wrap_CvSubdiv2D_ptr_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_ptr_get", _wrap_CvSubdiv2D_ptr_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_delta_elems_set", _wrap_CvSubdiv2D_delta_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_delta_elems_get", _wrap_CvSubdiv2D_delta_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_storage_set", _wrap_CvSubdiv2D_storage_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_storage_get", _wrap_CvSubdiv2D_storage_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_free_blocks_set", _wrap_CvSubdiv2D_free_blocks_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_free_blocks_get", _wrap_CvSubdiv2D_free_blocks_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_first_set", _wrap_CvSubdiv2D_first_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_first_get", _wrap_CvSubdiv2D_first_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_free_elems_set", _wrap_CvSubdiv2D_free_elems_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_free_elems_get", _wrap_CvSubdiv2D_free_elems_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_active_count_set", _wrap_CvSubdiv2D_active_count_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_active_count_get", _wrap_CvSubdiv2D_active_count_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_quad_edges_set", _wrap_CvSubdiv2D_quad_edges_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_quad_edges_get", _wrap_CvSubdiv2D_quad_edges_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_is_geometry_valid_set", _wrap_CvSubdiv2D_is_geometry_valid_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_is_geometry_valid_get", _wrap_CvSubdiv2D_is_geometry_valid_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_recent_edge_set", _wrap_CvSubdiv2D_recent_edge_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_recent_edge_get", _wrap_CvSubdiv2D_recent_edge_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_topleft_set", _wrap_CvSubdiv2D_topleft_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_topleft_get", _wrap_CvSubdiv2D_topleft_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_bottomright_set", _wrap_CvSubdiv2D_bottomright_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_bottomright_get", _wrap_CvSubdiv2D_bottomright_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_edges_set", _wrap_CvSubdiv2D_edges_set, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_edges_get", _wrap_CvSubdiv2D_edges_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_typed_edges_get", _wrap_CvSubdiv2D_typed_edges_get, METH_VARARGS, NULL},
-        { (char *)"CvSubdiv2D_typed_edges_set", _wrap_CvSubdiv2D_typed_edges_set, METH_VARARGS, NULL},
-        { (char *)"new_CvSubdiv2D", _wrap_new_CvSubdiv2D, METH_VARARGS, NULL},
-        { (char *)"delete_CvSubdiv2D", _wrap_delete_CvSubdiv2D, METH_VARARGS, NULL},
+        { (char *)"CvSubdiv2D_flags_set", _wrap_CvSubdiv2D_flags_set, METH_VARARGS, (char *)"CvSubdiv2D_flags_set(CvSubdiv2D self, int flags)"},
+        { (char *)"CvSubdiv2D_flags_get", _wrap_CvSubdiv2D_flags_get, METH_VARARGS, (char *)"CvSubdiv2D_flags_get(CvSubdiv2D self) -> int"},
+        { (char *)"CvSubdiv2D_header_size_set", _wrap_CvSubdiv2D_header_size_set, METH_VARARGS, (char *)"CvSubdiv2D_header_size_set(CvSubdiv2D self, int header_size)"},
+        { (char *)"CvSubdiv2D_header_size_get", _wrap_CvSubdiv2D_header_size_get, METH_VARARGS, (char *)"CvSubdiv2D_header_size_get(CvSubdiv2D self) -> int"},
+        { (char *)"CvSubdiv2D_h_prev_set", _wrap_CvSubdiv2D_h_prev_set, METH_VARARGS, (char *)"CvSubdiv2D_h_prev_set(CvSubdiv2D self, CvSeq h_prev)"},
+        { (char *)"CvSubdiv2D_h_prev_get", _wrap_CvSubdiv2D_h_prev_get, METH_VARARGS, (char *)"CvSubdiv2D_h_prev_get(CvSubdiv2D self) -> CvSeq"},
+        { (char *)"CvSubdiv2D_h_next_set", _wrap_CvSubdiv2D_h_next_set, METH_VARARGS, (char *)"CvSubdiv2D_h_next_set(CvSubdiv2D self, CvSeq h_next)"},
+        { (char *)"CvSubdiv2D_h_next_get", _wrap_CvSubdiv2D_h_next_get, METH_VARARGS, (char *)"CvSubdiv2D_h_next_get(CvSubdiv2D self) -> CvSeq"},
+        { (char *)"CvSubdiv2D_v_prev_set", _wrap_CvSubdiv2D_v_prev_set, METH_VARARGS, (char *)"CvSubdiv2D_v_prev_set(CvSubdiv2D self, CvSeq v_prev)"},
+        { (char *)"CvSubdiv2D_v_prev_get", _wrap_CvSubdiv2D_v_prev_get, METH_VARARGS, (char *)"CvSubdiv2D_v_prev_get(CvSubdiv2D self) -> CvSeq"},
+        { (char *)"CvSubdiv2D_v_next_set", _wrap_CvSubdiv2D_v_next_set, METH_VARARGS, (char *)"CvSubdiv2D_v_next_set(CvSubdiv2D self, CvSeq v_next)"},
+        { (char *)"CvSubdiv2D_v_next_get", _wrap_CvSubdiv2D_v_next_get, METH_VARARGS, (char *)"CvSubdiv2D_v_next_get(CvSubdiv2D self) -> CvSeq"},
+        { (char *)"CvSubdiv2D_total_set", _wrap_CvSubdiv2D_total_set, METH_VARARGS, (char *)"CvSubdiv2D_total_set(CvSubdiv2D self, int total)"},
+        { (char *)"CvSubdiv2D_total_get", _wrap_CvSubdiv2D_total_get, METH_VARARGS, (char *)"CvSubdiv2D_total_get(CvSubdiv2D self) -> int"},
+        { (char *)"CvSubdiv2D_elem_size_set", _wrap_CvSubdiv2D_elem_size_set, METH_VARARGS, (char *)"CvSubdiv2D_elem_size_set(CvSubdiv2D self, int elem_size)"},
+        { (char *)"CvSubdiv2D_elem_size_get", _wrap_CvSubdiv2D_elem_size_get, METH_VARARGS, (char *)"CvSubdiv2D_elem_size_get(CvSubdiv2D self) -> int"},
+        { (char *)"CvSubdiv2D_block_max_set", _wrap_CvSubdiv2D_block_max_set, METH_VARARGS, (char *)"CvSubdiv2D_block_max_set(CvSubdiv2D self, schar block_max)"},
+        { (char *)"CvSubdiv2D_block_max_get", _wrap_CvSubdiv2D_block_max_get, METH_VARARGS, (char *)"CvSubdiv2D_block_max_get(CvSubdiv2D self) -> schar"},
+        { (char *)"CvSubdiv2D_ptr_set", _wrap_CvSubdiv2D_ptr_set, METH_VARARGS, (char *)"CvSubdiv2D_ptr_set(CvSubdiv2D self, schar ptr)"},
+        { (char *)"CvSubdiv2D_ptr_get", _wrap_CvSubdiv2D_ptr_get, METH_VARARGS, (char *)"CvSubdiv2D_ptr_get(CvSubdiv2D self) -> schar"},
+        { (char *)"CvSubdiv2D_delta_elems_set", _wrap_CvSubdiv2D_delta_elems_set, METH_VARARGS, (char *)"CvSubdiv2D_delta_elems_set(CvSubdiv2D self, int delta_elems)"},
+        { (char *)"CvSubdiv2D_delta_elems_get", _wrap_CvSubdiv2D_delta_elems_get, METH_VARARGS, (char *)"CvSubdiv2D_delta_elems_get(CvSubdiv2D self) -> int"},
+        { (char *)"CvSubdiv2D_storage_set", _wrap_CvSubdiv2D_storage_set, METH_VARARGS, (char *)"CvSubdiv2D_storage_set(CvSubdiv2D self, CvMemStorage storage)"},
+        { (char *)"CvSubdiv2D_storage_get", _wrap_CvSubdiv2D_storage_get, METH_VARARGS, (char *)"CvSubdiv2D_storage_get(CvSubdiv2D self) -> CvMemStorage"},
+        { (char *)"CvSubdiv2D_free_blocks_set", _wrap_CvSubdiv2D_free_blocks_set, METH_VARARGS, (char *)"CvSubdiv2D_free_blocks_set(CvSubdiv2D self, CvSeqBlock free_blocks)"},
+        { (char *)"CvSubdiv2D_free_blocks_get", _wrap_CvSubdiv2D_free_blocks_get, METH_VARARGS, (char *)"CvSubdiv2D_free_blocks_get(CvSubdiv2D self) -> CvSeqBlock"},
+        { (char *)"CvSubdiv2D_first_set", _wrap_CvSubdiv2D_first_set, METH_VARARGS, (char *)"CvSubdiv2D_first_set(CvSubdiv2D self, CvSeqBlock first)"},
+        { (char *)"CvSubdiv2D_first_get", _wrap_CvSubdiv2D_first_get, METH_VARARGS, (char *)"CvSubdiv2D_first_get(CvSubdiv2D self) -> CvSeqBlock"},
+        { (char *)"CvSubdiv2D_free_elems_set", _wrap_CvSubdiv2D_free_elems_set, METH_VARARGS, (char *)"CvSubdiv2D_free_elems_set(CvSubdiv2D self, CvSetElem free_elems)"},
+        { (char *)"CvSubdiv2D_free_elems_get", _wrap_CvSubdiv2D_free_elems_get, METH_VARARGS, (char *)"CvSubdiv2D_free_elems_get(CvSubdiv2D self) -> CvSetElem"},
+        { (char *)"CvSubdiv2D_active_count_set", _wrap_CvSubdiv2D_active_count_set, METH_VARARGS, (char *)"CvSubdiv2D_active_count_set(CvSubdiv2D self, int active_count)"},
+        { (char *)"CvSubdiv2D_active_count_get", _wrap_CvSubdiv2D_active_count_get, METH_VARARGS, (char *)"CvSubdiv2D_active_count_get(CvSubdiv2D self) -> int"},
+        { (char *)"CvSubdiv2D_quad_edges_set", _wrap_CvSubdiv2D_quad_edges_set, METH_VARARGS, (char *)"CvSubdiv2D_quad_edges_set(CvSubdiv2D self, int quad_edges)"},
+        { (char *)"CvSubdiv2D_quad_edges_get", _wrap_CvSubdiv2D_quad_edges_get, METH_VARARGS, (char *)"CvSubdiv2D_quad_edges_get(CvSubdiv2D self) -> int"},
+        { (char *)"CvSubdiv2D_is_geometry_valid_set", _wrap_CvSubdiv2D_is_geometry_valid_set, METH_VARARGS, (char *)"CvSubdiv2D_is_geometry_valid_set(CvSubdiv2D self, int is_geometry_valid)"},
+        { (char *)"CvSubdiv2D_is_geometry_valid_get", _wrap_CvSubdiv2D_is_geometry_valid_get, METH_VARARGS, (char *)"CvSubdiv2D_is_geometry_valid_get(CvSubdiv2D self) -> int"},
+        { (char *)"CvSubdiv2D_recent_edge_set", _wrap_CvSubdiv2D_recent_edge_set, METH_VARARGS, (char *)"CvSubdiv2D_recent_edge_set(CvSubdiv2D self, CvSubdiv2DEdge recent_edge)"},
+        { (char *)"CvSubdiv2D_recent_edge_get", _wrap_CvSubdiv2D_recent_edge_get, METH_VARARGS, (char *)"CvSubdiv2D_recent_edge_get(CvSubdiv2D self) -> CvSubdiv2DEdge"},
+        { (char *)"CvSubdiv2D_topleft_set", _wrap_CvSubdiv2D_topleft_set, METH_VARARGS, (char *)"CvSubdiv2D_topleft_set(CvSubdiv2D self, CvPoint2D32f topleft)"},
+        { (char *)"CvSubdiv2D_topleft_get", _wrap_CvSubdiv2D_topleft_get, METH_VARARGS, (char *)"CvSubdiv2D_topleft_get(CvSubdiv2D self) -> CvPoint2D32f"},
+        { (char *)"CvSubdiv2D_bottomright_set", _wrap_CvSubdiv2D_bottomright_set, METH_VARARGS, (char *)"CvSubdiv2D_bottomright_set(CvSubdiv2D self, CvPoint2D32f bottomright)"},
+        { (char *)"CvSubdiv2D_bottomright_get", _wrap_CvSubdiv2D_bottomright_get, METH_VARARGS, (char *)"CvSubdiv2D_bottomright_get(CvSubdiv2D self) -> CvPoint2D32f"},
+        { (char *)"CvSubdiv2D_edges_set", _wrap_CvSubdiv2D_edges_set, METH_VARARGS, (char *)"CvSubdiv2D_edges_set(CvSubdiv2D self, CvSeq_CvQuadEdge2D typed_edges)"},
+        { (char *)"CvSubdiv2D_edges_get", _wrap_CvSubdiv2D_edges_get, METH_VARARGS, (char *)"CvSubdiv2D_edges_get(CvSubdiv2D self) -> CvSeq_CvQuadEdge2D"},
+        { (char *)"CvSubdiv2D_typed_edges_get", _wrap_CvSubdiv2D_typed_edges_get, METH_VARARGS, (char *)"CvSubdiv2D_typed_edges_get(CvSubdiv2D self) -> CvSeq_CvQuadEdge2D"},
+        { (char *)"CvSubdiv2D_typed_edges_set", _wrap_CvSubdiv2D_typed_edges_set, METH_VARARGS, (char *)"CvSubdiv2D_typed_edges_set(CvSubdiv2D self, CvSeq_CvQuadEdge2D arg1)"},
+        { (char *)"new_CvSubdiv2D", _wrap_new_CvSubdiv2D, METH_VARARGS, (char *)"new_CvSubdiv2D() -> CvSubdiv2D"},
+        { (char *)"delete_CvSubdiv2D", _wrap_delete_CvSubdiv2D, METH_VARARGS, (char *)"delete_CvSubdiv2D(CvSubdiv2D self)"},
         { (char *)"CvSubdiv2D_swigregister", CvSubdiv2D_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvMatrix3_m_set", _wrap_CvMatrix3_m_set, METH_VARARGS, NULL},
-        { (char *)"CvMatrix3_m_get", _wrap_CvMatrix3_m_get, METH_VARARGS, NULL},
-        { (char *)"new_CvMatrix3", _wrap_new_CvMatrix3, METH_VARARGS, NULL},
-        { (char *)"delete_CvMatrix3", _wrap_delete_CvMatrix3, METH_VARARGS, NULL},
+        { (char *)"CvMatrix3_m_set", _wrap_CvMatrix3_m_set, METH_VARARGS, (char *)"CvMatrix3_m_set(CvMatrix3 self, float m)"},
+        { (char *)"CvMatrix3_m_get", _wrap_CvMatrix3_m_get, METH_VARARGS, (char *)"CvMatrix3_m_get(CvMatrix3 self) -> float"},
+        { (char *)"new_CvMatrix3", _wrap_new_CvMatrix3, METH_VARARGS, (char *)"new_CvMatrix3() -> CvMatrix3"},
+        { (char *)"delete_CvMatrix3", _wrap_delete_CvMatrix3, METH_VARARGS, (char *)"delete_CvMatrix3(CvMatrix3 self)"},
         { (char *)"CvMatrix3_swigregister", CvMatrix3_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_MP_set", _wrap_CvConDensation_MP_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_MP_get", _wrap_CvConDensation_MP_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_DP_set", _wrap_CvConDensation_DP_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_DP_get", _wrap_CvConDensation_DP_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_DynamMatr_set", _wrap_CvConDensation_DynamMatr_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_DynamMatr_get", _wrap_CvConDensation_DynamMatr_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_State_set", _wrap_CvConDensation_State_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_State_get", _wrap_CvConDensation_State_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_SamplesNum_set", _wrap_CvConDensation_SamplesNum_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_SamplesNum_get", _wrap_CvConDensation_SamplesNum_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_flSamples_set", _wrap_CvConDensation_flSamples_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_flSamples_get", _wrap_CvConDensation_flSamples_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_flNewSamples_set", _wrap_CvConDensation_flNewSamples_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_flNewSamples_get", _wrap_CvConDensation_flNewSamples_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_flConfidence_set", _wrap_CvConDensation_flConfidence_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_flConfidence_get", _wrap_CvConDensation_flConfidence_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_flCumulative_set", _wrap_CvConDensation_flCumulative_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_flCumulative_get", _wrap_CvConDensation_flCumulative_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_Temp_set", _wrap_CvConDensation_Temp_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_Temp_get", _wrap_CvConDensation_Temp_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_RandomSample_set", _wrap_CvConDensation_RandomSample_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_RandomSample_get", _wrap_CvConDensation_RandomSample_get, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_RandS_set", _wrap_CvConDensation_RandS_set, METH_VARARGS, NULL},
-        { (char *)"CvConDensation_RandS_get", _wrap_CvConDensation_RandS_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvConDensation", _wrap_delete_CvConDensation, METH_VARARGS, NULL},
+        { (char *)"CvConDensation_MP_set", _wrap_CvConDensation_MP_set, METH_VARARGS, (char *)"CvConDensation_MP_set(CvConDensation self, int MP)"},
+        { (char *)"CvConDensation_MP_get", _wrap_CvConDensation_MP_get, METH_VARARGS, (char *)"CvConDensation_MP_get(CvConDensation self) -> int"},
+        { (char *)"CvConDensation_DP_set", _wrap_CvConDensation_DP_set, METH_VARARGS, (char *)"CvConDensation_DP_set(CvConDensation self, int DP)"},
+        { (char *)"CvConDensation_DP_get", _wrap_CvConDensation_DP_get, METH_VARARGS, (char *)"CvConDensation_DP_get(CvConDensation self) -> int"},
+        { (char *)"CvConDensation_DynamMatr_set", _wrap_CvConDensation_DynamMatr_set, METH_VARARGS, (char *)"CvConDensation_DynamMatr_set(CvConDensation self, float DynamMatr)"},
+        { (char *)"CvConDensation_DynamMatr_get", _wrap_CvConDensation_DynamMatr_get, METH_VARARGS, (char *)"CvConDensation_DynamMatr_get(CvConDensation self) -> float"},
+        { (char *)"CvConDensation_State_set", _wrap_CvConDensation_State_set, METH_VARARGS, (char *)"CvConDensation_State_set(CvConDensation self, float State)"},
+        { (char *)"CvConDensation_State_get", _wrap_CvConDensation_State_get, METH_VARARGS, (char *)"CvConDensation_State_get(CvConDensation self) -> float"},
+        { (char *)"CvConDensation_SamplesNum_set", _wrap_CvConDensation_SamplesNum_set, METH_VARARGS, (char *)"CvConDensation_SamplesNum_set(CvConDensation self, int SamplesNum)"},
+        { (char *)"CvConDensation_SamplesNum_get", _wrap_CvConDensation_SamplesNum_get, METH_VARARGS, (char *)"CvConDensation_SamplesNum_get(CvConDensation self) -> int"},
+        { (char *)"CvConDensation_flSamples_set", _wrap_CvConDensation_flSamples_set, METH_VARARGS, (char *)"CvConDensation_flSamples_set(CvConDensation self, float flSamples)"},
+        { (char *)"CvConDensation_flSamples_get", _wrap_CvConDensation_flSamples_get, METH_VARARGS, (char *)"CvConDensation_flSamples_get(CvConDensation self) -> float"},
+        { (char *)"CvConDensation_flNewSamples_set", _wrap_CvConDensation_flNewSamples_set, METH_VARARGS, (char *)"CvConDensation_flNewSamples_set(CvConDensation self, float flNewSamples)"},
+        { (char *)"CvConDensation_flNewSamples_get", _wrap_CvConDensation_flNewSamples_get, METH_VARARGS, (char *)"CvConDensation_flNewSamples_get(CvConDensation self) -> float"},
+        { (char *)"CvConDensation_flConfidence_set", _wrap_CvConDensation_flConfidence_set, METH_VARARGS, (char *)"CvConDensation_flConfidence_set(CvConDensation self, float flConfidence)"},
+        { (char *)"CvConDensation_flConfidence_get", _wrap_CvConDensation_flConfidence_get, METH_VARARGS, (char *)"CvConDensation_flConfidence_get(CvConDensation self) -> float"},
+        { (char *)"CvConDensation_flCumulative_set", _wrap_CvConDensation_flCumulative_set, METH_VARARGS, (char *)"CvConDensation_flCumulative_set(CvConDensation self, float flCumulative)"},
+        { (char *)"CvConDensation_flCumulative_get", _wrap_CvConDensation_flCumulative_get, METH_VARARGS, (char *)"CvConDensation_flCumulative_get(CvConDensation self) -> float"},
+        { (char *)"CvConDensation_Temp_set", _wrap_CvConDensation_Temp_set, METH_VARARGS, (char *)"CvConDensation_Temp_set(CvConDensation self, float Temp)"},
+        { (char *)"CvConDensation_Temp_get", _wrap_CvConDensation_Temp_get, METH_VARARGS, (char *)"CvConDensation_Temp_get(CvConDensation self) -> float"},
+        { (char *)"CvConDensation_RandomSample_set", _wrap_CvConDensation_RandomSample_set, METH_VARARGS, (char *)"CvConDensation_RandomSample_set(CvConDensation self, float RandomSample)"},
+        { (char *)"CvConDensation_RandomSample_get", _wrap_CvConDensation_RandomSample_get, METH_VARARGS, (char *)"CvConDensation_RandomSample_get(CvConDensation self) -> float"},
+        { (char *)"CvConDensation_RandS_set", _wrap_CvConDensation_RandS_set, METH_VARARGS, (char *)"CvConDensation_RandS_set(CvConDensation self, CvRandState RandS)"},
+        { (char *)"CvConDensation_RandS_get", _wrap_CvConDensation_RandS_get, METH_VARARGS, (char *)"CvConDensation_RandS_get(CvConDensation self) -> CvRandState"},
+        { (char *)"delete_CvConDensation", _wrap_delete_CvConDensation, METH_VARARGS, (char *)"delete_CvConDensation(CvConDensation self)"},
         { (char *)"CvConDensation_swigregister", CvConDensation_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvKalman_MP_set", _wrap_CvKalman_MP_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_MP_get", _wrap_CvKalman_MP_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_DP_set", _wrap_CvKalman_DP_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_DP_get", _wrap_CvKalman_DP_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_CP_set", _wrap_CvKalman_CP_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_CP_get", _wrap_CvKalman_CP_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PosterState_set", _wrap_CvKalman_PosterState_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PosterState_get", _wrap_CvKalman_PosterState_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PriorState_set", _wrap_CvKalman_PriorState_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PriorState_get", _wrap_CvKalman_PriorState_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_DynamMatr_set", _wrap_CvKalman_DynamMatr_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_DynamMatr_get", _wrap_CvKalman_DynamMatr_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_MeasurementMatr_set", _wrap_CvKalman_MeasurementMatr_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_MeasurementMatr_get", _wrap_CvKalman_MeasurementMatr_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_MNCovariance_set", _wrap_CvKalman_MNCovariance_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_MNCovariance_get", _wrap_CvKalman_MNCovariance_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PNCovariance_set", _wrap_CvKalman_PNCovariance_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PNCovariance_get", _wrap_CvKalman_PNCovariance_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_KalmGainMatr_set", _wrap_CvKalman_KalmGainMatr_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_KalmGainMatr_get", _wrap_CvKalman_KalmGainMatr_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PriorErrorCovariance_set", _wrap_CvKalman_PriorErrorCovariance_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PriorErrorCovariance_get", _wrap_CvKalman_PriorErrorCovariance_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PosterErrorCovariance_set", _wrap_CvKalman_PosterErrorCovariance_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_PosterErrorCovariance_get", _wrap_CvKalman_PosterErrorCovariance_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_Temp1_set", _wrap_CvKalman_Temp1_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_Temp1_get", _wrap_CvKalman_Temp1_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_Temp2_set", _wrap_CvKalman_Temp2_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_Temp2_get", _wrap_CvKalman_Temp2_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_state_pre_set", _wrap_CvKalman_state_pre_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_state_pre_get", _wrap_CvKalman_state_pre_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_state_post_set", _wrap_CvKalman_state_post_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_state_post_get", _wrap_CvKalman_state_post_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_transition_matrix_set", _wrap_CvKalman_transition_matrix_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_transition_matrix_get", _wrap_CvKalman_transition_matrix_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_control_matrix_set", _wrap_CvKalman_control_matrix_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_control_matrix_get", _wrap_CvKalman_control_matrix_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_measurement_matrix_set", _wrap_CvKalman_measurement_matrix_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_measurement_matrix_get", _wrap_CvKalman_measurement_matrix_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_process_noise_cov_set", _wrap_CvKalman_process_noise_cov_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_process_noise_cov_get", _wrap_CvKalman_process_noise_cov_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_measurement_noise_cov_set", _wrap_CvKalman_measurement_noise_cov_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_measurement_noise_cov_get", _wrap_CvKalman_measurement_noise_cov_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_error_cov_pre_set", _wrap_CvKalman_error_cov_pre_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_error_cov_pre_get", _wrap_CvKalman_error_cov_pre_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_gain_set", _wrap_CvKalman_gain_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_gain_get", _wrap_CvKalman_gain_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_error_cov_post_set", _wrap_CvKalman_error_cov_post_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_error_cov_post_get", _wrap_CvKalman_error_cov_post_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp1_set", _wrap_CvKalman_temp1_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp1_get", _wrap_CvKalman_temp1_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp2_set", _wrap_CvKalman_temp2_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp2_get", _wrap_CvKalman_temp2_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp3_set", _wrap_CvKalman_temp3_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp3_get", _wrap_CvKalman_temp3_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp4_set", _wrap_CvKalman_temp4_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp4_get", _wrap_CvKalman_temp4_get, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp5_set", _wrap_CvKalman_temp5_set, METH_VARARGS, NULL},
-        { (char *)"CvKalman_temp5_get", _wrap_CvKalman_temp5_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvKalman", _wrap_delete_CvKalman, METH_VARARGS, NULL},
+        { (char *)"CvKalman_MP_set", _wrap_CvKalman_MP_set, METH_VARARGS, (char *)"CvKalman_MP_set(CvKalman self, int MP)"},
+        { (char *)"CvKalman_MP_get", _wrap_CvKalman_MP_get, METH_VARARGS, (char *)"CvKalman_MP_get(CvKalman self) -> int"},
+        { (char *)"CvKalman_DP_set", _wrap_CvKalman_DP_set, METH_VARARGS, (char *)"CvKalman_DP_set(CvKalman self, int DP)"},
+        { (char *)"CvKalman_DP_get", _wrap_CvKalman_DP_get, METH_VARARGS, (char *)"CvKalman_DP_get(CvKalman self) -> int"},
+        { (char *)"CvKalman_CP_set", _wrap_CvKalman_CP_set, METH_VARARGS, (char *)"CvKalman_CP_set(CvKalman self, int CP)"},
+        { (char *)"CvKalman_CP_get", _wrap_CvKalman_CP_get, METH_VARARGS, (char *)"CvKalman_CP_get(CvKalman self) -> int"},
+        { (char *)"CvKalman_PosterState_set", _wrap_CvKalman_PosterState_set, METH_VARARGS, (char *)"CvKalman_PosterState_set(CvKalman self, float PosterState)"},
+        { (char *)"CvKalman_PosterState_get", _wrap_CvKalman_PosterState_get, METH_VARARGS, (char *)"CvKalman_PosterState_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_PriorState_set", _wrap_CvKalman_PriorState_set, METH_VARARGS, (char *)"CvKalman_PriorState_set(CvKalman self, float PriorState)"},
+        { (char *)"CvKalman_PriorState_get", _wrap_CvKalman_PriorState_get, METH_VARARGS, (char *)"CvKalman_PriorState_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_DynamMatr_set", _wrap_CvKalman_DynamMatr_set, METH_VARARGS, (char *)"CvKalman_DynamMatr_set(CvKalman self, float DynamMatr)"},
+        { (char *)"CvKalman_DynamMatr_get", _wrap_CvKalman_DynamMatr_get, METH_VARARGS, (char *)"CvKalman_DynamMatr_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_MeasurementMatr_set", _wrap_CvKalman_MeasurementMatr_set, METH_VARARGS, (char *)"CvKalman_MeasurementMatr_set(CvKalman self, float MeasurementMatr)"},
+        { (char *)"CvKalman_MeasurementMatr_get", _wrap_CvKalman_MeasurementMatr_get, METH_VARARGS, (char *)"CvKalman_MeasurementMatr_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_MNCovariance_set", _wrap_CvKalman_MNCovariance_set, METH_VARARGS, (char *)"CvKalman_MNCovariance_set(CvKalman self, float MNCovariance)"},
+        { (char *)"CvKalman_MNCovariance_get", _wrap_CvKalman_MNCovariance_get, METH_VARARGS, (char *)"CvKalman_MNCovariance_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_PNCovariance_set", _wrap_CvKalman_PNCovariance_set, METH_VARARGS, (char *)"CvKalman_PNCovariance_set(CvKalman self, float PNCovariance)"},
+        { (char *)"CvKalman_PNCovariance_get", _wrap_CvKalman_PNCovariance_get, METH_VARARGS, (char *)"CvKalman_PNCovariance_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_KalmGainMatr_set", _wrap_CvKalman_KalmGainMatr_set, METH_VARARGS, (char *)"CvKalman_KalmGainMatr_set(CvKalman self, float KalmGainMatr)"},
+        { (char *)"CvKalman_KalmGainMatr_get", _wrap_CvKalman_KalmGainMatr_get, METH_VARARGS, (char *)"CvKalman_KalmGainMatr_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_PriorErrorCovariance_set", _wrap_CvKalman_PriorErrorCovariance_set, METH_VARARGS, (char *)"CvKalman_PriorErrorCovariance_set(CvKalman self, float PriorErrorCovariance)"},
+        { (char *)"CvKalman_PriorErrorCovariance_get", _wrap_CvKalman_PriorErrorCovariance_get, METH_VARARGS, (char *)"CvKalman_PriorErrorCovariance_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_PosterErrorCovariance_set", _wrap_CvKalman_PosterErrorCovariance_set, METH_VARARGS, (char *)"CvKalman_PosterErrorCovariance_set(CvKalman self, float PosterErrorCovariance)"},
+        { (char *)"CvKalman_PosterErrorCovariance_get", _wrap_CvKalman_PosterErrorCovariance_get, METH_VARARGS, (char *)"CvKalman_PosterErrorCovariance_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_Temp1_set", _wrap_CvKalman_Temp1_set, METH_VARARGS, (char *)"CvKalman_Temp1_set(CvKalman self, float Temp1)"},
+        { (char *)"CvKalman_Temp1_get", _wrap_CvKalman_Temp1_get, METH_VARARGS, (char *)"CvKalman_Temp1_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_Temp2_set", _wrap_CvKalman_Temp2_set, METH_VARARGS, (char *)"CvKalman_Temp2_set(CvKalman self, float Temp2)"},
+        { (char *)"CvKalman_Temp2_get", _wrap_CvKalman_Temp2_get, METH_VARARGS, (char *)"CvKalman_Temp2_get(CvKalman self) -> float"},
+        { (char *)"CvKalman_state_pre_set", _wrap_CvKalman_state_pre_set, METH_VARARGS, (char *)"CvKalman_state_pre_set(CvKalman self, CvMat state_pre)"},
+        { (char *)"CvKalman_state_pre_get", _wrap_CvKalman_state_pre_get, METH_VARARGS, (char *)"CvKalman_state_pre_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_state_post_set", _wrap_CvKalman_state_post_set, METH_VARARGS, (char *)"CvKalman_state_post_set(CvKalman self, CvMat state_post)"},
+        { (char *)"CvKalman_state_post_get", _wrap_CvKalman_state_post_get, METH_VARARGS, (char *)"CvKalman_state_post_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_transition_matrix_set", _wrap_CvKalman_transition_matrix_set, METH_VARARGS, (char *)"CvKalman_transition_matrix_set(CvKalman self, CvMat transition_matrix)"},
+        { (char *)"CvKalman_transition_matrix_get", _wrap_CvKalman_transition_matrix_get, METH_VARARGS, (char *)"CvKalman_transition_matrix_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_control_matrix_set", _wrap_CvKalman_control_matrix_set, METH_VARARGS, (char *)"CvKalman_control_matrix_set(CvKalman self, CvMat control_matrix)"},
+        { (char *)"CvKalman_control_matrix_get", _wrap_CvKalman_control_matrix_get, METH_VARARGS, (char *)"CvKalman_control_matrix_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_measurement_matrix_set", _wrap_CvKalman_measurement_matrix_set, METH_VARARGS, (char *)"CvKalman_measurement_matrix_set(CvKalman self, CvMat measurement_matrix)"},
+        { (char *)"CvKalman_measurement_matrix_get", _wrap_CvKalman_measurement_matrix_get, METH_VARARGS, (char *)"CvKalman_measurement_matrix_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_process_noise_cov_set", _wrap_CvKalman_process_noise_cov_set, METH_VARARGS, (char *)"CvKalman_process_noise_cov_set(CvKalman self, CvMat process_noise_cov)"},
+        { (char *)"CvKalman_process_noise_cov_get", _wrap_CvKalman_process_noise_cov_get, METH_VARARGS, (char *)"CvKalman_process_noise_cov_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_measurement_noise_cov_set", _wrap_CvKalman_measurement_noise_cov_set, METH_VARARGS, (char *)"CvKalman_measurement_noise_cov_set(CvKalman self, CvMat measurement_noise_cov)"},
+        { (char *)"CvKalman_measurement_noise_cov_get", _wrap_CvKalman_measurement_noise_cov_get, METH_VARARGS, (char *)"CvKalman_measurement_noise_cov_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_error_cov_pre_set", _wrap_CvKalman_error_cov_pre_set, METH_VARARGS, (char *)"CvKalman_error_cov_pre_set(CvKalman self, CvMat error_cov_pre)"},
+        { (char *)"CvKalman_error_cov_pre_get", _wrap_CvKalman_error_cov_pre_get, METH_VARARGS, (char *)"CvKalman_error_cov_pre_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_gain_set", _wrap_CvKalman_gain_set, METH_VARARGS, (char *)"CvKalman_gain_set(CvKalman self, CvMat gain)"},
+        { (char *)"CvKalman_gain_get", _wrap_CvKalman_gain_get, METH_VARARGS, (char *)"CvKalman_gain_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_error_cov_post_set", _wrap_CvKalman_error_cov_post_set, METH_VARARGS, (char *)"CvKalman_error_cov_post_set(CvKalman self, CvMat error_cov_post)"},
+        { (char *)"CvKalman_error_cov_post_get", _wrap_CvKalman_error_cov_post_get, METH_VARARGS, (char *)"CvKalman_error_cov_post_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_temp1_set", _wrap_CvKalman_temp1_set, METH_VARARGS, (char *)"CvKalman_temp1_set(CvKalman self, CvMat temp1)"},
+        { (char *)"CvKalman_temp1_get", _wrap_CvKalman_temp1_get, METH_VARARGS, (char *)"CvKalman_temp1_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_temp2_set", _wrap_CvKalman_temp2_set, METH_VARARGS, (char *)"CvKalman_temp2_set(CvKalman self, CvMat temp2)"},
+        { (char *)"CvKalman_temp2_get", _wrap_CvKalman_temp2_get, METH_VARARGS, (char *)"CvKalman_temp2_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_temp3_set", _wrap_CvKalman_temp3_set, METH_VARARGS, (char *)"CvKalman_temp3_set(CvKalman self, CvMat temp3)"},
+        { (char *)"CvKalman_temp3_get", _wrap_CvKalman_temp3_get, METH_VARARGS, (char *)"CvKalman_temp3_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_temp4_set", _wrap_CvKalman_temp4_set, METH_VARARGS, (char *)"CvKalman_temp4_set(CvKalman self, CvMat temp4)"},
+        { (char *)"CvKalman_temp4_get", _wrap_CvKalman_temp4_get, METH_VARARGS, (char *)"CvKalman_temp4_get(CvKalman self) -> CvMat"},
+        { (char *)"CvKalman_temp5_set", _wrap_CvKalman_temp5_set, METH_VARARGS, (char *)"CvKalman_temp5_set(CvKalman self, CvMat temp5)"},
+        { (char *)"CvKalman_temp5_get", _wrap_CvKalman_temp5_get, METH_VARARGS, (char *)"CvKalman_temp5_get(CvKalman self) -> CvMat"},
+        { (char *)"delete_CvKalman", _wrap_delete_CvKalman, METH_VARARGS, (char *)"delete_CvKalman(CvKalman self)"},
         { (char *)"CvKalman_swigregister", CvKalman_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvHaarFeature_tilted_set", _wrap_CvHaarFeature_tilted_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarFeature_tilted_get", _wrap_CvHaarFeature_tilted_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarFeature_rect_get", _wrap_CvHaarFeature_rect_get, METH_VARARGS, NULL},
-        { (char *)"new_CvHaarFeature", _wrap_new_CvHaarFeature, METH_VARARGS, NULL},
-        { (char *)"delete_CvHaarFeature", _wrap_delete_CvHaarFeature, METH_VARARGS, NULL},
+        { (char *)"CvHaarFeature_tilted_set", _wrap_CvHaarFeature_tilted_set, METH_VARARGS, (char *)"CvHaarFeature_tilted_set(CvHaarFeature self, int tilted)"},
+        { (char *)"CvHaarFeature_tilted_get", _wrap_CvHaarFeature_tilted_get, METH_VARARGS, (char *)"CvHaarFeature_tilted_get(CvHaarFeature self) -> int"},
+        { (char *)"CvHaarFeature_rect_get", _wrap_CvHaarFeature_rect_get, METH_VARARGS, (char *)"CvHaarFeature_rect_get(CvHaarFeature self) -> CvHaarFeature_rect"},
+        { (char *)"new_CvHaarFeature", _wrap_new_CvHaarFeature, METH_VARARGS, (char *)"new_CvHaarFeature() -> CvHaarFeature"},
+        { (char *)"delete_CvHaarFeature", _wrap_delete_CvHaarFeature, METH_VARARGS, (char *)"delete_CvHaarFeature(CvHaarFeature self)"},
         { (char *)"CvHaarFeature_swigregister", CvHaarFeature_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvHaarFeature_rect_r_set", _wrap_CvHaarFeature_rect_r_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarFeature_rect_r_get", _wrap_CvHaarFeature_rect_r_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarFeature_rect_weight_set", _wrap_CvHaarFeature_rect_weight_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarFeature_rect_weight_get", _wrap_CvHaarFeature_rect_weight_get, METH_VARARGS, NULL},
-        { (char *)"new_CvHaarFeature_rect", _wrap_new_CvHaarFeature_rect, METH_VARARGS, NULL},
-        { (char *)"delete_CvHaarFeature_rect", _wrap_delete_CvHaarFeature_rect, METH_VARARGS, NULL},
+        { (char *)"CvHaarFeature_rect_r_set", _wrap_CvHaarFeature_rect_r_set, METH_VARARGS, (char *)"CvHaarFeature_rect_r_set(CvHaarFeature_rect self, CvRect r)"},
+        { (char *)"CvHaarFeature_rect_r_get", _wrap_CvHaarFeature_rect_r_get, METH_VARARGS, (char *)"CvHaarFeature_rect_r_get(CvHaarFeature_rect self) -> CvRect"},
+        { (char *)"CvHaarFeature_rect_weight_set", _wrap_CvHaarFeature_rect_weight_set, METH_VARARGS, (char *)"CvHaarFeature_rect_weight_set(CvHaarFeature_rect self, float weight)"},
+        { (char *)"CvHaarFeature_rect_weight_get", _wrap_CvHaarFeature_rect_weight_get, METH_VARARGS, (char *)"CvHaarFeature_rect_weight_get(CvHaarFeature_rect self) -> float"},
+        { (char *)"new_CvHaarFeature_rect", _wrap_new_CvHaarFeature_rect, METH_VARARGS, (char *)"new_CvHaarFeature_rect() -> CvHaarFeature_rect"},
+        { (char *)"delete_CvHaarFeature_rect", _wrap_delete_CvHaarFeature_rect, METH_VARARGS, (char *)"delete_CvHaarFeature_rect(CvHaarFeature_rect self)"},
         { (char *)"CvHaarFeature_rect_swigregister", CvHaarFeature_rect_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_count_set", _wrap_CvHaarClassifier_count_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_count_get", _wrap_CvHaarClassifier_count_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_haar_feature_set", _wrap_CvHaarClassifier_haar_feature_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_haar_feature_get", _wrap_CvHaarClassifier_haar_feature_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_threshold_set", _wrap_CvHaarClassifier_threshold_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_threshold_get", _wrap_CvHaarClassifier_threshold_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_left_set", _wrap_CvHaarClassifier_left_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_left_get", _wrap_CvHaarClassifier_left_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_right_set", _wrap_CvHaarClassifier_right_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_right_get", _wrap_CvHaarClassifier_right_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_alpha_set", _wrap_CvHaarClassifier_alpha_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifier_alpha_get", _wrap_CvHaarClassifier_alpha_get, METH_VARARGS, NULL},
-        { (char *)"new_CvHaarClassifier", _wrap_new_CvHaarClassifier, METH_VARARGS, NULL},
-        { (char *)"delete_CvHaarClassifier", _wrap_delete_CvHaarClassifier, METH_VARARGS, NULL},
+        { (char *)"CvHaarClassifier_count_set", _wrap_CvHaarClassifier_count_set, METH_VARARGS, (char *)"CvHaarClassifier_count_set(CvHaarClassifier self, int count)"},
+        { (char *)"CvHaarClassifier_count_get", _wrap_CvHaarClassifier_count_get, METH_VARARGS, (char *)"CvHaarClassifier_count_get(CvHaarClassifier self) -> int"},
+        { (char *)"CvHaarClassifier_haar_feature_set", _wrap_CvHaarClassifier_haar_feature_set, METH_VARARGS, (char *)"CvHaarClassifier_haar_feature_set(CvHaarClassifier self, CvHaarFeature haar_feature)"},
+        { (char *)"CvHaarClassifier_haar_feature_get", _wrap_CvHaarClassifier_haar_feature_get, METH_VARARGS, (char *)"CvHaarClassifier_haar_feature_get(CvHaarClassifier self) -> CvHaarFeature"},
+        { (char *)"CvHaarClassifier_threshold_set", _wrap_CvHaarClassifier_threshold_set, METH_VARARGS, (char *)"CvHaarClassifier_threshold_set(CvHaarClassifier self, float threshold)"},
+        { (char *)"CvHaarClassifier_threshold_get", _wrap_CvHaarClassifier_threshold_get, METH_VARARGS, (char *)"CvHaarClassifier_threshold_get(CvHaarClassifier self) -> float"},
+        { (char *)"CvHaarClassifier_left_set", _wrap_CvHaarClassifier_left_set, METH_VARARGS, (char *)"CvHaarClassifier_left_set(CvHaarClassifier self, int left)"},
+        { (char *)"CvHaarClassifier_left_get", _wrap_CvHaarClassifier_left_get, METH_VARARGS, (char *)"CvHaarClassifier_left_get(CvHaarClassifier self) -> int"},
+        { (char *)"CvHaarClassifier_right_set", _wrap_CvHaarClassifier_right_set, METH_VARARGS, (char *)"CvHaarClassifier_right_set(CvHaarClassifier self, int right)"},
+        { (char *)"CvHaarClassifier_right_get", _wrap_CvHaarClassifier_right_get, METH_VARARGS, (char *)"CvHaarClassifier_right_get(CvHaarClassifier self) -> int"},
+        { (char *)"CvHaarClassifier_alpha_set", _wrap_CvHaarClassifier_alpha_set, METH_VARARGS, (char *)"CvHaarClassifier_alpha_set(CvHaarClassifier self, float alpha)"},
+        { (char *)"CvHaarClassifier_alpha_get", _wrap_CvHaarClassifier_alpha_get, METH_VARARGS, (char *)"CvHaarClassifier_alpha_get(CvHaarClassifier self) -> float"},
+        { (char *)"new_CvHaarClassifier", _wrap_new_CvHaarClassifier, METH_VARARGS, (char *)"new_CvHaarClassifier() -> CvHaarClassifier"},
+        { (char *)"delete_CvHaarClassifier", _wrap_delete_CvHaarClassifier, METH_VARARGS, (char *)"delete_CvHaarClassifier(CvHaarClassifier self)"},
         { (char *)"CvHaarClassifier_swigregister", CvHaarClassifier_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_count_set", _wrap_CvHaarStageClassifier_count_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_count_get", _wrap_CvHaarStageClassifier_count_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_threshold_set", _wrap_CvHaarStageClassifier_threshold_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_threshold_get", _wrap_CvHaarStageClassifier_threshold_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_classifier_set", _wrap_CvHaarStageClassifier_classifier_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_classifier_get", _wrap_CvHaarStageClassifier_classifier_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_next_set", _wrap_CvHaarStageClassifier_next_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_next_get", _wrap_CvHaarStageClassifier_next_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_child_set", _wrap_CvHaarStageClassifier_child_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_child_get", _wrap_CvHaarStageClassifier_child_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_parent_set", _wrap_CvHaarStageClassifier_parent_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarStageClassifier_parent_get", _wrap_CvHaarStageClassifier_parent_get, METH_VARARGS, NULL},
-        { (char *)"new_CvHaarStageClassifier", _wrap_new_CvHaarStageClassifier, METH_VARARGS, NULL},
-        { (char *)"delete_CvHaarStageClassifier", _wrap_delete_CvHaarStageClassifier, METH_VARARGS, NULL},
+        { (char *)"CvHaarStageClassifier_count_set", _wrap_CvHaarStageClassifier_count_set, METH_VARARGS, (char *)"CvHaarStageClassifier_count_set(CvHaarStageClassifier self, int count)"},
+        { (char *)"CvHaarStageClassifier_count_get", _wrap_CvHaarStageClassifier_count_get, METH_VARARGS, (char *)"CvHaarStageClassifier_count_get(CvHaarStageClassifier self) -> int"},
+        { (char *)"CvHaarStageClassifier_threshold_set", _wrap_CvHaarStageClassifier_threshold_set, METH_VARARGS, (char *)"CvHaarStageClassifier_threshold_set(CvHaarStageClassifier self, float threshold)"},
+        { (char *)"CvHaarStageClassifier_threshold_get", _wrap_CvHaarStageClassifier_threshold_get, METH_VARARGS, (char *)"CvHaarStageClassifier_threshold_get(CvHaarStageClassifier self) -> float"},
+        { (char *)"CvHaarStageClassifier_classifier_set", _wrap_CvHaarStageClassifier_classifier_set, METH_VARARGS, (char *)"CvHaarStageClassifier_classifier_set(CvHaarStageClassifier self, CvHaarClassifier classifier)"},
+        { (char *)"CvHaarStageClassifier_classifier_get", _wrap_CvHaarStageClassifier_classifier_get, METH_VARARGS, (char *)"CvHaarStageClassifier_classifier_get(CvHaarStageClassifier self) -> CvHaarClassifier"},
+        { (char *)"CvHaarStageClassifier_next_set", _wrap_CvHaarStageClassifier_next_set, METH_VARARGS, (char *)"CvHaarStageClassifier_next_set(CvHaarStageClassifier self, int next)"},
+        { (char *)"CvHaarStageClassifier_next_get", _wrap_CvHaarStageClassifier_next_get, METH_VARARGS, (char *)"CvHaarStageClassifier_next_get(CvHaarStageClassifier self) -> int"},
+        { (char *)"CvHaarStageClassifier_child_set", _wrap_CvHaarStageClassifier_child_set, METH_VARARGS, (char *)"CvHaarStageClassifier_child_set(CvHaarStageClassifier self, int child)"},
+        { (char *)"CvHaarStageClassifier_child_get", _wrap_CvHaarStageClassifier_child_get, METH_VARARGS, (char *)"CvHaarStageClassifier_child_get(CvHaarStageClassifier self) -> int"},
+        { (char *)"CvHaarStageClassifier_parent_set", _wrap_CvHaarStageClassifier_parent_set, METH_VARARGS, (char *)"CvHaarStageClassifier_parent_set(CvHaarStageClassifier self, int parent)"},
+        { (char *)"CvHaarStageClassifier_parent_get", _wrap_CvHaarStageClassifier_parent_get, METH_VARARGS, (char *)"CvHaarStageClassifier_parent_get(CvHaarStageClassifier self) -> int"},
+        { (char *)"new_CvHaarStageClassifier", _wrap_new_CvHaarStageClassifier, METH_VARARGS, (char *)"new_CvHaarStageClassifier() -> CvHaarStageClassifier"},
+        { (char *)"delete_CvHaarStageClassifier", _wrap_delete_CvHaarStageClassifier, METH_VARARGS, (char *)"delete_CvHaarStageClassifier(CvHaarStageClassifier self)"},
         { (char *)"CvHaarStageClassifier_swigregister", CvHaarStageClassifier_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_flags_set", _wrap_CvHaarClassifierCascade_flags_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_flags_get", _wrap_CvHaarClassifierCascade_flags_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_count_set", _wrap_CvHaarClassifierCascade_count_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_count_get", _wrap_CvHaarClassifierCascade_count_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_orig_window_size_set", _wrap_CvHaarClassifierCascade_orig_window_size_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_orig_window_size_get", _wrap_CvHaarClassifierCascade_orig_window_size_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_real_window_size_set", _wrap_CvHaarClassifierCascade_real_window_size_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_real_window_size_get", _wrap_CvHaarClassifierCascade_real_window_size_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_scale_set", _wrap_CvHaarClassifierCascade_scale_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_scale_get", _wrap_CvHaarClassifierCascade_scale_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_stage_classifier_set", _wrap_CvHaarClassifierCascade_stage_classifier_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_stage_classifier_get", _wrap_CvHaarClassifierCascade_stage_classifier_get, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_hid_cascade_set", _wrap_CvHaarClassifierCascade_hid_cascade_set, METH_VARARGS, NULL},
-        { (char *)"CvHaarClassifierCascade_hid_cascade_get", _wrap_CvHaarClassifierCascade_hid_cascade_get, METH_VARARGS, NULL},
-        { (char *)"delete_CvHaarClassifierCascade", _wrap_delete_CvHaarClassifierCascade, METH_VARARGS, NULL},
+        { (char *)"CvHaarClassifierCascade_flags_set", _wrap_CvHaarClassifierCascade_flags_set, METH_VARARGS, (char *)"CvHaarClassifierCascade_flags_set(CvHaarClassifierCascade self, int flags)"},
+        { (char *)"CvHaarClassifierCascade_flags_get", _wrap_CvHaarClassifierCascade_flags_get, METH_VARARGS, (char *)"CvHaarClassifierCascade_flags_get(CvHaarClassifierCascade self) -> int"},
+        { (char *)"CvHaarClassifierCascade_count_set", _wrap_CvHaarClassifierCascade_count_set, METH_VARARGS, (char *)"CvHaarClassifierCascade_count_set(CvHaarClassifierCascade self, int count)"},
+        { (char *)"CvHaarClassifierCascade_count_get", _wrap_CvHaarClassifierCascade_count_get, METH_VARARGS, (char *)"CvHaarClassifierCascade_count_get(CvHaarClassifierCascade self) -> int"},
+        { (char *)"CvHaarClassifierCascade_orig_window_size_set", _wrap_CvHaarClassifierCascade_orig_window_size_set, METH_VARARGS, (char *)"CvHaarClassifierCascade_orig_window_size_set(CvHaarClassifierCascade self, CvSize orig_window_size)"},
+        { (char *)"CvHaarClassifierCascade_orig_window_size_get", _wrap_CvHaarClassifierCascade_orig_window_size_get, METH_VARARGS, (char *)"CvHaarClassifierCascade_orig_window_size_get(CvHaarClassifierCascade self) -> CvSize"},
+        { (char *)"CvHaarClassifierCascade_real_window_size_set", _wrap_CvHaarClassifierCascade_real_window_size_set, METH_VARARGS, (char *)"CvHaarClassifierCascade_real_window_size_set(CvHaarClassifierCascade self, CvSize real_window_size)"},
+        { (char *)"CvHaarClassifierCascade_real_window_size_get", _wrap_CvHaarClassifierCascade_real_window_size_get, METH_VARARGS, (char *)"CvHaarClassifierCascade_real_window_size_get(CvHaarClassifierCascade self) -> CvSize"},
+        { (char *)"CvHaarClassifierCascade_scale_set", _wrap_CvHaarClassifierCascade_scale_set, METH_VARARGS, (char *)"CvHaarClassifierCascade_scale_set(CvHaarClassifierCascade self, double scale)"},
+        { (char *)"CvHaarClassifierCascade_scale_get", _wrap_CvHaarClassifierCascade_scale_get, METH_VARARGS, (char *)"CvHaarClassifierCascade_scale_get(CvHaarClassifierCascade self) -> double"},
+        { (char *)"CvHaarClassifierCascade_stage_classifier_set", _wrap_CvHaarClassifierCascade_stage_classifier_set, METH_VARARGS, (char *)"CvHaarClassifierCascade_stage_classifier_set(CvHaarClassifierCascade self, CvHaarStageClassifier stage_classifier)"},
+        { (char *)"CvHaarClassifierCascade_stage_classifier_get", _wrap_CvHaarClassifierCascade_stage_classifier_get, METH_VARARGS, (char *)"CvHaarClassifierCascade_stage_classifier_get(CvHaarClassifierCascade self) -> CvHaarStageClassifier"},
+        { (char *)"CvHaarClassifierCascade_hid_cascade_set", _wrap_CvHaarClassifierCascade_hid_cascade_set, METH_VARARGS, (char *)"CvHaarClassifierCascade_hid_cascade_set(CvHaarClassifierCascade self, CvHidHaarClassifierCascade hid_cascade)"},
+        { (char *)"CvHaarClassifierCascade_hid_cascade_get", _wrap_CvHaarClassifierCascade_hid_cascade_get, METH_VARARGS, (char *)"CvHaarClassifierCascade_hid_cascade_get(CvHaarClassifierCascade self) -> CvHidHaarClassifierCascade"},
+        { (char *)"delete_CvHaarClassifierCascade", _wrap_delete_CvHaarClassifierCascade, METH_VARARGS, (char *)"delete_CvHaarClassifierCascade(CvHaarClassifierCascade self)"},
         { (char *)"CvHaarClassifierCascade_swigregister", CvHaarClassifierCascade_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvAvgComp_rect_set", _wrap_CvAvgComp_rect_set, METH_VARARGS, NULL},
-        { (char *)"CvAvgComp_rect_get", _wrap_CvAvgComp_rect_get, METH_VARARGS, NULL},
-        { (char *)"CvAvgComp_neighbors_set", _wrap_CvAvgComp_neighbors_set, METH_VARARGS, NULL},
-        { (char *)"CvAvgComp_neighbors_get", _wrap_CvAvgComp_neighbors_get, METH_VARARGS, NULL},
-        { (char *)"new_CvAvgComp", _wrap_new_CvAvgComp, METH_VARARGS, NULL},
-        { (char *)"delete_CvAvgComp", _wrap_delete_CvAvgComp, METH_VARARGS, NULL},
+        { (char *)"CvAvgComp_rect_set", _wrap_CvAvgComp_rect_set, METH_VARARGS, (char *)"CvAvgComp_rect_set(CvAvgComp self, CvRect rect)"},
+        { (char *)"CvAvgComp_rect_get", _wrap_CvAvgComp_rect_get, METH_VARARGS, (char *)"CvAvgComp_rect_get(CvAvgComp self) -> CvRect"},
+        { (char *)"CvAvgComp_neighbors_set", _wrap_CvAvgComp_neighbors_set, METH_VARARGS, (char *)"CvAvgComp_neighbors_set(CvAvgComp self, int neighbors)"},
+        { (char *)"CvAvgComp_neighbors_get", _wrap_CvAvgComp_neighbors_get, METH_VARARGS, (char *)"CvAvgComp_neighbors_get(CvAvgComp self) -> int"},
+        { (char *)"new_CvAvgComp", _wrap_new_CvAvgComp, METH_VARARGS, (char *)"new_CvAvgComp() -> CvAvgComp"},
+        { (char *)"delete_CvAvgComp", _wrap_delete_CvAvgComp, METH_VARARGS, (char *)"delete_CvAvgComp(CvAvgComp self)"},
         { (char *)"CvAvgComp_swigregister", CvAvgComp_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvCopyMakeBorder", _wrap_cvCopyMakeBorder, METH_VARARGS, NULL},
-        { (char *)"cvSmooth", _wrap_cvSmooth, METH_VARARGS, NULL},
-        { (char *)"cvFilter2D", _wrap_cvFilter2D, METH_VARARGS, NULL},
-        { (char *)"cvIntegral", _wrap_cvIntegral, METH_VARARGS, NULL},
-        { (char *)"cvPyrDown", _wrap_cvPyrDown, METH_VARARGS, NULL},
-        { (char *)"cvPyrUp", _wrap_cvPyrUp, METH_VARARGS, NULL},
-        { (char *)"cvCreatePyramid", _wrap_cvCreatePyramid, METH_VARARGS, NULL},
-        { (char *)"cvReleasePyramid", _wrap_cvReleasePyramid, METH_VARARGS, NULL},
-        { (char *)"cvPyrSegmentationUntyped", _wrap_cvPyrSegmentationUntyped, METH_VARARGS, NULL},
-        { (char *)"cvPyrMeanShiftFiltering", _wrap_cvPyrMeanShiftFiltering, METH_VARARGS, NULL},
-        { (char *)"cvWatershed", _wrap_cvWatershed, METH_VARARGS, NULL},
-        { (char *)"cvInpaint", _wrap_cvInpaint, METH_VARARGS, NULL},
-        { (char *)"cvSobel", _wrap_cvSobel, METH_VARARGS, NULL},
-        { (char *)"cvLaplace", _wrap_cvLaplace, METH_VARARGS, NULL},
-        { (char *)"cvCvtColor", _wrap_cvCvtColor, METH_VARARGS, NULL},
-        { (char *)"cvResize", _wrap_cvResize, METH_VARARGS, NULL},
-        { (char *)"cvWarpAffine", _wrap_cvWarpAffine, METH_VARARGS, NULL},
-        { (char *)"cvGetAffineTransform", _wrap_cvGetAffineTransform, METH_VARARGS, NULL},
-        { (char *)"cv2DRotationMatrix", _wrap_cv2DRotationMatrix, METH_VARARGS, NULL},
-        { (char *)"cvWarpPerspective", _wrap_cvWarpPerspective, METH_VARARGS, NULL},
-        { (char *)"cvGetPerspectiveTransform", _wrap_cvGetPerspectiveTransform, METH_VARARGS, NULL},
-        { (char *)"cvRemap", _wrap_cvRemap, METH_VARARGS, NULL},
-        { (char *)"cvConvertMaps", _wrap_cvConvertMaps, METH_VARARGS, NULL},
-        { (char *)"cvLogPolar", _wrap_cvLogPolar, METH_VARARGS, NULL},
-        { (char *)"cvLinearPolar", _wrap_cvLinearPolar, METH_VARARGS, NULL},
-        { (char *)"cvCreateStructuringElementEx", _wrap_cvCreateStructuringElementEx, METH_VARARGS, NULL},
-        { (char *)"cvErode", _wrap_cvErode, METH_VARARGS, NULL},
-        { (char *)"cvDilate", _wrap_cvDilate, METH_VARARGS, NULL},
-        { (char *)"cvMorphologyEx", _wrap_cvMorphologyEx, METH_VARARGS, NULL},
-        { (char *)"cvMoments", _wrap_cvMoments, METH_VARARGS, NULL},
-        { (char *)"cvGetSpatialMoment", _wrap_cvGetSpatialMoment, METH_VARARGS, NULL},
-        { (char *)"cvGetCentralMoment", _wrap_cvGetCentralMoment, METH_VARARGS, NULL},
-        { (char *)"cvGetNormalizedCentralMoment", _wrap_cvGetNormalizedCentralMoment, METH_VARARGS, NULL},
-        { (char *)"cvGetHuMoments", _wrap_cvGetHuMoments, METH_VARARGS, NULL},
-        { (char *)"cvSampleLine", _wrap_cvSampleLine, METH_VARARGS, NULL},
-        { (char *)"cvGetRectSubPix", _wrap_cvGetRectSubPix, METH_VARARGS, NULL},
-        { (char *)"cvGetQuadrangleSubPix", _wrap_cvGetQuadrangleSubPix, METH_VARARGS, NULL},
-        { (char *)"cvMatchTemplate", _wrap_cvMatchTemplate, METH_VARARGS, NULL},
-        { (char *)"cvCalcEMD2", _wrap_cvCalcEMD2, METH_VARARGS, NULL},
-        { (char *)"cvFindContoursUntyped", _wrap_cvFindContoursUntyped, METH_VARARGS, NULL},
-        { (char *)"cvStartFindContours", _wrap_cvStartFindContours, METH_VARARGS, NULL},
-        { (char *)"cvFindNextContour", _wrap_cvFindNextContour, METH_VARARGS, NULL},
-        { (char *)"cvSubstituteContour", _wrap_cvSubstituteContour, METH_VARARGS, NULL},
-        { (char *)"cvEndFindContours", _wrap_cvEndFindContours, METH_VARARGS, NULL},
-        { (char *)"cvApproxChainsUntyped", _wrap_cvApproxChainsUntyped, METH_VARARGS, NULL},
-        { (char *)"cvStartReadChainPoints", _wrap_cvStartReadChainPoints, METH_VARARGS, NULL},
-        { (char *)"cvReadChainPoint", _wrap_cvReadChainPoint, METH_VARARGS, NULL},
-        { (char *)"cvCalcOpticalFlowLK", _wrap_cvCalcOpticalFlowLK, METH_VARARGS, NULL},
-        { (char *)"cvCalcOpticalFlowBM", _wrap_cvCalcOpticalFlowBM, METH_VARARGS, NULL},
-        { (char *)"cvCalcOpticalFlowHS", _wrap_cvCalcOpticalFlowHS, METH_VARARGS, NULL},
-        { (char *)"cvCalcOpticalFlowPyrLK", _wrap_cvCalcOpticalFlowPyrLK, METH_VARARGS, NULL},
-        { (char *)"cvCalcAffineFlowPyrLK", _wrap_cvCalcAffineFlowPyrLK, METH_VARARGS, NULL},
-        { (char *)"cvEstimateRigidTransform", _wrap_cvEstimateRigidTransform, METH_VARARGS, NULL},
-        { (char *)"cvUpdateMotionHistory", _wrap_cvUpdateMotionHistory, METH_VARARGS, NULL},
-        { (char *)"cvCalcMotionGradient", _wrap_cvCalcMotionGradient, METH_VARARGS, NULL},
-        { (char *)"cvCalcGlobalOrientation", _wrap_cvCalcGlobalOrientation, METH_VARARGS, NULL},
-        { (char *)"cvAcc", _wrap_cvAcc, METH_VARARGS, NULL},
-        { (char *)"cvSquareAcc", _wrap_cvSquareAcc, METH_VARARGS, NULL},
-        { (char *)"cvMultiplyAcc", _wrap_cvMultiplyAcc, METH_VARARGS, NULL},
-        { (char *)"cvRunningAvg", _wrap_cvRunningAvg, METH_VARARGS, NULL},
-        { (char *)"cvCamShift", _wrap_cvCamShift, METH_VARARGS, NULL},
-        { (char *)"cvMeanShift", _wrap_cvMeanShift, METH_VARARGS, NULL},
-        { (char *)"cvCreateConDensation", _wrap_cvCreateConDensation, METH_VARARGS, NULL},
-        { (char *)"cvConDensUpdateByTime", _wrap_cvConDensUpdateByTime, METH_VARARGS, NULL},
-        { (char *)"cvConDensInitSampleSet", _wrap_cvConDensInitSampleSet, METH_VARARGS, NULL},
-        { (char *)"cvCreateKalman", _wrap_cvCreateKalman, METH_VARARGS, NULL},
-        { (char *)"cvKalmanPredict", _wrap_cvKalmanPredict, METH_VARARGS, NULL},
-        { (char *)"cvKalmanCorrect", _wrap_cvKalmanCorrect, METH_VARARGS, NULL},
-        { (char *)"cvInitSubdivDelaunay2D", _wrap_cvInitSubdivDelaunay2D, METH_VARARGS, NULL},
-        { (char *)"cvCreateSubdiv2D", _wrap_cvCreateSubdiv2D, METH_VARARGS, NULL},
-        { (char *)"cvCreateSubdivDelaunay2D", _wrap_cvCreateSubdivDelaunay2D, METH_VARARGS, NULL},
-        { (char *)"cvSubdivDelaunay2DInsert", _wrap_cvSubdivDelaunay2DInsert, METH_VARARGS, NULL},
-        { (char *)"cvSubdiv2DLocate", _wrap_cvSubdiv2DLocate, METH_VARARGS, NULL},
-        { (char *)"cvCalcSubdivVoronoi2D", _wrap_cvCalcSubdivVoronoi2D, METH_VARARGS, NULL},
-        { (char *)"cvClearSubdivVoronoi2D", _wrap_cvClearSubdivVoronoi2D, METH_VARARGS, NULL},
-        { (char *)"cvFindNearestPoint2D", _wrap_cvFindNearestPoint2D, METH_VARARGS, NULL},
-        { (char *)"cvSubdiv2DNextEdge", _wrap_cvSubdiv2DNextEdge, METH_VARARGS, NULL},
-        { (char *)"cvSubdiv2DRotateEdge", _wrap_cvSubdiv2DRotateEdge, METH_VARARGS, NULL},
-        { (char *)"cvSubdiv2DSymEdge", _wrap_cvSubdiv2DSymEdge, METH_VARARGS, NULL},
-        { (char *)"cvSubdiv2DGetEdge", _wrap_cvSubdiv2DGetEdge, METH_VARARGS, NULL},
-        { (char *)"cvSubdiv2DEdgeOrg", _wrap_cvSubdiv2DEdgeOrg, METH_VARARGS, NULL},
-        { (char *)"cvSubdiv2DEdgeDst", _wrap_cvSubdiv2DEdgeDst, METH_VARARGS, NULL},
-        { (char *)"cvTriangleArea", _wrap_cvTriangleArea, METH_VARARGS, NULL},
-        { (char *)"cvFindDominantPoints", _wrap_cvFindDominantPoints, METH_VARARGS, NULL},
-        { (char *)"cvArcLength", _wrap_cvArcLength, METH_VARARGS, NULL},
-        { (char *)"cvBoundingRect", _wrap_cvBoundingRect, METH_VARARGS, NULL},
-        { (char *)"cvContourArea", _wrap_cvContourArea, METH_VARARGS, NULL},
-        { (char *)"cvMinAreaRect2", _wrap_cvMinAreaRect2, METH_VARARGS, NULL},
-        { (char *)"cvMinEnclosingCircle", _wrap_cvMinEnclosingCircle, METH_VARARGS, NULL},
-        { (char *)"cvMatchShapes", _wrap_cvMatchShapes, METH_VARARGS, NULL},
-        { (char *)"cvCreateContourTree", _wrap_cvCreateContourTree, METH_VARARGS, NULL},
-        { (char *)"cvContourFromContourTreeUntyped", _wrap_cvContourFromContourTreeUntyped, METH_VARARGS, NULL},
-        { (char *)"cvMatchContourTrees", _wrap_cvMatchContourTrees, METH_VARARGS, NULL},
-        { (char *)"cvCalcPGH", _wrap_cvCalcPGH, METH_VARARGS, NULL},
-        { (char *)"cvCheckContourConvexity", _wrap_cvCheckContourConvexity, METH_VARARGS, NULL},
-        { (char *)"cvConvexityDefectsUntyped", _wrap_cvConvexityDefectsUntyped, METH_VARARGS, NULL},
-        { (char *)"cvFitEllipse2", _wrap_cvFitEllipse2, METH_VARARGS, NULL},
-        { (char *)"cvMaxRect", _wrap_cvMaxRect, METH_VARARGS, NULL},
-        { (char *)"cvBoxPoints", _wrap_cvBoxPoints, METH_VARARGS, NULL},
-        { (char *)"cvPointSeqFromMat", _wrap_cvPointSeqFromMat, METH_VARARGS, NULL},
-        { (char *)"cvPointPolygonTest", _wrap_cvPointPolygonTest, METH_VARARGS, NULL},
-        { (char *)"cvCreateHist", _wrap_cvCreateHist, METH_VARARGS, NULL},
-        { (char *)"cvSetHistBinRanges", _wrap_cvSetHistBinRanges, METH_VARARGS, NULL},
-        { (char *)"cvMakeHistHeaderForArray", _wrap_cvMakeHistHeaderForArray, METH_VARARGS, NULL},
-        { (char *)"cvClearHist", _wrap_cvClearHist, METH_VARARGS, NULL},
-        { (char *)"cvGetMinMaxHistValue", _wrap_cvGetMinMaxHistValue, METH_VARARGS, NULL},
-        { (char *)"cvNormalizeHist", _wrap_cvNormalizeHist, METH_VARARGS, NULL},
-        { (char *)"cvThreshHist", _wrap_cvThreshHist, METH_VARARGS, NULL},
-        { (char *)"cvCompareHist", _wrap_cvCompareHist, METH_VARARGS, NULL},
-        { (char *)"cvCopyHist", _wrap_cvCopyHist, METH_VARARGS, NULL},
-        { (char *)"cvCalcBayesianProb", _wrap_cvCalcBayesianProb, METH_VARARGS, NULL},
-        { (char *)"cvCalcArrHist", _wrap_cvCalcArrHist, METH_VARARGS, NULL},
-        { (char *)"cvCalcHist", _wrap_cvCalcHist, METH_VARARGS, NULL},
-        { (char *)"cvCalcArrBackProject", _wrap_cvCalcArrBackProject, METH_VARARGS, NULL},
-        { (char *)"cvCalcArrBackProjectPatch", _wrap_cvCalcArrBackProjectPatch, METH_VARARGS, NULL},
-        { (char *)"cvCalcProbDensity", _wrap_cvCalcProbDensity, METH_VARARGS, NULL},
-        { (char *)"cvEqualizeHist", _wrap_cvEqualizeHist, METH_VARARGS, NULL},
-        { (char *)"cvCalcImageHomography", _wrap_cvCalcImageHomography, METH_VARARGS, NULL},
-        { (char *)"cvDistTransform", _wrap_cvDistTransform, METH_VARARGS, NULL},
-        { (char *)"cvThreshold", _wrap_cvThreshold, METH_VARARGS, NULL},
-        { (char *)"cvAdaptiveThreshold", _wrap_cvAdaptiveThreshold, METH_VARARGS, NULL},
-        { (char *)"cvFloodFill", _wrap_cvFloodFill, METH_VARARGS, NULL},
-        { (char *)"cvCanny", _wrap_cvCanny, METH_VARARGS, NULL},
-        { (char *)"cvPreCornerDetect", _wrap_cvPreCornerDetect, METH_VARARGS, NULL},
-        { (char *)"cvCornerEigenValsAndVecs", _wrap_cvCornerEigenValsAndVecs, METH_VARARGS, NULL},
-        { (char *)"cvCornerMinEigenVal", _wrap_cvCornerMinEigenVal, METH_VARARGS, NULL},
-        { (char *)"cvCornerHarris", _wrap_cvCornerHarris, METH_VARARGS, NULL},
-        { (char *)"cvFindCornerSubPix", _wrap_cvFindCornerSubPix, METH_VARARGS, NULL},
-        { (char *)"cvGoodFeaturesToTrack", _wrap_cvGoodFeaturesToTrack, METH_VARARGS, NULL},
-        { (char *)"cvHoughLinesUntyped", _wrap_cvHoughLinesUntyped, METH_VARARGS, NULL},
-        { (char *)"cvHoughCirclesUntyped", _wrap_cvHoughCirclesUntyped, METH_VARARGS, NULL},
-        { (char *)"cvFitLine", _wrap_cvFitLine, METH_VARARGS, NULL},
-        { (char *)"cvCreateKDTree", _wrap_cvCreateKDTree, METH_VARARGS, NULL},
-        { (char *)"cvCreateSpillTree", _wrap_cvCreateSpillTree, METH_VARARGS, NULL},
-        { (char *)"cvReleaseFeatureTree", _wrap_cvReleaseFeatureTree, METH_VARARGS, NULL},
-        { (char *)"cvFindFeatures", _wrap_cvFindFeatures, METH_VARARGS, NULL},
-        { (char *)"cvFindFeaturesBoxed", _wrap_cvFindFeaturesBoxed, METH_VARARGS, NULL},
-        { (char *)"cvCreateLSH", _wrap_cvCreateLSH, METH_VARARGS, NULL},
-        { (char *)"cvCreateMemoryLSH", _wrap_cvCreateMemoryLSH, METH_VARARGS, NULL},
-        { (char *)"cvReleaseLSH", _wrap_cvReleaseLSH, METH_VARARGS, NULL},
-        { (char *)"LSHSize", _wrap_LSHSize, METH_VARARGS, NULL},
-        { (char *)"cvLSHAdd", _wrap_cvLSHAdd, METH_VARARGS, NULL},
-        { (char *)"cvLSHRemove", _wrap_cvLSHRemove, METH_VARARGS, NULL},
-        { (char *)"cvLSHQuery", _wrap_cvLSHQuery, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_pt_set", _wrap_CvSURFPoint_pt_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_pt_get", _wrap_CvSURFPoint_pt_get, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_laplacian_set", _wrap_CvSURFPoint_laplacian_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_laplacian_get", _wrap_CvSURFPoint_laplacian_get, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_size_set", _wrap_CvSURFPoint_size_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_size_get", _wrap_CvSURFPoint_size_get, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_dir_set", _wrap_CvSURFPoint_dir_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_dir_get", _wrap_CvSURFPoint_dir_get, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_hessian_set", _wrap_CvSURFPoint_hessian_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFPoint_hessian_get", _wrap_CvSURFPoint_hessian_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSURFPoint", _wrap_new_CvSURFPoint, METH_VARARGS, NULL},
-        { (char *)"delete_CvSURFPoint", _wrap_delete_CvSURFPoint, METH_VARARGS, NULL},
+        { (char *)"cvCopyMakeBorder", _wrap_cvCopyMakeBorder, METH_VARARGS, (char *)"\n"
+               "cvCopyMakeBorder(CvArr src, CvArr dst, CvPoint offset, int bordertype, \n"
+               "    CvScalar value = cvScalarAll(0))\n"
+               ""},
+        { (char *)"cvSmooth", _wrap_cvSmooth, METH_VARARGS, (char *)"\n"
+               "cvSmooth(CvArr src, CvArr dst, int smoothtype = 2, int size1 = 3, \n"
+               "    int size2 = 0, double sigma1 = 0, double sigma2 = 0)\n"
+               ""},
+        { (char *)"cvFilter2D", _wrap_cvFilter2D, METH_VARARGS, (char *)"cvFilter2D(CvArr src, CvArr dst, CvMat kernel, CvPoint anchor = cvPoint(-1,-1))"},
+        { (char *)"cvIntegral", _wrap_cvIntegral, METH_VARARGS, (char *)"cvIntegral(CvArr image, CvArr sum, CvArr sqsum = None, CvArr tilted_sum = None)"},
+        { (char *)"cvPyrDown", _wrap_cvPyrDown, METH_VARARGS, (char *)"cvPyrDown(CvArr src, CvArr dst, int filter = CV_GAUSSIAN_5x5)"},
+        { (char *)"cvPyrUp", _wrap_cvPyrUp, METH_VARARGS, (char *)"cvPyrUp(CvArr src, CvArr dst, int filter = CV_GAUSSIAN_5x5)"},
+        { (char *)"cvCreatePyramid", _wrap_cvCreatePyramid, METH_VARARGS, (char *)"\n"
+               "cvCreatePyramid(CvArr img, int extra_layers, double rate, CvSize layer_sizes = None, \n"
+               "    CvArr bufarr = None, int calc = 1, \n"
+               "    int filter = CV_GAUSSIAN_5x5) -> CvMat\n"
+               ""},
+        { (char *)"cvReleasePyramid", _wrap_cvReleasePyramid, METH_VARARGS, (char *)"cvReleasePyramid(CvMat pyramid, int extra_layers)"},
+        { (char *)"cvPyrSegmentationUntyped", _wrap_cvPyrSegmentationUntyped, METH_VARARGS, (char *)"\n"
+               "cvPyrSegmentationUntyped( src,  dst, CvMemStorage storage, int level, double threshold1, \n"
+               "    double threshold2)\n"
+               ""},
+        { (char *)"cvPyrMeanShiftFiltering", _wrap_cvPyrMeanShiftFiltering, METH_VARARGS, (char *)"\n"
+               "cvPyrMeanShiftFiltering(CvArr src, CvArr dst, double sp, double sr, int max_level = 1, \n"
+               "    CvTermCriteria termcrit = cvTermCriteria(1 +2,5,1))\n"
+               ""},
+        { (char *)"cvWatershed", _wrap_cvWatershed, METH_VARARGS, (char *)"cvWatershed(CvArr image, CvArr markers)"},
+        { (char *)"cvInpaint", _wrap_cvInpaint, METH_VARARGS, (char *)"\n"
+               "cvInpaint(CvArr src, CvArr inpaint_mask, CvArr dst, double inpaintRange, \n"
+               "    int flags)\n"
+               ""},
+        { (char *)"cvSobel", _wrap_cvSobel, METH_VARARGS, (char *)"cvSobel(CvArr src, CvArr dst, int xorder, int yorder, int aperture_size = 3)"},
+        { (char *)"cvLaplace", _wrap_cvLaplace, METH_VARARGS, (char *)"cvLaplace(CvArr src, CvArr dst, int aperture_size = 3)"},
+        { (char *)"cvCvtColor", _wrap_cvCvtColor, METH_VARARGS, (char *)"cvCvtColor(CvArr src, CvArr dst, int code)"},
+        { (char *)"cvResize", _wrap_cvResize, METH_VARARGS, (char *)"cvResize(CvArr src, CvArr dst, int interpolation = 1)"},
+        { (char *)"cvWarpAffine", _wrap_cvWarpAffine, METH_VARARGS, (char *)"\n"
+               "cvWarpAffine(CvArr src, CvArr dst, CvMat map_matrix, int flags = 1+8, \n"
+               "    CvScalar fillval = cvScalarAll(0))\n"
+               ""},
+        { (char *)"cvGetAffineTransform", _wrap_cvGetAffineTransform, METH_VARARGS, (char *)"cvGetAffineTransform(CvPoint2D32f src, CvPoint2D32f dst, CvMat map_matrix) -> CvMat"},
+        { (char *)"cv2DRotationMatrix", _wrap_cv2DRotationMatrix, METH_VARARGS, (char *)"cv2DRotationMatrix(CvPoint2D32f center, double angle, double scale, CvMat map_matrix) -> CvMat"},
+        { (char *)"cvWarpPerspective", _wrap_cvWarpPerspective, METH_VARARGS, (char *)"\n"
+               "cvWarpPerspective(CvArr src, CvArr dst, CvMat map_matrix, int flags = 1+8, \n"
+               "    CvScalar fillval = cvScalarAll(0))\n"
+               ""},
+        { (char *)"cvGetPerspectiveTransform", _wrap_cvGetPerspectiveTransform, METH_VARARGS, (char *)"cvGetPerspectiveTransform(CvPoint2D32f src, CvPoint2D32f dst, CvMat map_matrix) -> CvMat"},
+        { (char *)"cvRemap", _wrap_cvRemap, METH_VARARGS, (char *)"\n"
+               "cvRemap(CvArr src, CvArr dst, CvArr mapx, CvArr mapy, int flags = 1+8, \n"
+               "    CvScalar fillval = cvScalarAll(0))\n"
+               ""},
+        { (char *)"cvConvertMaps", _wrap_cvConvertMaps, METH_VARARGS, (char *)"cvConvertMaps(CvArr mapx, CvArr mapy, CvArr mapxy, CvArr mapalpha)"},
+        { (char *)"cvLogPolar", _wrap_cvLogPolar, METH_VARARGS, (char *)"\n"
+               "cvLogPolar(CvArr src, CvArr dst, CvPoint2D32f center, double M, \n"
+               "    int flags = 1+8)\n"
+               ""},
+        { (char *)"cvLinearPolar", _wrap_cvLinearPolar, METH_VARARGS, (char *)"\n"
+               "cvLinearPolar(CvArr src, CvArr dst, CvPoint2D32f center, double maxRadius, \n"
+               "    int flags = 1+8)\n"
+               ""},
+        { (char *)"cvCreateStructuringElementEx", _wrap_cvCreateStructuringElementEx, METH_VARARGS, (char *)"\n"
+               "cvCreateStructuringElementEx(int cols, int rows, int anchor_x, int anchor_y, int shape, \n"
+               "    int values = None)\n"
+               ""},
+        { (char *)"cvErode", _wrap_cvErode, METH_VARARGS, (char *)"cvErode(CvArr src, CvArr dst,  element = None, int iterations = 1)"},
+        { (char *)"cvDilate", _wrap_cvDilate, METH_VARARGS, (char *)"cvDilate(CvArr src, CvArr dst,  element = None, int iterations = 1)"},
+        { (char *)"cvMorphologyEx", _wrap_cvMorphologyEx, METH_VARARGS, (char *)"\n"
+               "cvMorphologyEx(CvArr src, CvArr dst, CvArr temp,  element, int operation, \n"
+               "    int iterations = 1)\n"
+               ""},
+        { (char *)"cvMoments", _wrap_cvMoments, METH_VARARGS, (char *)"cvMoments(CvArr arr, CvMoments moments, int binary = 0)"},
+        { (char *)"cvGetSpatialMoment", _wrap_cvGetSpatialMoment, METH_VARARGS, (char *)"cvGetSpatialMoment(CvMoments moments, int x_order, int y_order) -> double"},
+        { (char *)"cvGetCentralMoment", _wrap_cvGetCentralMoment, METH_VARARGS, (char *)"cvGetCentralMoment(CvMoments moments, int x_order, int y_order) -> double"},
+        { (char *)"cvGetNormalizedCentralMoment", _wrap_cvGetNormalizedCentralMoment, METH_VARARGS, (char *)"cvGetNormalizedCentralMoment(CvMoments moments, int x_order, int y_order) -> double"},
+        { (char *)"cvGetHuMoments", _wrap_cvGetHuMoments, METH_VARARGS, (char *)"cvGetHuMoments(CvMoments moments, CvHuMoments hu_moments)"},
+        { (char *)"cvSampleLine", _wrap_cvSampleLine, METH_VARARGS, (char *)"\n"
+               "cvSampleLine(CvArr image, CvPoint pt1, CvPoint pt2, void buffer, \n"
+               "    int connectivity = 8) -> int\n"
+               ""},
+        { (char *)"cvGetRectSubPix", _wrap_cvGetRectSubPix, METH_VARARGS, (char *)"cvGetRectSubPix(CvArr src, CvArr dst, CvPoint2D32f center)"},
+        { (char *)"cvGetQuadrangleSubPix", _wrap_cvGetQuadrangleSubPix, METH_VARARGS, (char *)"cvGetQuadrangleSubPix(CvArr src, CvArr dst, CvMat map_matrix)"},
+        { (char *)"cvMatchTemplate", _wrap_cvMatchTemplate, METH_VARARGS, (char *)"cvMatchTemplate(CvArr image, CvArr templ, CvArr result, int method)"},
+        { (char *)"cvCalcEMD2", _wrap_cvCalcEMD2, METH_VARARGS, (char *)"\n"
+               "cvCalcEMD2(CvArr signature1, CvArr signature2, int distance_type, \n"
+               "    CvDistanceFunction distance_func = None, \n"
+               "    CvArr cost_matrix = None, CvArr flow = None, \n"
+               "    float lower_bound = None, void userdata = None) -> float\n"
+               ""},
+        { (char *)"cvFindContoursUntyped", _wrap_cvFindContoursUntyped, METH_VARARGS, (char *)"\n"
+               "cvFindContoursUntyped(CvArr image, CvMemStorage storage, int header_size = sizeof(CvContour), \n"
+               "    int mode = 1, int method = 2, \n"
+               "    CvPoint offset = cvPoint(0,0)) -> int\n"
+               ""},
+        { (char *)"cvStartFindContours", _wrap_cvStartFindContours, METH_VARARGS, (char *)"\n"
+               "cvStartFindContours(CvArr image, CvMemStorage storage, int header_size = sizeof(CvContour), \n"
+               "    int mode = 1, int method = 2, \n"
+               "    CvPoint offset = cvPoint(0,0)) -> CvContourScanner\n"
+               ""},
+        { (char *)"cvFindNextContour", _wrap_cvFindNextContour, METH_VARARGS, (char *)"cvFindNextContour(CvContourScanner scanner) -> CvSeq"},
+        { (char *)"cvSubstituteContour", _wrap_cvSubstituteContour, METH_VARARGS, (char *)"cvSubstituteContour(CvContourScanner scanner, CvSeq new_contour)"},
+        { (char *)"cvEndFindContours", _wrap_cvEndFindContours, METH_VARARGS, (char *)"cvEndFindContours(CvContourScanner scanner) -> CvSeq"},
+        { (char *)"cvApproxChainsUntyped", _wrap_cvApproxChainsUntyped, METH_VARARGS, (char *)"\n"
+               "cvApproxChainsUntyped(CvSeq src_seq, CvMemStorage storage, int method = 2, \n"
+               "    double parameter = 0, int minimal_perimeter = 0, \n"
+               "    int recursive = 0) -> CvSeq\n"
+               ""},
+        { (char *)"cvStartReadChainPoints", _wrap_cvStartReadChainPoints, METH_VARARGS, (char *)"cvStartReadChainPoints(CvChain chain, CvChainPtReader reader)"},
+        { (char *)"cvReadChainPoint", _wrap_cvReadChainPoint, METH_VARARGS, (char *)"cvReadChainPoint(CvChainPtReader reader) -> CvPoint"},
+        { (char *)"cvCalcOpticalFlowLK", _wrap_cvCalcOpticalFlowLK, METH_VARARGS, (char *)"\n"
+               "cvCalcOpticalFlowLK(CvArr prev, CvArr curr, CvSize win_size, CvArr velx, \n"
+               "    CvArr vely)\n"
+               ""},
+        { (char *)"cvCalcOpticalFlowBM", _wrap_cvCalcOpticalFlowBM, METH_VARARGS, (char *)"\n"
+               "cvCalcOpticalFlowBM(CvArr prev, CvArr curr, CvSize block_size, CvSize shift_size, \n"
+               "    CvSize max_range, int use_previous, \n"
+               "    CvArr velx, CvArr vely)\n"
+               ""},
+        { (char *)"cvCalcOpticalFlowHS", _wrap_cvCalcOpticalFlowHS, METH_VARARGS, (char *)"\n"
+               "cvCalcOpticalFlowHS(CvArr prev, CvArr curr, int use_previous, CvArr velx, \n"
+               "    CvArr vely, double _lambda, CvTermCriteria criteria)\n"
+               ""},
+        { (char *)"cvCalcOpticalFlowPyrLK", _wrap_cvCalcOpticalFlowPyrLK, METH_VARARGS, (char *)"\n"
+               "cvCalcOpticalFlowPyrLK(CvArr prev, CvArr curr, CvArr prev_pyr, CvArr curr_pyr, \n"
+               "    CvPoint2D32f prev_features, CvPoint2D32f curr_features, \n"
+               "    CvSize win_size, int level, char status, \n"
+               "    float track_error, CvTermCriteria criteria, \n"
+               "    int flags)\n"
+               ""},
+        { (char *)"cvCalcAffineFlowPyrLK", _wrap_cvCalcAffineFlowPyrLK, METH_VARARGS, (char *)"\n"
+               "cvCalcAffineFlowPyrLK(CvArr prev, CvArr curr, CvArr prev_pyr, CvArr curr_pyr, \n"
+               "    CvPoint2D32f prev_features, CvPoint2D32f curr_features, \n"
+               "    float matrices, int count, CvSize win_size, \n"
+               "    int level, char status, float track_error, \n"
+               "    CvTermCriteria criteria, int flags)\n"
+               ""},
+        { (char *)"cvEstimateRigidTransform", _wrap_cvEstimateRigidTransform, METH_VARARGS, (char *)"cvEstimateRigidTransform(CvArr A, CvArr B, CvMat M, int full_affine) -> int"},
+        { (char *)"cvUpdateMotionHistory", _wrap_cvUpdateMotionHistory, METH_VARARGS, (char *)"cvUpdateMotionHistory(CvArr silhouette, CvArr mhi, double timestamp, double duration)"},
+        { (char *)"cvCalcMotionGradient", _wrap_cvCalcMotionGradient, METH_VARARGS, (char *)"\n"
+               "cvCalcMotionGradient(CvArr mhi, CvArr mask, CvArr orientation, double delta1, \n"
+               "    double delta2, int aperture_size = 3)\n"
+               ""},
+        { (char *)"cvCalcGlobalOrientation", _wrap_cvCalcGlobalOrientation, METH_VARARGS, (char *)"\n"
+               "cvCalcGlobalOrientation(CvArr orientation, CvArr mask, CvArr mhi, double timestamp, \n"
+               "    double duration) -> double\n"
+               ""},
+        { (char *)"cvAcc", _wrap_cvAcc, METH_VARARGS, (char *)"cvAcc(CvArr image, CvArr sum, CvArr mask = None)"},
+        { (char *)"cvSquareAcc", _wrap_cvSquareAcc, METH_VARARGS, (char *)"cvSquareAcc(CvArr image, CvArr sqsum, CvArr mask = None)"},
+        { (char *)"cvMultiplyAcc", _wrap_cvMultiplyAcc, METH_VARARGS, (char *)"cvMultiplyAcc(CvArr image1, CvArr image2, CvArr acc, CvArr mask = None)"},
+        { (char *)"cvRunningAvg", _wrap_cvRunningAvg, METH_VARARGS, (char *)"cvRunningAvg(CvArr image, CvArr acc, double alpha, CvArr mask = None)"},
+        { (char *)"cvCamShift", _wrap_cvCamShift, METH_VARARGS, (char *)"\n"
+               "cvCamShift(CvArr prob_image, CvRect window, CvTermCriteria criteria, \n"
+               "    CvConnectedComp comp, CvBox2D box = None) -> int\n"
+               ""},
+        { (char *)"cvMeanShift", _wrap_cvMeanShift, METH_VARARGS, (char *)"\n"
+               "cvMeanShift(CvArr prob_image, CvRect window, CvTermCriteria criteria, \n"
+               "    CvConnectedComp comp) -> int\n"
+               ""},
+        { (char *)"cvCreateConDensation", _wrap_cvCreateConDensation, METH_VARARGS, (char *)"cvCreateConDensation(int dynam_params, int measure_params, int sample_count) -> CvConDensation"},
+        { (char *)"cvConDensUpdateByTime", _wrap_cvConDensUpdateByTime, METH_VARARGS, (char *)"cvConDensUpdateByTime(CvConDensation condens)"},
+        { (char *)"cvConDensInitSampleSet", _wrap_cvConDensInitSampleSet, METH_VARARGS, (char *)"cvConDensInitSampleSet(CvConDensation condens, CvMat lower_bound, CvMat upper_bound)"},
+        { (char *)"cvCreateKalman", _wrap_cvCreateKalman, METH_VARARGS, (char *)"cvCreateKalman(int dynam_params, int measure_params, int control_params = 0) -> CvKalman"},
+        { (char *)"cvKalmanPredict", _wrap_cvKalmanPredict, METH_VARARGS, (char *)"cvKalmanPredict(CvKalman kalman, CvMat control = None) -> CvMat"},
+        { (char *)"cvKalmanCorrect", _wrap_cvKalmanCorrect, METH_VARARGS, (char *)"cvKalmanCorrect(CvKalman kalman, CvMat measurement) -> CvMat"},
+        { (char *)"cvInitSubdivDelaunay2D", _wrap_cvInitSubdivDelaunay2D, METH_VARARGS, (char *)"cvInitSubdivDelaunay2D(CvSubdiv2D subdiv, CvRect rect)"},
+        { (char *)"cvCreateSubdiv2D", _wrap_cvCreateSubdiv2D, METH_VARARGS, (char *)"\n"
+               "cvCreateSubdiv2D(int subdiv_type, int header_size, int vtx_size, int quadedge_size, \n"
+               "    CvMemStorage storage) -> CvSubdiv2D\n"
+               ""},
+        { (char *)"cvCreateSubdivDelaunay2D", _wrap_cvCreateSubdivDelaunay2D, METH_VARARGS, (char *)"cvCreateSubdivDelaunay2D(CvRect rect, CvMemStorage storage) -> CvSubdiv2D"},
+        { (char *)"cvSubdivDelaunay2DInsert", _wrap_cvSubdivDelaunay2DInsert, METH_VARARGS, (char *)"cvSubdivDelaunay2DInsert(CvSubdiv2D subdiv, CvPoint2D32f pt) -> CvSubdiv2DPoint"},
+        { (char *)"cvSubdiv2DLocate", _wrap_cvSubdiv2DLocate, METH_VARARGS, (char *)"cvSubdiv2DLocate(CvSubdiv2D subdiv, CvPoint2D32f pt) -> CvSubdiv2DPointLocation"},
+        { (char *)"cvCalcSubdivVoronoi2D", _wrap_cvCalcSubdivVoronoi2D, METH_VARARGS, (char *)"cvCalcSubdivVoronoi2D(CvSubdiv2D subdiv)"},
+        { (char *)"cvClearSubdivVoronoi2D", _wrap_cvClearSubdivVoronoi2D, METH_VARARGS, (char *)"cvClearSubdivVoronoi2D(CvSubdiv2D subdiv)"},
+        { (char *)"cvFindNearestPoint2D", _wrap_cvFindNearestPoint2D, METH_VARARGS, (char *)"cvFindNearestPoint2D(CvSubdiv2D subdiv, CvPoint2D32f pt) -> CvSubdiv2DPoint"},
+        { (char *)"cvSubdiv2DNextEdge", _wrap_cvSubdiv2DNextEdge, METH_VARARGS, (char *)"cvSubdiv2DNextEdge(CvSubdiv2DEdge edge) -> CvSubdiv2DEdge"},
+        { (char *)"cvSubdiv2DRotateEdge", _wrap_cvSubdiv2DRotateEdge, METH_VARARGS, (char *)"cvSubdiv2DRotateEdge(CvSubdiv2DEdge edge, int rotate) -> CvSubdiv2DEdge"},
+        { (char *)"cvSubdiv2DSymEdge", _wrap_cvSubdiv2DSymEdge, METH_VARARGS, (char *)"cvSubdiv2DSymEdge(CvSubdiv2DEdge edge) -> CvSubdiv2DEdge"},
+        { (char *)"cvSubdiv2DGetEdge", _wrap_cvSubdiv2DGetEdge, METH_VARARGS, (char *)"cvSubdiv2DGetEdge(CvSubdiv2DEdge edge, CvNextEdgeType type) -> CvSubdiv2DEdge"},
+        { (char *)"cvSubdiv2DEdgeOrg", _wrap_cvSubdiv2DEdgeOrg, METH_VARARGS, (char *)"cvSubdiv2DEdgeOrg(CvSubdiv2DEdge edge) -> CvSubdiv2DPoint"},
+        { (char *)"cvSubdiv2DEdgeDst", _wrap_cvSubdiv2DEdgeDst, METH_VARARGS, (char *)"cvSubdiv2DEdgeDst(CvSubdiv2DEdge edge) -> CvSubdiv2DPoint"},
+        { (char *)"cvTriangleArea", _wrap_cvTriangleArea, METH_VARARGS, (char *)"cvTriangleArea(CvPoint2D32f a, CvPoint2D32f b, CvPoint2D32f c) -> double"},
+        { (char *)"cvFindDominantPoints", _wrap_cvFindDominantPoints, METH_VARARGS, (char *)"\n"
+               "cvFindDominantPoints(CvSeq contour, CvMemStorage storage, int method = 1, \n"
+               "    double parameter1 = 0, double parameter2 = 0, \n"
+               "    double parameter3 = 0, double parameter4 = 0) -> CvSeq\n"
+               ""},
+        { (char *)"cvArcLength", _wrap_cvArcLength, METH_VARARGS, (char *)"\n"
+               "cvArcLength(void curve, CvSlice slice = cvSlice(0, 0x3fffffff), \n"
+               "    int is_closed = -1) -> double\n"
+               ""},
+        { (char *)"cvBoundingRect", _wrap_cvBoundingRect, METH_VARARGS, (char *)"cvBoundingRect(CvArr points, int update = 0) -> CvRect"},
+        { (char *)"cvContourArea", _wrap_cvContourArea, METH_VARARGS, (char *)"cvContourArea(CvArr contour, CvSlice slice = cvSlice(0, 0x3fffffff)) -> double"},
+        { (char *)"cvMinAreaRect2", _wrap_cvMinAreaRect2, METH_VARARGS, (char *)"cvMinAreaRect2(CvArr points, CvMemStorage storage = None) -> CvBox2D"},
+        { (char *)"cvMinEnclosingCircle", _wrap_cvMinEnclosingCircle, METH_VARARGS, (char *)"cvMinEnclosingCircle(CvArr points) -> int"},
+        { (char *)"cvMatchShapes", _wrap_cvMatchShapes, METH_VARARGS, (char *)"cvMatchShapes(void object1, void object2, int method, double parameter = 0) -> double"},
+        { (char *)"cvCreateContourTree", _wrap_cvCreateContourTree, METH_VARARGS, (char *)"cvCreateContourTree(CvSeq contour, CvMemStorage storage, double threshold) -> CvContourTree"},
+        { (char *)"cvContourFromContourTreeUntyped", _wrap_cvContourFromContourTreeUntyped, METH_VARARGS, (char *)"cvContourFromContourTreeUntyped(CvContourTree tree, CvMemStorage storage, CvTermCriteria criteria) -> CvSeq"},
+        { (char *)"cvMatchContourTrees", _wrap_cvMatchContourTrees, METH_VARARGS, (char *)"\n"
+               "cvMatchContourTrees(CvContourTree tree1, CvContourTree tree2, int method, \n"
+               "    double threshold) -> double\n"
+               ""},
+        { (char *)"cvCalcPGH", _wrap_cvCalcPGH, METH_VARARGS, (char *)"cvCalcPGH(CvSeq contour, CvHistogram hist)"},
+        { (char *)"cvCheckContourConvexity", _wrap_cvCheckContourConvexity, METH_VARARGS, (char *)"cvCheckContourConvexity(CvArr contour) -> int"},
+        { (char *)"cvConvexityDefectsUntyped", _wrap_cvConvexityDefectsUntyped, METH_VARARGS, (char *)"cvConvexityDefectsUntyped(CvArr contour, CvArr convexhull, CvMemStorage storage = None) -> CvSeq"},
+        { (char *)"cvFitEllipse2", _wrap_cvFitEllipse2, METH_VARARGS, (char *)"cvFitEllipse2(CvArr points) -> CvBox2D"},
+        { (char *)"cvMaxRect", _wrap_cvMaxRect, METH_VARARGS, (char *)"cvMaxRect(CvRect rect1, CvRect rect2) -> CvRect"},
+        { (char *)"cvBoxPoints", _wrap_cvBoxPoints, METH_VARARGS, (char *)"cvBoxPoints(CvBox2D box)"},
+        { (char *)"cvPointSeqFromMat", _wrap_cvPointSeqFromMat, METH_VARARGS, (char *)"\n"
+               "cvPointSeqFromMat(int seq_kind, CvArr mat, CvContour contour_header, \n"
+               "    CvSeqBlock block) -> CvSeq\n"
+               ""},
+        { (char *)"cvPointPolygonTest", _wrap_cvPointPolygonTest, METH_VARARGS, (char *)"cvPointPolygonTest(CvArr contour, CvPoint2D32f pt, int measure_dist) -> double"},
+        { (char *)"cvCreateHist", _wrap_cvCreateHist, METH_VARARGS, (char *)"cvCreateHist(int dims, int type, float ranges = None, int uniform = 1) -> CvHistogram"},
+        { (char *)"cvSetHistBinRanges", _wrap_cvSetHistBinRanges, METH_VARARGS, (char *)"cvSetHistBinRanges(CvHistogram hist, float ranges, int uniform = 1)"},
+        { (char *)"cvMakeHistHeaderForArray", _wrap_cvMakeHistHeaderForArray, METH_VARARGS, (char *)"\n"
+               "cvMakeHistHeaderForArray(int dims, CvHistogram hist, float data, float ranges = None, \n"
+               "    int uniform = 1) -> CvHistogram\n"
+               ""},
+        { (char *)"cvClearHist", _wrap_cvClearHist, METH_VARARGS, (char *)"cvClearHist(CvHistogram hist)"},
+        { (char *)"cvGetMinMaxHistValue", _wrap_cvGetMinMaxHistValue, METH_VARARGS, (char *)"cvGetMinMaxHistValue(CvHistogram hist)"},
+        { (char *)"cvNormalizeHist", _wrap_cvNormalizeHist, METH_VARARGS, (char *)"cvNormalizeHist(CvHistogram hist, double factor)"},
+        { (char *)"cvThreshHist", _wrap_cvThreshHist, METH_VARARGS, (char *)"cvThreshHist(CvHistogram hist, double threshold)"},
+        { (char *)"cvCompareHist", _wrap_cvCompareHist, METH_VARARGS, (char *)"cvCompareHist(CvHistogram hist1, CvHistogram hist2, int method) -> double"},
+        { (char *)"cvCopyHist", _wrap_cvCopyHist, METH_VARARGS, (char *)"cvCopyHist(CvHistogram src, CvHistogram dst)"},
+        { (char *)"cvCalcBayesianProb", _wrap_cvCalcBayesianProb, METH_VARARGS, (char *)"cvCalcBayesianProb(CvHistogram src, int number, CvHistogram dst)"},
+        { (char *)"cvCalcArrHist", _wrap_cvCalcArrHist, METH_VARARGS, (char *)"cvCalcArrHist(CvArr arr, CvHistogram hist, int accumulate = 0, CvArr mask = None)"},
+        { (char *)"cvCalcHist", _wrap_cvCalcHist, METH_VARARGS, (char *)"cvCalcHist( image, CvHistogram hist, int accumulate = 0, CvArr mask = None)"},
+        { (char *)"cvCalcArrBackProject", _wrap_cvCalcArrBackProject, METH_VARARGS, (char *)"cvCalcArrBackProject(CvArr image, CvArr dst, CvHistogram hist)"},
+        { (char *)"cvCalcArrBackProjectPatch", _wrap_cvCalcArrBackProjectPatch, METH_VARARGS, (char *)"\n"
+               "cvCalcArrBackProjectPatch(CvArr image, CvArr dst, CvSize range, CvHistogram hist, \n"
+               "    int method, double factor)\n"
+               ""},
+        { (char *)"cvCalcProbDensity", _wrap_cvCalcProbDensity, METH_VARARGS, (char *)"\n"
+               "cvCalcProbDensity(CvHistogram hist1, CvHistogram hist2, CvHistogram dst_hist, \n"
+               "    double scale = 255)\n"
+               ""},
+        { (char *)"cvEqualizeHist", _wrap_cvEqualizeHist, METH_VARARGS, (char *)"cvEqualizeHist(CvArr src, CvArr dst)"},
+        { (char *)"cvCalcImageHomography", _wrap_cvCalcImageHomography, METH_VARARGS, (char *)"cvCalcImageHomography(float line, CvPoint3D32f center, float intrinsic, float homography)"},
+        { (char *)"cvDistTransform", _wrap_cvDistTransform, METH_VARARGS, (char *)"\n"
+               "cvDistTransform(CvArr src, CvArr dst, int distance_type = 2, int mask_size = 3, \n"
+               "    float mask = None, CvArr labels = None)\n"
+               ""},
+        { (char *)"cvThreshold", _wrap_cvThreshold, METH_VARARGS, (char *)"\n"
+               "cvThreshold(CvArr src, CvArr dst, double threshold, double max_value, \n"
+               "    int threshold_type) -> double\n"
+               ""},
+        { (char *)"cvAdaptiveThreshold", _wrap_cvAdaptiveThreshold, METH_VARARGS, (char *)"\n"
+               "cvAdaptiveThreshold(CvArr src, CvArr dst, double max_value, int adaptive_method = 0, \n"
+               "    int threshold_type = 0, int block_size = 3, \n"
+               "    double param1 = 5)\n"
+               ""},
+        { (char *)"cvFloodFill", _wrap_cvFloodFill, METH_VARARGS, (char *)"\n"
+               "cvFloodFill(CvArr image, CvPoint seed_point, CvScalar new_val, \n"
+               "    CvScalar lo_diff = cvScalarAll(0), CvScalar up_diff = cvScalarAll(0), \n"
+               "    CvConnectedComp comp = None, \n"
+               "    int flags = 4, CvArr mask = None)\n"
+               ""},
+        { (char *)"cvCanny", _wrap_cvCanny, METH_VARARGS, (char *)"\n"
+               "cvCanny(CvArr image, CvArr edges, double threshold1, double threshold2, \n"
+               "    int aperture_size = 3)\n"
+               ""},
+        { (char *)"cvPreCornerDetect", _wrap_cvPreCornerDetect, METH_VARARGS, (char *)"cvPreCornerDetect(CvArr image, CvArr corners, int aperture_size = 3)"},
+        { (char *)"cvCornerEigenValsAndVecs", _wrap_cvCornerEigenValsAndVecs, METH_VARARGS, (char *)"cvCornerEigenValsAndVecs(CvArr image, CvArr eigenvv, int block_size, int aperture_size = 3)"},
+        { (char *)"cvCornerMinEigenVal", _wrap_cvCornerMinEigenVal, METH_VARARGS, (char *)"cvCornerMinEigenVal(CvArr image, CvArr eigenval, int block_size, int aperture_size = 3)"},
+        { (char *)"cvCornerHarris", _wrap_cvCornerHarris, METH_VARARGS, (char *)"\n"
+               "cvCornerHarris(CvArr image, CvArr harris_responce, int block_size, \n"
+               "    int aperture_size = 3, double k = 0.04)\n"
+               ""},
+        { (char *)"cvFindCornerSubPix", _wrap_cvFindCornerSubPix, METH_VARARGS, (char *)"\n"
+               "cvFindCornerSubPix(CvArr image, CvPoint2D32f corners, CvSize win, CvSize zero_zone, \n"
+               "    CvTermCriteria criteria)\n"
+               ""},
+        { (char *)"cvGoodFeaturesToTrack", _wrap_cvGoodFeaturesToTrack, METH_VARARGS, (char *)"\n"
+               "cvGoodFeaturesToTrack(CvArr image, CvArr eig_image, CvArr temp_image, CvPoint2D32f corners, \n"
+               "    double quality_level, double min_distance, \n"
+               "    CvArr mask = None, int block_size = 3, \n"
+               "    int use_harris = 0, double k = 0.04)\n"
+               ""},
+        { (char *)"cvHoughLinesUntyped", _wrap_cvHoughLinesUntyped, METH_VARARGS, (char *)"\n"
+               "cvHoughLinesUntyped(CvArr image, void line_storage, int method, double rho, \n"
+               "    double theta, int threshold, double param1 = 0, \n"
+               "    double param2 = 0) -> CvSeq\n"
+               ""},
+        { (char *)"cvHoughCirclesUntyped", _wrap_cvHoughCirclesUntyped, METH_VARARGS, (char *)"\n"
+               "cvHoughCirclesUntyped(CvArr image, void circle_storage, int method, double dp, \n"
+               "    double min_dist, double param1 = 100, double param2 = 100, \n"
+               "    int min_radius = 0, int max_radius = 0) -> CvSeq\n"
+               ""},
+        { (char *)"cvFitLine", _wrap_cvFitLine, METH_VARARGS, (char *)"\n"
+               "cvFitLine(CvArr points, int dist_type, double param, double reps, \n"
+               "    double aeps, float line)\n"
+               ""},
+        { (char *)"cvCreateKDTree", _wrap_cvCreateKDTree, METH_VARARGS, (char *)"cvCreateKDTree(CvMat desc) -> CvFeatureTree"},
+        { (char *)"cvCreateSpillTree", _wrap_cvCreateSpillTree, METH_VARARGS, (char *)"cvCreateSpillTree(CvMat raw_data, int naive = 50, double rho = .7, double tau = .1) -> CvFeatureTree"},
+        { (char *)"cvReleaseFeatureTree", _wrap_cvReleaseFeatureTree, METH_VARARGS, (char *)"cvReleaseFeatureTree(CvFeatureTree tr)"},
+        { (char *)"cvFindFeatures", _wrap_cvFindFeatures, METH_VARARGS, (char *)"\n"
+               "cvFindFeatures(CvFeatureTree tr, CvMat query_points, CvMat indices, \n"
+               "    int emax = 20)\n"
+               ""},
+        { (char *)"cvFindFeaturesBoxed", _wrap_cvFindFeaturesBoxed, METH_VARARGS, (char *)"\n"
+               "cvFindFeaturesBoxed(CvFeatureTree tr, CvMat bounds_min, CvMat bounds_max, \n"
+               "    CvMat out_indices) -> int\n"
+               ""},
+        { (char *)"cvCreateLSH", _wrap_cvCreateLSH, METH_VARARGS, (char *)"\n"
+               "cvCreateLSH(CvLSHOperations ops, int d, int L = 10, int k = 10, \n"
+               "    int type = (((6) &((1 << 3) -1)) +(((1) -1) << 3)), \n"
+               "    double r = 4, int64 seed = -1) -> CvLSH\n"
+               ""},
+        { (char *)"cvCreateMemoryLSH", _wrap_cvCreateMemoryLSH, METH_VARARGS, (char *)"\n"
+               "cvCreateMemoryLSH(int d, int n, int L = 10, int k = 10, int type = (((6) &((1 << 3) -1)) +(((1) -1) << 3)), \n"
+               "    double r = 4, \n"
+               "    int64 seed = -1) -> CvLSH\n"
+               ""},
+        { (char *)"cvReleaseLSH", _wrap_cvReleaseLSH, METH_VARARGS, (char *)"cvReleaseLSH(CvLSH lsh)"},
+        { (char *)"LSHSize", _wrap_LSHSize, METH_VARARGS, (char *)"LSHSize(CvLSH lsh) -> unsigned int"},
+        { (char *)"cvLSHAdd", _wrap_cvLSHAdd, METH_VARARGS, (char *)"cvLSHAdd(CvLSH lsh, CvMat data)"},
+        { (char *)"cvLSHRemove", _wrap_cvLSHRemove, METH_VARARGS, (char *)"cvLSHRemove(CvLSH lsh, CvMat indices)"},
+        { (char *)"cvLSHQuery", _wrap_cvLSHQuery, METH_VARARGS, (char *)"cvLSHQuery(CvLSH lsh, CvMat query_points, CvMat indices, int emax)"},
+        { (char *)"CvSURFPoint_pt_set", _wrap_CvSURFPoint_pt_set, METH_VARARGS, (char *)"CvSURFPoint_pt_set(CvSURFPoint self, CvPoint2D32f pt)"},
+        { (char *)"CvSURFPoint_pt_get", _wrap_CvSURFPoint_pt_get, METH_VARARGS, (char *)"CvSURFPoint_pt_get(CvSURFPoint self) -> CvPoint2D32f"},
+        { (char *)"CvSURFPoint_laplacian_set", _wrap_CvSURFPoint_laplacian_set, METH_VARARGS, (char *)"CvSURFPoint_laplacian_set(CvSURFPoint self, int laplacian)"},
+        { (char *)"CvSURFPoint_laplacian_get", _wrap_CvSURFPoint_laplacian_get, METH_VARARGS, (char *)"CvSURFPoint_laplacian_get(CvSURFPoint self) -> int"},
+        { (char *)"CvSURFPoint_size_set", _wrap_CvSURFPoint_size_set, METH_VARARGS, (char *)"CvSURFPoint_size_set(CvSURFPoint self, int size)"},
+        { (char *)"CvSURFPoint_size_get", _wrap_CvSURFPoint_size_get, METH_VARARGS, (char *)"CvSURFPoint_size_get(CvSURFPoint self) -> int"},
+        { (char *)"CvSURFPoint_dir_set", _wrap_CvSURFPoint_dir_set, METH_VARARGS, (char *)"CvSURFPoint_dir_set(CvSURFPoint self, float dir)"},
+        { (char *)"CvSURFPoint_dir_get", _wrap_CvSURFPoint_dir_get, METH_VARARGS, (char *)"CvSURFPoint_dir_get(CvSURFPoint self) -> float"},
+        { (char *)"CvSURFPoint_hessian_set", _wrap_CvSURFPoint_hessian_set, METH_VARARGS, (char *)"CvSURFPoint_hessian_set(CvSURFPoint self, float hessian)"},
+        { (char *)"CvSURFPoint_hessian_get", _wrap_CvSURFPoint_hessian_get, METH_VARARGS, (char *)"CvSURFPoint_hessian_get(CvSURFPoint self) -> float"},
+        { (char *)"new_CvSURFPoint", _wrap_new_CvSURFPoint, METH_VARARGS, (char *)"new_CvSURFPoint() -> CvSURFPoint"},
+        { (char *)"delete_CvSURFPoint", _wrap_delete_CvSURFPoint, METH_VARARGS, (char *)"delete_CvSURFPoint(CvSURFPoint self)"},
         { (char *)"CvSURFPoint_swigregister", CvSURFPoint_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvSURFPoint", _wrap_cvSURFPoint, METH_VARARGS, NULL},
-        { (char *)"CvSURFParams_extended_set", _wrap_CvSURFParams_extended_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFParams_extended_get", _wrap_CvSURFParams_extended_get, METH_VARARGS, NULL},
-        { (char *)"CvSURFParams_hessianThreshold_set", _wrap_CvSURFParams_hessianThreshold_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFParams_hessianThreshold_get", _wrap_CvSURFParams_hessianThreshold_get, METH_VARARGS, NULL},
-        { (char *)"CvSURFParams_nOctaves_set", _wrap_CvSURFParams_nOctaves_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFParams_nOctaves_get", _wrap_CvSURFParams_nOctaves_get, METH_VARARGS, NULL},
-        { (char *)"CvSURFParams_nOctaveLayers_set", _wrap_CvSURFParams_nOctaveLayers_set, METH_VARARGS, NULL},
-        { (char *)"CvSURFParams_nOctaveLayers_get", _wrap_CvSURFParams_nOctaveLayers_get, METH_VARARGS, NULL},
-        { (char *)"new_CvSURFParams", _wrap_new_CvSURFParams, METH_VARARGS, NULL},
-        { (char *)"delete_CvSURFParams", _wrap_delete_CvSURFParams, METH_VARARGS, NULL},
+        { (char *)"cvSURFPoint", _wrap_cvSURFPoint, METH_VARARGS, (char *)"\n"
+               "cvSURFPoint(CvPoint2D32f pt, int laplacian, int size, float dir = 0, \n"
+               "    float hessian = 0) -> CvSURFPoint\n"
+               ""},
+        { (char *)"CvSURFParams_extended_set", _wrap_CvSURFParams_extended_set, METH_VARARGS, (char *)"CvSURFParams_extended_set(CvSURFParams self, int extended)"},
+        { (char *)"CvSURFParams_extended_get", _wrap_CvSURFParams_extended_get, METH_VARARGS, (char *)"CvSURFParams_extended_get(CvSURFParams self) -> int"},
+        { (char *)"CvSURFParams_hessianThreshold_set", _wrap_CvSURFParams_hessianThreshold_set, METH_VARARGS, (char *)"CvSURFParams_hessianThreshold_set(CvSURFParams self, double hessianThreshold)"},
+        { (char *)"CvSURFParams_hessianThreshold_get", _wrap_CvSURFParams_hessianThreshold_get, METH_VARARGS, (char *)"CvSURFParams_hessianThreshold_get(CvSURFParams self) -> double"},
+        { (char *)"CvSURFParams_nOctaves_set", _wrap_CvSURFParams_nOctaves_set, METH_VARARGS, (char *)"CvSURFParams_nOctaves_set(CvSURFParams self, int nOctaves)"},
+        { (char *)"CvSURFParams_nOctaves_get", _wrap_CvSURFParams_nOctaves_get, METH_VARARGS, (char *)"CvSURFParams_nOctaves_get(CvSURFParams self) -> int"},
+        { (char *)"CvSURFParams_nOctaveLayers_set", _wrap_CvSURFParams_nOctaveLayers_set, METH_VARARGS, (char *)"CvSURFParams_nOctaveLayers_set(CvSURFParams self, int nOctaveLayers)"},
+        { (char *)"CvSURFParams_nOctaveLayers_get", _wrap_CvSURFParams_nOctaveLayers_get, METH_VARARGS, (char *)"CvSURFParams_nOctaveLayers_get(CvSURFParams self) -> int"},
+        { (char *)"new_CvSURFParams", _wrap_new_CvSURFParams, METH_VARARGS, (char *)"new_CvSURFParams() -> CvSURFParams"},
+        { (char *)"delete_CvSURFParams", _wrap_delete_CvSURFParams, METH_VARARGS, (char *)"delete_CvSURFParams(CvSURFParams self)"},
         { (char *)"CvSURFParams_swigregister", CvSURFParams_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvSURFParams", _wrap_cvSURFParams, METH_VARARGS, NULL},
-        { (char *)"cvExtractSURF", _wrap_cvExtractSURF, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_delta_set", _wrap_CvMSERParams_delta_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_delta_get", _wrap_CvMSERParams_delta_get, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_maxArea_set", _wrap_CvMSERParams_maxArea_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_maxArea_get", _wrap_CvMSERParams_maxArea_get, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_minArea_set", _wrap_CvMSERParams_minArea_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_minArea_get", _wrap_CvMSERParams_minArea_get, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_maxVariation_set", _wrap_CvMSERParams_maxVariation_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_maxVariation_get", _wrap_CvMSERParams_maxVariation_get, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_minDiversity_set", _wrap_CvMSERParams_minDiversity_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_minDiversity_get", _wrap_CvMSERParams_minDiversity_get, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_maxEvolution_set", _wrap_CvMSERParams_maxEvolution_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_maxEvolution_get", _wrap_CvMSERParams_maxEvolution_get, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_areaThreshold_set", _wrap_CvMSERParams_areaThreshold_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_areaThreshold_get", _wrap_CvMSERParams_areaThreshold_get, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_minMargin_set", _wrap_CvMSERParams_minMargin_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_minMargin_get", _wrap_CvMSERParams_minMargin_get, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_edgeBlurSize_set", _wrap_CvMSERParams_edgeBlurSize_set, METH_VARARGS, NULL},
-        { (char *)"CvMSERParams_edgeBlurSize_get", _wrap_CvMSERParams_edgeBlurSize_get, METH_VARARGS, NULL},
-        { (char *)"new_CvMSERParams", _wrap_new_CvMSERParams, METH_VARARGS, NULL},
-        { (char *)"delete_CvMSERParams", _wrap_delete_CvMSERParams, METH_VARARGS, NULL},
+        { (char *)"cvSURFParams", _wrap_cvSURFParams, METH_VARARGS, (char *)"cvSURFParams(double hessianThreshold, int extended = 0) -> CvSURFParams"},
+        { (char *)"cvExtractSURF", _wrap_cvExtractSURF, METH_VARARGS, (char *)"cvExtractSURF(CvArr img, CvArr mask, CvSURFParams params, int useProvidedKeyPts = 0)"},
+        { (char *)"CvMSERParams_delta_set", _wrap_CvMSERParams_delta_set, METH_VARARGS, (char *)"CvMSERParams_delta_set(CvMSERParams self, int delta)"},
+        { (char *)"CvMSERParams_delta_get", _wrap_CvMSERParams_delta_get, METH_VARARGS, (char *)"CvMSERParams_delta_get(CvMSERParams self) -> int"},
+        { (char *)"CvMSERParams_maxArea_set", _wrap_CvMSERParams_maxArea_set, METH_VARARGS, (char *)"CvMSERParams_maxArea_set(CvMSERParams self, int maxArea)"},
+        { (char *)"CvMSERParams_maxArea_get", _wrap_CvMSERParams_maxArea_get, METH_VARARGS, (char *)"CvMSERParams_maxArea_get(CvMSERParams self) -> int"},
+        { (char *)"CvMSERParams_minArea_set", _wrap_CvMSERParams_minArea_set, METH_VARARGS, (char *)"CvMSERParams_minArea_set(CvMSERParams self, int minArea)"},
+        { (char *)"CvMSERParams_minArea_get", _wrap_CvMSERParams_minArea_get, METH_VARARGS, (char *)"CvMSERParams_minArea_get(CvMSERParams self) -> int"},
+        { (char *)"CvMSERParams_maxVariation_set", _wrap_CvMSERParams_maxVariation_set, METH_VARARGS, (char *)"CvMSERParams_maxVariation_set(CvMSERParams self, float maxVariation)"},
+        { (char *)"CvMSERParams_maxVariation_get", _wrap_CvMSERParams_maxVariation_get, METH_VARARGS, (char *)"CvMSERParams_maxVariation_get(CvMSERParams self) -> float"},
+        { (char *)"CvMSERParams_minDiversity_set", _wrap_CvMSERParams_minDiversity_set, METH_VARARGS, (char *)"CvMSERParams_minDiversity_set(CvMSERParams self, float minDiversity)"},
+        { (char *)"CvMSERParams_minDiversity_get", _wrap_CvMSERParams_minDiversity_get, METH_VARARGS, (char *)"CvMSERParams_minDiversity_get(CvMSERParams self) -> float"},
+        { (char *)"CvMSERParams_maxEvolution_set", _wrap_CvMSERParams_maxEvolution_set, METH_VARARGS, (char *)"CvMSERParams_maxEvolution_set(CvMSERParams self, int maxEvolution)"},
+        { (char *)"CvMSERParams_maxEvolution_get", _wrap_CvMSERParams_maxEvolution_get, METH_VARARGS, (char *)"CvMSERParams_maxEvolution_get(CvMSERParams self) -> int"},
+        { (char *)"CvMSERParams_areaThreshold_set", _wrap_CvMSERParams_areaThreshold_set, METH_VARARGS, (char *)"CvMSERParams_areaThreshold_set(CvMSERParams self, double areaThreshold)"},
+        { (char *)"CvMSERParams_areaThreshold_get", _wrap_CvMSERParams_areaThreshold_get, METH_VARARGS, (char *)"CvMSERParams_areaThreshold_get(CvMSERParams self) -> double"},
+        { (char *)"CvMSERParams_minMargin_set", _wrap_CvMSERParams_minMargin_set, METH_VARARGS, (char *)"CvMSERParams_minMargin_set(CvMSERParams self, double minMargin)"},
+        { (char *)"CvMSERParams_minMargin_get", _wrap_CvMSERParams_minMargin_get, METH_VARARGS, (char *)"CvMSERParams_minMargin_get(CvMSERParams self) -> double"},
+        { (char *)"CvMSERParams_edgeBlurSize_set", _wrap_CvMSERParams_edgeBlurSize_set, METH_VARARGS, (char *)"CvMSERParams_edgeBlurSize_set(CvMSERParams self, int edgeBlurSize)"},
+        { (char *)"CvMSERParams_edgeBlurSize_get", _wrap_CvMSERParams_edgeBlurSize_get, METH_VARARGS, (char *)"CvMSERParams_edgeBlurSize_get(CvMSERParams self) -> int"},
+        { (char *)"new_CvMSERParams", _wrap_new_CvMSERParams, METH_VARARGS, (char *)"new_CvMSERParams() -> CvMSERParams"},
+        { (char *)"delete_CvMSERParams", _wrap_delete_CvMSERParams, METH_VARARGS, (char *)"delete_CvMSERParams(CvMSERParams self)"},
         { (char *)"CvMSERParams_swigregister", CvMSERParams_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvMSERParams", _wrap_cvMSERParams, METH_VARARGS, NULL},
-        { (char *)"cvExtractMSER", _wrap_cvExtractMSER, METH_VARARGS, NULL},
-        { (char *)"CvStarKeypoint_pt_set", _wrap_CvStarKeypoint_pt_set, METH_VARARGS, NULL},
-        { (char *)"CvStarKeypoint_pt_get", _wrap_CvStarKeypoint_pt_get, METH_VARARGS, NULL},
-        { (char *)"CvStarKeypoint_size_set", _wrap_CvStarKeypoint_size_set, METH_VARARGS, NULL},
-        { (char *)"CvStarKeypoint_size_get", _wrap_CvStarKeypoint_size_get, METH_VARARGS, NULL},
-        { (char *)"CvStarKeypoint_response_set", _wrap_CvStarKeypoint_response_set, METH_VARARGS, NULL},
-        { (char *)"CvStarKeypoint_response_get", _wrap_CvStarKeypoint_response_get, METH_VARARGS, NULL},
-        { (char *)"new_CvStarKeypoint", _wrap_new_CvStarKeypoint, METH_VARARGS, NULL},
-        { (char *)"delete_CvStarKeypoint", _wrap_delete_CvStarKeypoint, METH_VARARGS, NULL},
+        { (char *)"cvMSERParams", _wrap_cvMSERParams, METH_VARARGS, (char *)"\n"
+               "cvMSERParams(int delta = 5, int min_area = 60, int max_area = 14400, \n"
+               "    float max_variation = .25, float min_diversity = .2, \n"
+               "    int max_evolution = 200, double area_threshold = 1.01, \n"
+               "    double min_margin = .003, \n"
+               "    int edge_blur_size = 5) -> CvMSERParams\n"
+               ""},
+        { (char *)"cvExtractMSER", _wrap_cvExtractMSER, METH_VARARGS, (char *)"\n"
+               "cvExtractMSER(CvArr _img, CvArr _mask, CvSeq contours, CvMemStorage storage, \n"
+               "    CvMSERParams params)\n"
+               ""},
+        { (char *)"CvStarKeypoint_pt_set", _wrap_CvStarKeypoint_pt_set, METH_VARARGS, (char *)"CvStarKeypoint_pt_set(CvStarKeypoint self, CvPoint pt)"},
+        { (char *)"CvStarKeypoint_pt_get", _wrap_CvStarKeypoint_pt_get, METH_VARARGS, (char *)"CvStarKeypoint_pt_get(CvStarKeypoint self) -> CvPoint"},
+        { (char *)"CvStarKeypoint_size_set", _wrap_CvStarKeypoint_size_set, METH_VARARGS, (char *)"CvStarKeypoint_size_set(CvStarKeypoint self, int size)"},
+        { (char *)"CvStarKeypoint_size_get", _wrap_CvStarKeypoint_size_get, METH_VARARGS, (char *)"CvStarKeypoint_size_get(CvStarKeypoint self) -> int"},
+        { (char *)"CvStarKeypoint_response_set", _wrap_CvStarKeypoint_response_set, METH_VARARGS, (char *)"CvStarKeypoint_response_set(CvStarKeypoint self, float response)"},
+        { (char *)"CvStarKeypoint_response_get", _wrap_CvStarKeypoint_response_get, METH_VARARGS, (char *)"CvStarKeypoint_response_get(CvStarKeypoint self) -> float"},
+        { (char *)"new_CvStarKeypoint", _wrap_new_CvStarKeypoint, METH_VARARGS, (char *)"new_CvStarKeypoint() -> CvStarKeypoint"},
+        { (char *)"delete_CvStarKeypoint", _wrap_delete_CvStarKeypoint, METH_VARARGS, (char *)"delete_CvStarKeypoint(CvStarKeypoint self)"},
         { (char *)"CvStarKeypoint_swigregister", CvStarKeypoint_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvStarKeypoint", _wrap_cvStarKeypoint, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_maxSize_set", _wrap_CvStarDetectorParams_maxSize_set, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_maxSize_get", _wrap_CvStarDetectorParams_maxSize_get, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_responseThreshold_set", _wrap_CvStarDetectorParams_responseThreshold_set, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_responseThreshold_get", _wrap_CvStarDetectorParams_responseThreshold_get, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_lineThresholdProjected_set", _wrap_CvStarDetectorParams_lineThresholdProjected_set, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_lineThresholdProjected_get", _wrap_CvStarDetectorParams_lineThresholdProjected_get, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_lineThresholdBinarized_set", _wrap_CvStarDetectorParams_lineThresholdBinarized_set, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_lineThresholdBinarized_get", _wrap_CvStarDetectorParams_lineThresholdBinarized_get, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_suppressNonmaxSize_set", _wrap_CvStarDetectorParams_suppressNonmaxSize_set, METH_VARARGS, NULL},
-        { (char *)"CvStarDetectorParams_suppressNonmaxSize_get", _wrap_CvStarDetectorParams_suppressNonmaxSize_get, METH_VARARGS, NULL},
-        { (char *)"new_CvStarDetectorParams", _wrap_new_CvStarDetectorParams, METH_VARARGS, NULL},
-        { (char *)"delete_CvStarDetectorParams", _wrap_delete_CvStarDetectorParams, METH_VARARGS, NULL},
+        { (char *)"cvStarKeypoint", _wrap_cvStarKeypoint, METH_VARARGS, (char *)"cvStarKeypoint(CvPoint pt, int size, float response) -> CvStarKeypoint"},
+        { (char *)"CvStarDetectorParams_maxSize_set", _wrap_CvStarDetectorParams_maxSize_set, METH_VARARGS, (char *)"CvStarDetectorParams_maxSize_set(CvStarDetectorParams self, int maxSize)"},
+        { (char *)"CvStarDetectorParams_maxSize_get", _wrap_CvStarDetectorParams_maxSize_get, METH_VARARGS, (char *)"CvStarDetectorParams_maxSize_get(CvStarDetectorParams self) -> int"},
+        { (char *)"CvStarDetectorParams_responseThreshold_set", _wrap_CvStarDetectorParams_responseThreshold_set, METH_VARARGS, (char *)"CvStarDetectorParams_responseThreshold_set(CvStarDetectorParams self, int responseThreshold)"},
+        { (char *)"CvStarDetectorParams_responseThreshold_get", _wrap_CvStarDetectorParams_responseThreshold_get, METH_VARARGS, (char *)"CvStarDetectorParams_responseThreshold_get(CvStarDetectorParams self) -> int"},
+        { (char *)"CvStarDetectorParams_lineThresholdProjected_set", _wrap_CvStarDetectorParams_lineThresholdProjected_set, METH_VARARGS, (char *)"CvStarDetectorParams_lineThresholdProjected_set(CvStarDetectorParams self, int lineThresholdProjected)"},
+        { (char *)"CvStarDetectorParams_lineThresholdProjected_get", _wrap_CvStarDetectorParams_lineThresholdProjected_get, METH_VARARGS, (char *)"CvStarDetectorParams_lineThresholdProjected_get(CvStarDetectorParams self) -> int"},
+        { (char *)"CvStarDetectorParams_lineThresholdBinarized_set", _wrap_CvStarDetectorParams_lineThresholdBinarized_set, METH_VARARGS, (char *)"CvStarDetectorParams_lineThresholdBinarized_set(CvStarDetectorParams self, int lineThresholdBinarized)"},
+        { (char *)"CvStarDetectorParams_lineThresholdBinarized_get", _wrap_CvStarDetectorParams_lineThresholdBinarized_get, METH_VARARGS, (char *)"CvStarDetectorParams_lineThresholdBinarized_get(CvStarDetectorParams self) -> int"},
+        { (char *)"CvStarDetectorParams_suppressNonmaxSize_set", _wrap_CvStarDetectorParams_suppressNonmaxSize_set, METH_VARARGS, (char *)"CvStarDetectorParams_suppressNonmaxSize_set(CvStarDetectorParams self, int suppressNonmaxSize)"},
+        { (char *)"CvStarDetectorParams_suppressNonmaxSize_get", _wrap_CvStarDetectorParams_suppressNonmaxSize_get, METH_VARARGS, (char *)"CvStarDetectorParams_suppressNonmaxSize_get(CvStarDetectorParams self) -> int"},
+        { (char *)"new_CvStarDetectorParams", _wrap_new_CvStarDetectorParams, METH_VARARGS, (char *)"new_CvStarDetectorParams() -> CvStarDetectorParams"},
+        { (char *)"delete_CvStarDetectorParams", _wrap_delete_CvStarDetectorParams, METH_VARARGS, (char *)"delete_CvStarDetectorParams(CvStarDetectorParams self)"},
         { (char *)"CvStarDetectorParams_swigregister", CvStarDetectorParams_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvStarDetectorParams", _wrap_cvStarDetectorParams, METH_VARARGS, NULL},
-        { (char *)"cvGetStarKeypoints", _wrap_cvGetStarKeypoints, METH_VARARGS, NULL},
-        { (char *)"cvLoadHaarClassifierCascade", _wrap_cvLoadHaarClassifierCascade, METH_VARARGS, NULL},
-        { (char *)"cvSetImagesForHaarClassifierCascade", _wrap_cvSetImagesForHaarClassifierCascade, METH_VARARGS, NULL},
-        { (char *)"cvRunHaarClassifierCascade", _wrap_cvRunHaarClassifierCascade, METH_VARARGS, NULL},
-        { (char *)"cvUndistort2", _wrap_cvUndistort2, METH_VARARGS, NULL},
-        { (char *)"cvInitUndistortMap", _wrap_cvInitUndistortMap, METH_VARARGS, NULL},
-        { (char *)"cvInitUndistortRectifyMap", _wrap_cvInitUndistortRectifyMap, METH_VARARGS, NULL},
-        { (char *)"cvUndistortPoints", _wrap_cvUndistortPoints, METH_VARARGS, NULL},
-        { (char *)"cvRodrigues2", _wrap_cvRodrigues2, METH_VARARGS, NULL},
-        { (char *)"cvFindHomography", _wrap_cvFindHomography, METH_VARARGS, NULL},
-        { (char *)"cvRQDecomp3x3", _wrap_cvRQDecomp3x3, METH_VARARGS, NULL},
-        { (char *)"cvDecomposeProjectionMatrix", _wrap_cvDecomposeProjectionMatrix, METH_VARARGS, NULL},
-        { (char *)"cvCalcMatMulDeriv", _wrap_cvCalcMatMulDeriv, METH_VARARGS, NULL},
-        { (char *)"cvComposeRT", _wrap_cvComposeRT, METH_VARARGS, NULL},
-        { (char *)"cvProjectPoints2", _wrap_cvProjectPoints2, METH_VARARGS, NULL},
-        { (char *)"cvFindExtrinsicCameraParams2", _wrap_cvFindExtrinsicCameraParams2, METH_VARARGS, NULL},
-        { (char *)"cvInitIntrinsicParams2D", _wrap_cvInitIntrinsicParams2D, METH_VARARGS, NULL},
-        { (char *)"cvFindChessboardCorners", _wrap_cvFindChessboardCorners, METH_VARARGS, NULL},
-        { (char *)"cvDrawChessboardCorners", _wrap_cvDrawChessboardCorners, METH_VARARGS, NULL},
-        { (char *)"cvCalibrateCamera2", _wrap_cvCalibrateCamera2, METH_VARARGS, NULL},
-        { (char *)"cvCalibrationMatrixValues", _wrap_cvCalibrationMatrixValues, METH_VARARGS, NULL},
-        { (char *)"cvStereoCalibrate", _wrap_cvStereoCalibrate, METH_VARARGS, NULL},
-        { (char *)"cvStereoRectify", _wrap_cvStereoRectify, METH_VARARGS, NULL},
-        { (char *)"cvStereoRectifyUncalibrated", _wrap_cvStereoRectifyUncalibrated, METH_VARARGS, NULL},
-        { (char *)"cvCreatePOSITObject", _wrap_cvCreatePOSITObject, METH_VARARGS, NULL},
-        { (char *)"cvPOSIT", _wrap_cvPOSIT, METH_VARARGS, NULL},
-        { (char *)"cvReleasePOSITObject", _wrap_cvReleasePOSITObject, METH_VARARGS, NULL},
-        { (char *)"cvRANSACUpdateNumIters", _wrap_cvRANSACUpdateNumIters, METH_VARARGS, NULL},
-        { (char *)"cvConvertPointsHomogeneous", _wrap_cvConvertPointsHomogeneous, METH_VARARGS, NULL},
-        { (char *)"cvFindFundamentalMat", _wrap_cvFindFundamentalMat, METH_VARARGS, NULL},
-        { (char *)"cvComputeCorrespondEpilines", _wrap_cvComputeCorrespondEpilines, METH_VARARGS, NULL},
-        { (char *)"cvTriangulatePoints", _wrap_cvTriangulatePoints, METH_VARARGS, NULL},
-        { (char *)"cvCorrectMatches", _wrap_cvCorrectMatches, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilterType_set", _wrap_CvStereoBMState_preFilterType_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilterType_get", _wrap_CvStereoBMState_preFilterType_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilterSize_set", _wrap_CvStereoBMState_preFilterSize_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilterSize_get", _wrap_CvStereoBMState_preFilterSize_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilterCap_set", _wrap_CvStereoBMState_preFilterCap_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilterCap_get", _wrap_CvStereoBMState_preFilterCap_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_SADWindowSize_set", _wrap_CvStereoBMState_SADWindowSize_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_SADWindowSize_get", _wrap_CvStereoBMState_SADWindowSize_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_minDisparity_set", _wrap_CvStereoBMState_minDisparity_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_minDisparity_get", _wrap_CvStereoBMState_minDisparity_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_numberOfDisparities_set", _wrap_CvStereoBMState_numberOfDisparities_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_numberOfDisparities_get", _wrap_CvStereoBMState_numberOfDisparities_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_textureThreshold_set", _wrap_CvStereoBMState_textureThreshold_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_textureThreshold_get", _wrap_CvStereoBMState_textureThreshold_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_uniquenessRatio_set", _wrap_CvStereoBMState_uniquenessRatio_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_uniquenessRatio_get", _wrap_CvStereoBMState_uniquenessRatio_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_speckleWindowSize_set", _wrap_CvStereoBMState_speckleWindowSize_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_speckleWindowSize_get", _wrap_CvStereoBMState_speckleWindowSize_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_speckleRange_set", _wrap_CvStereoBMState_speckleRange_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_speckleRange_get", _wrap_CvStereoBMState_speckleRange_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_trySmallerWindows_set", _wrap_CvStereoBMState_trySmallerWindows_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_trySmallerWindows_get", _wrap_CvStereoBMState_trySmallerWindows_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilteredImg0_set", _wrap_CvStereoBMState_preFilteredImg0_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilteredImg0_get", _wrap_CvStereoBMState_preFilteredImg0_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilteredImg1_set", _wrap_CvStereoBMState_preFilteredImg1_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_preFilteredImg1_get", _wrap_CvStereoBMState_preFilteredImg1_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_slidingSumBuf_set", _wrap_CvStereoBMState_slidingSumBuf_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_slidingSumBuf_get", _wrap_CvStereoBMState_slidingSumBuf_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_dbmin_set", _wrap_CvStereoBMState_dbmin_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_dbmin_get", _wrap_CvStereoBMState_dbmin_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_dbmax_set", _wrap_CvStereoBMState_dbmax_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoBMState_dbmax_get", _wrap_CvStereoBMState_dbmax_get, METH_VARARGS, NULL},
-        { (char *)"new_CvStereoBMState", _wrap_new_CvStereoBMState, METH_VARARGS, NULL},
-        { (char *)"delete_CvStereoBMState", _wrap_delete_CvStereoBMState, METH_VARARGS, NULL},
+        { (char *)"cvStarDetectorParams", _wrap_cvStarDetectorParams, METH_VARARGS, (char *)"\n"
+               "cvStarDetectorParams(int maxSize = 45, int responseThreshold = 30, int lineThresholdProjected = 10, \n"
+               "    int lineThresholdBinarized = 8, \n"
+               "    int suppressNonmaxSize = 5) -> CvStarDetectorParams\n"
+               ""},
+        { (char *)"cvGetStarKeypoints", _wrap_cvGetStarKeypoints, METH_VARARGS, (char *)"cvGetStarKeypoints(CvArr img, CvMemStorage storage, CvStarDetectorParams params = cvStarDetectorParams()) -> CvSeq"},
+        { (char *)"cvLoadHaarClassifierCascade", _wrap_cvLoadHaarClassifierCascade, METH_VARARGS, (char *)"cvLoadHaarClassifierCascade(char directory, CvSize orig_window_size) -> CvHaarClassifierCascade"},
+        { (char *)"cvSetImagesForHaarClassifierCascade", _wrap_cvSetImagesForHaarClassifierCascade, METH_VARARGS, (char *)"\n"
+               "cvSetImagesForHaarClassifierCascade(CvHaarClassifierCascade cascade, CvArr sum, CvArr sqsum, \n"
+               "    CvArr tilted_sum, double scale)\n"
+               ""},
+        { (char *)"cvRunHaarClassifierCascade", _wrap_cvRunHaarClassifierCascade, METH_VARARGS, (char *)"cvRunHaarClassifierCascade(CvHaarClassifierCascade cascade, CvPoint pt, int start_stage = 0) -> int"},
+        { (char *)"cvUndistort2", _wrap_cvUndistort2, METH_VARARGS, (char *)"cvUndistort2(CvArr src, CvArr dst, CvMat camera_matrix, CvMat distortion_coeffs)"},
+        { (char *)"cvInitUndistortMap", _wrap_cvInitUndistortMap, METH_VARARGS, (char *)"\n"
+               "cvInitUndistortMap(CvMat camera_matrix, CvMat distortion_coeffs, CvArr mapx, \n"
+               "    CvArr mapy)\n"
+               ""},
+        { (char *)"cvInitUndistortRectifyMap", _wrap_cvInitUndistortRectifyMap, METH_VARARGS, (char *)"\n"
+               "cvInitUndistortRectifyMap(CvMat camera_matrix, CvMat dist_coeffs, CvMat R, CvMat new_camera_matrix, \n"
+               "    CvArr mapx, CvArr mapy)\n"
+               ""},
+        { (char *)"cvUndistortPoints", _wrap_cvUndistortPoints, METH_VARARGS, (char *)"\n"
+               "cvUndistortPoints(CvMat src, CvMat dst, CvMat camera_matrix, CvMat dist_coeffs, \n"
+               "    CvMat R = None, CvMat P = None)\n"
+               ""},
+        { (char *)"cvRodrigues2", _wrap_cvRodrigues2, METH_VARARGS, (char *)"cvRodrigues2(CvMat src, CvMat dst, CvMat jacobian = None) -> int"},
+        { (char *)"cvFindHomography", _wrap_cvFindHomography, METH_VARARGS, (char *)"\n"
+               "cvFindHomography(CvMat src_points, CvMat dst_points, int method = 0, \n"
+               "    double ransacReprojThreshold = 0, CvMat mask = None) -> int\n"
+               ""},
+        { (char *)"cvRQDecomp3x3", _wrap_cvRQDecomp3x3, METH_VARARGS, (char *)"\n"
+               "cvRQDecomp3x3(CvMat matrixM, CvMat matrixR, CvMat matrixQ, CvMat matrixQx = None, \n"
+               "    CvMat matrixQy = None, CvMat matrixQz = None, \n"
+               "    CvPoint3D64f eulerAngles = None)\n"
+               ""},
+        { (char *)"cvDecomposeProjectionMatrix", _wrap_cvDecomposeProjectionMatrix, METH_VARARGS, (char *)"\n"
+               "cvDecomposeProjectionMatrix(CvMat projMatr, CvMat calibMatr, CvMat rotMatr, CvMat posVect, \n"
+               "    CvMat rotMatrX = None, CvMat rotMatrY = None, \n"
+               "    CvMat rotMatrZ = None, CvPoint3D64f eulerAngles = None)\n"
+               ""},
+        { (char *)"cvCalcMatMulDeriv", _wrap_cvCalcMatMulDeriv, METH_VARARGS, (char *)"cvCalcMatMulDeriv(CvMat A, CvMat B, CvMat dABdA, CvMat dABdB)"},
+        { (char *)"cvComposeRT", _wrap_cvComposeRT, METH_VARARGS, (char *)"\n"
+               "cvComposeRT(CvMat _rvec1, CvMat _tvec1, CvMat _rvec2, CvMat _tvec2, \n"
+               "    CvMat _rvec3, CvMat _tvec3, CvMat dr3dr1 = None, \n"
+               "    CvMat dr3dt1 = None, CvMat dr3dr2 = None, \n"
+               "    CvMat dr3dt2 = None, CvMat dt3dr1 = None, \n"
+               "    CvMat dt3dt1 = None, CvMat dt3dr2 = None, \n"
+               "    CvMat dt3dt2 = None)\n"
+               ""},
+        { (char *)"cvProjectPoints2", _wrap_cvProjectPoints2, METH_VARARGS, (char *)"\n"
+               "cvProjectPoints2(CvMat object_points, CvMat rotation_vector, CvMat translation_vector, \n"
+               "    CvMat camera_matrix, CvMat distortion_coeffs, \n"
+               "    CvMat image_points, CvMat dpdrot = None, \n"
+               "    CvMat dpdt = None, CvMat dpdf = None, \n"
+               "    CvMat dpdc = None, CvMat dpddist = None, \n"
+               "    double aspect_ratio = 0)\n"
+               ""},
+        { (char *)"cvFindExtrinsicCameraParams2", _wrap_cvFindExtrinsicCameraParams2, METH_VARARGS, (char *)"\n"
+               "cvFindExtrinsicCameraParams2(CvMat object_points, CvMat image_points, CvMat camera_matrix, \n"
+               "    CvMat distortion_coeffs, CvMat rotation_vector, \n"
+               "    CvMat translation_vector, int use_extrinsic_guess = 0)\n"
+               ""},
+        { (char *)"cvInitIntrinsicParams2D", _wrap_cvInitIntrinsicParams2D, METH_VARARGS, (char *)"\n"
+               "cvInitIntrinsicParams2D(CvMat object_points, CvMat image_points, CvMat npoints, \n"
+               "    CvSize image_size, CvMat camera_matrix, \n"
+               "    double aspect_ratio = 1.)\n"
+               ""},
+        { (char *)"cvFindChessboardCorners", _wrap_cvFindChessboardCorners, METH_VARARGS, (char *)"cvFindChessboardCorners(void image, CvSize pattern_size, int flags = 1+2) -> int"},
+        { (char *)"cvDrawChessboardCorners", _wrap_cvDrawChessboardCorners, METH_VARARGS, (char *)"\n"
+               "cvDrawChessboardCorners(CvArr image, CvSize pattern_size, CvPoint2D32f corners, \n"
+               "    int pattern_was_found)\n"
+               ""},
+        { (char *)"cvCalibrateCamera2", _wrap_cvCalibrateCamera2, METH_VARARGS, (char *)"\n"
+               "cvCalibrateCamera2(CvMat object_points, CvMat image_points, CvMat point_counts, \n"
+               "    CvSize image_size, CvMat camera_matrix, \n"
+               "    CvMat distortion_coeffs, CvMat rotation_vectors = None, \n"
+               "    CvMat translation_vectors = None, \n"
+               "    int flags = 0)\n"
+               ""},
+        { (char *)"cvCalibrationMatrixValues", _wrap_cvCalibrationMatrixValues, METH_VARARGS, (char *)"\n"
+               "cvCalibrationMatrixValues(CvMat camera_matrix, CvSize image_size, double aperture_width = 0, \n"
+               "    double aperture_height = 0, double fovx = None, \n"
+               "    double fovy = None, double focal_length = None, \n"
+               "    CvPoint2D64f principal_point = None, \n"
+               "    double pixel_aspect_ratio = None)\n"
+               ""},
+        { (char *)"cvStereoCalibrate", _wrap_cvStereoCalibrate, METH_VARARGS, (char *)"\n"
+               "cvStereoCalibrate(CvMat object_points, CvMat image_points1, CvMat image_points2, \n"
+               "    CvMat npoints, CvMat camera_matrix1, \n"
+               "    CvMat dist_coeffs1, CvMat camera_matrix2, \n"
+               "    CvMat dist_coeffs2, CvSize image_size, CvMat R, \n"
+               "    CvMat T, CvMat E = None, CvMat F = None, \n"
+               "    CvTermCriteria term_crit = cvTermCriteria( 1 +2,30,1e-6), \n"
+               "    int flags = 256)\n"
+               ""},
+        { (char *)"cvStereoRectify", _wrap_cvStereoRectify, METH_VARARGS, (char *)"\n"
+               "cvStereoRectify(CvMat camera_matrix1, CvMat camera_matrix2, CvMat dist_coeffs1, \n"
+               "    CvMat dist_coeffs2, CvSize image_size, \n"
+               "    CvMat R, CvMat T, CvMat R1, CvMat R2, \n"
+               "    CvMat P1, CvMat P2, CvMat Q = None, int flags = 1024)\n"
+               ""},
+        { (char *)"cvStereoRectifyUncalibrated", _wrap_cvStereoRectifyUncalibrated, METH_VARARGS, (char *)"\n"
+               "cvStereoRectifyUncalibrated(CvMat points1, CvMat points2, CvMat F, CvSize img_size, \n"
+               "    CvMat H1, CvMat H2, double threshold = 5) -> int\n"
+               ""},
+        { (char *)"cvCreatePOSITObject", _wrap_cvCreatePOSITObject, METH_VARARGS, (char *)"cvCreatePOSITObject(CvPoint3D32f points, int point_count) -> CvPOSITObject"},
+        { (char *)"cvPOSIT", _wrap_cvPOSIT, METH_VARARGS, (char *)"\n"
+               "cvPOSIT(CvPOSITObject posit_object, CvPoint2D32f image_points, \n"
+               "    double focal_length, CvTermCriteria criteria, \n"
+               "    CvMatr32f rotation_matrix, CvVect32f translation_vector)\n"
+               ""},
+        { (char *)"cvReleasePOSITObject", _wrap_cvReleasePOSITObject, METH_VARARGS, (char *)"cvReleasePOSITObject(CvPOSITObject posit_object)"},
+        { (char *)"cvRANSACUpdateNumIters", _wrap_cvRANSACUpdateNumIters, METH_VARARGS, (char *)"cvRANSACUpdateNumIters(double p, double err_prob, int model_points, int max_iters) -> int"},
+        { (char *)"cvConvertPointsHomogeneous", _wrap_cvConvertPointsHomogeneous, METH_VARARGS, (char *)"cvConvertPointsHomogeneous(CvMat src, CvMat dst)"},
+        { (char *)"cvFindFundamentalMat", _wrap_cvFindFundamentalMat, METH_VARARGS, (char *)"\n"
+               "cvFindFundamentalMat(CvMat points1, CvMat points2, CvMat fundamental_matrix, \n"
+               "    int method = 8, double param1 = 3., double param2 = 0.99, \n"
+               "    CvMat status = None) -> int\n"
+               ""},
+        { (char *)"cvComputeCorrespondEpilines", _wrap_cvComputeCorrespondEpilines, METH_VARARGS, (char *)"\n"
+               "cvComputeCorrespondEpilines(CvMat points, int which_image, CvMat fundamental_matrix, \n"
+               "    CvMat correspondent_lines)\n"
+               ""},
+        { (char *)"cvTriangulatePoints", _wrap_cvTriangulatePoints, METH_VARARGS, (char *)"\n"
+               "cvTriangulatePoints(CvMat projMatr1, CvMat projMatr2, CvMat projPoints1, \n"
+               "    CvMat projPoints2, CvMat points4D)\n"
+               ""},
+        { (char *)"cvCorrectMatches", _wrap_cvCorrectMatches, METH_VARARGS, (char *)"\n"
+               "cvCorrectMatches(CvMat F, CvMat points1, CvMat points2, CvMat new_points1, \n"
+               "    CvMat new_points2)\n"
+               ""},
+        { (char *)"CvStereoBMState_preFilterType_set", _wrap_CvStereoBMState_preFilterType_set, METH_VARARGS, (char *)"CvStereoBMState_preFilterType_set(CvStereoBMState self, int preFilterType)"},
+        { (char *)"CvStereoBMState_preFilterType_get", _wrap_CvStereoBMState_preFilterType_get, METH_VARARGS, (char *)"CvStereoBMState_preFilterType_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_preFilterSize_set", _wrap_CvStereoBMState_preFilterSize_set, METH_VARARGS, (char *)"CvStereoBMState_preFilterSize_set(CvStereoBMState self, int preFilterSize)"},
+        { (char *)"CvStereoBMState_preFilterSize_get", _wrap_CvStereoBMState_preFilterSize_get, METH_VARARGS, (char *)"CvStereoBMState_preFilterSize_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_preFilterCap_set", _wrap_CvStereoBMState_preFilterCap_set, METH_VARARGS, (char *)"CvStereoBMState_preFilterCap_set(CvStereoBMState self, int preFilterCap)"},
+        { (char *)"CvStereoBMState_preFilterCap_get", _wrap_CvStereoBMState_preFilterCap_get, METH_VARARGS, (char *)"CvStereoBMState_preFilterCap_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_SADWindowSize_set", _wrap_CvStereoBMState_SADWindowSize_set, METH_VARARGS, (char *)"CvStereoBMState_SADWindowSize_set(CvStereoBMState self, int SADWindowSize)"},
+        { (char *)"CvStereoBMState_SADWindowSize_get", _wrap_CvStereoBMState_SADWindowSize_get, METH_VARARGS, (char *)"CvStereoBMState_SADWindowSize_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_minDisparity_set", _wrap_CvStereoBMState_minDisparity_set, METH_VARARGS, (char *)"CvStereoBMState_minDisparity_set(CvStereoBMState self, int minDisparity)"},
+        { (char *)"CvStereoBMState_minDisparity_get", _wrap_CvStereoBMState_minDisparity_get, METH_VARARGS, (char *)"CvStereoBMState_minDisparity_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_numberOfDisparities_set", _wrap_CvStereoBMState_numberOfDisparities_set, METH_VARARGS, (char *)"CvStereoBMState_numberOfDisparities_set(CvStereoBMState self, int numberOfDisparities)"},
+        { (char *)"CvStereoBMState_numberOfDisparities_get", _wrap_CvStereoBMState_numberOfDisparities_get, METH_VARARGS, (char *)"CvStereoBMState_numberOfDisparities_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_textureThreshold_set", _wrap_CvStereoBMState_textureThreshold_set, METH_VARARGS, (char *)"CvStereoBMState_textureThreshold_set(CvStereoBMState self, int textureThreshold)"},
+        { (char *)"CvStereoBMState_textureThreshold_get", _wrap_CvStereoBMState_textureThreshold_get, METH_VARARGS, (char *)"CvStereoBMState_textureThreshold_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_uniquenessRatio_set", _wrap_CvStereoBMState_uniquenessRatio_set, METH_VARARGS, (char *)"CvStereoBMState_uniquenessRatio_set(CvStereoBMState self, int uniquenessRatio)"},
+        { (char *)"CvStereoBMState_uniquenessRatio_get", _wrap_CvStereoBMState_uniquenessRatio_get, METH_VARARGS, (char *)"CvStereoBMState_uniquenessRatio_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_speckleWindowSize_set", _wrap_CvStereoBMState_speckleWindowSize_set, METH_VARARGS, (char *)"CvStereoBMState_speckleWindowSize_set(CvStereoBMState self, int speckleWindowSize)"},
+        { (char *)"CvStereoBMState_speckleWindowSize_get", _wrap_CvStereoBMState_speckleWindowSize_get, METH_VARARGS, (char *)"CvStereoBMState_speckleWindowSize_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_speckleRange_set", _wrap_CvStereoBMState_speckleRange_set, METH_VARARGS, (char *)"CvStereoBMState_speckleRange_set(CvStereoBMState self, int speckleRange)"},
+        { (char *)"CvStereoBMState_speckleRange_get", _wrap_CvStereoBMState_speckleRange_get, METH_VARARGS, (char *)"CvStereoBMState_speckleRange_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_trySmallerWindows_set", _wrap_CvStereoBMState_trySmallerWindows_set, METH_VARARGS, (char *)"CvStereoBMState_trySmallerWindows_set(CvStereoBMState self, int trySmallerWindows)"},
+        { (char *)"CvStereoBMState_trySmallerWindows_get", _wrap_CvStereoBMState_trySmallerWindows_get, METH_VARARGS, (char *)"CvStereoBMState_trySmallerWindows_get(CvStereoBMState self) -> int"},
+        { (char *)"CvStereoBMState_preFilteredImg0_set", _wrap_CvStereoBMState_preFilteredImg0_set, METH_VARARGS, (char *)"CvStereoBMState_preFilteredImg0_set(CvStereoBMState self, CvMat preFilteredImg0)"},
+        { (char *)"CvStereoBMState_preFilteredImg0_get", _wrap_CvStereoBMState_preFilteredImg0_get, METH_VARARGS, (char *)"CvStereoBMState_preFilteredImg0_get(CvStereoBMState self) -> CvMat"},
+        { (char *)"CvStereoBMState_preFilteredImg1_set", _wrap_CvStereoBMState_preFilteredImg1_set, METH_VARARGS, (char *)"CvStereoBMState_preFilteredImg1_set(CvStereoBMState self, CvMat preFilteredImg1)"},
+        { (char *)"CvStereoBMState_preFilteredImg1_get", _wrap_CvStereoBMState_preFilteredImg1_get, METH_VARARGS, (char *)"CvStereoBMState_preFilteredImg1_get(CvStereoBMState self) -> CvMat"},
+        { (char *)"CvStereoBMState_slidingSumBuf_set", _wrap_CvStereoBMState_slidingSumBuf_set, METH_VARARGS, (char *)"CvStereoBMState_slidingSumBuf_set(CvStereoBMState self, CvMat slidingSumBuf)"},
+        { (char *)"CvStereoBMState_slidingSumBuf_get", _wrap_CvStereoBMState_slidingSumBuf_get, METH_VARARGS, (char *)"CvStereoBMState_slidingSumBuf_get(CvStereoBMState self) -> CvMat"},
+        { (char *)"CvStereoBMState_dbmin_set", _wrap_CvStereoBMState_dbmin_set, METH_VARARGS, (char *)"CvStereoBMState_dbmin_set(CvStereoBMState self, CvMat dbmin)"},
+        { (char *)"CvStereoBMState_dbmin_get", _wrap_CvStereoBMState_dbmin_get, METH_VARARGS, (char *)"CvStereoBMState_dbmin_get(CvStereoBMState self) -> CvMat"},
+        { (char *)"CvStereoBMState_dbmax_set", _wrap_CvStereoBMState_dbmax_set, METH_VARARGS, (char *)"CvStereoBMState_dbmax_set(CvStereoBMState self, CvMat dbmax)"},
+        { (char *)"CvStereoBMState_dbmax_get", _wrap_CvStereoBMState_dbmax_get, METH_VARARGS, (char *)"CvStereoBMState_dbmax_get(CvStereoBMState self) -> CvMat"},
+        { (char *)"new_CvStereoBMState", _wrap_new_CvStereoBMState, METH_VARARGS, (char *)"new_CvStereoBMState() -> CvStereoBMState"},
+        { (char *)"delete_CvStereoBMState", _wrap_delete_CvStereoBMState, METH_VARARGS, (char *)"delete_CvStereoBMState(CvStereoBMState self)"},
         { (char *)"CvStereoBMState_swigregister", CvStereoBMState_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvCreateStereoBMState", _wrap_cvCreateStereoBMState, METH_VARARGS, NULL},
-        { (char *)"cvReleaseStereoBMState", _wrap_cvReleaseStereoBMState, METH_VARARGS, NULL},
-        { (char *)"cvFindStereoCorrespondenceBM", _wrap_cvFindStereoCorrespondenceBM, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_Ithreshold_set", _wrap_CvStereoGCState_Ithreshold_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_Ithreshold_get", _wrap_CvStereoGCState_Ithreshold_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_interactionRadius_set", _wrap_CvStereoGCState_interactionRadius_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_interactionRadius_get", _wrap_CvStereoGCState_interactionRadius_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_K_set", _wrap_CvStereoGCState_K_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_K_get", _wrap_CvStereoGCState_K_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState__lambda_set", _wrap_CvStereoGCState__lambda_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState__lambda_get", _wrap_CvStereoGCState__lambda_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_lambda1_set", _wrap_CvStereoGCState_lambda1_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_lambda1_get", _wrap_CvStereoGCState_lambda1_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_lambda2_set", _wrap_CvStereoGCState_lambda2_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_lambda2_get", _wrap_CvStereoGCState_lambda2_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_occlusionCost_set", _wrap_CvStereoGCState_occlusionCost_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_occlusionCost_get", _wrap_CvStereoGCState_occlusionCost_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_minDisparity_set", _wrap_CvStereoGCState_minDisparity_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_minDisparity_get", _wrap_CvStereoGCState_minDisparity_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_numberOfDisparities_set", _wrap_CvStereoGCState_numberOfDisparities_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_numberOfDisparities_get", _wrap_CvStereoGCState_numberOfDisparities_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_maxIters_set", _wrap_CvStereoGCState_maxIters_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_maxIters_get", _wrap_CvStereoGCState_maxIters_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_left_set", _wrap_CvStereoGCState_left_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_left_get", _wrap_CvStereoGCState_left_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_right_set", _wrap_CvStereoGCState_right_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_right_get", _wrap_CvStereoGCState_right_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_dispLeft_set", _wrap_CvStereoGCState_dispLeft_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_dispLeft_get", _wrap_CvStereoGCState_dispLeft_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_dispRight_set", _wrap_CvStereoGCState_dispRight_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_dispRight_get", _wrap_CvStereoGCState_dispRight_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_ptrLeft_set", _wrap_CvStereoGCState_ptrLeft_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_ptrLeft_get", _wrap_CvStereoGCState_ptrLeft_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_ptrRight_set", _wrap_CvStereoGCState_ptrRight_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_ptrRight_get", _wrap_CvStereoGCState_ptrRight_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_vtxBuf_set", _wrap_CvStereoGCState_vtxBuf_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_vtxBuf_get", _wrap_CvStereoGCState_vtxBuf_get, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_edgeBuf_set", _wrap_CvStereoGCState_edgeBuf_set, METH_VARARGS, NULL},
-        { (char *)"CvStereoGCState_edgeBuf_get", _wrap_CvStereoGCState_edgeBuf_get, METH_VARARGS, NULL},
-        { (char *)"new_CvStereoGCState", _wrap_new_CvStereoGCState, METH_VARARGS, NULL},
-        { (char *)"delete_CvStereoGCState", _wrap_delete_CvStereoGCState, METH_VARARGS, NULL},
+        { (char *)"cvCreateStereoBMState", _wrap_cvCreateStereoBMState, METH_VARARGS, (char *)"cvCreateStereoBMState(int preset = 0, int numberOfDisparities = 0) -> CvStereoBMState"},
+        { (char *)"cvReleaseStereoBMState", _wrap_cvReleaseStereoBMState, METH_VARARGS, (char *)"cvReleaseStereoBMState(CvStereoBMState state)"},
+        { (char *)"cvFindStereoCorrespondenceBM", _wrap_cvFindStereoCorrespondenceBM, METH_VARARGS, (char *)"cvFindStereoCorrespondenceBM(CvArr left, CvArr right, CvArr disparity, CvStereoBMState state)"},
+        { (char *)"CvStereoGCState_Ithreshold_set", _wrap_CvStereoGCState_Ithreshold_set, METH_VARARGS, (char *)"CvStereoGCState_Ithreshold_set(CvStereoGCState self, int Ithreshold)"},
+        { (char *)"CvStereoGCState_Ithreshold_get", _wrap_CvStereoGCState_Ithreshold_get, METH_VARARGS, (char *)"CvStereoGCState_Ithreshold_get(CvStereoGCState self) -> int"},
+        { (char *)"CvStereoGCState_interactionRadius_set", _wrap_CvStereoGCState_interactionRadius_set, METH_VARARGS, (char *)"CvStereoGCState_interactionRadius_set(CvStereoGCState self, int interactionRadius)"},
+        { (char *)"CvStereoGCState_interactionRadius_get", _wrap_CvStereoGCState_interactionRadius_get, METH_VARARGS, (char *)"CvStereoGCState_interactionRadius_get(CvStereoGCState self) -> int"},
+        { (char *)"CvStereoGCState_K_set", _wrap_CvStereoGCState_K_set, METH_VARARGS, (char *)"CvStereoGCState_K_set(CvStereoGCState self, float K)"},
+        { (char *)"CvStereoGCState_K_get", _wrap_CvStereoGCState_K_get, METH_VARARGS, (char *)"CvStereoGCState_K_get(CvStereoGCState self) -> float"},
+        { (char *)"CvStereoGCState__lambda_set", _wrap_CvStereoGCState__lambda_set, METH_VARARGS, (char *)"CvStereoGCState__lambda_set(CvStereoGCState self, float _lambda)"},
+        { (char *)"CvStereoGCState__lambda_get", _wrap_CvStereoGCState__lambda_get, METH_VARARGS, (char *)"CvStereoGCState__lambda_get(CvStereoGCState self) -> float"},
+        { (char *)"CvStereoGCState_lambda1_set", _wrap_CvStereoGCState_lambda1_set, METH_VARARGS, (char *)"CvStereoGCState_lambda1_set(CvStereoGCState self, float lambda1)"},
+        { (char *)"CvStereoGCState_lambda1_get", _wrap_CvStereoGCState_lambda1_get, METH_VARARGS, (char *)"CvStereoGCState_lambda1_get(CvStereoGCState self) -> float"},
+        { (char *)"CvStereoGCState_lambda2_set", _wrap_CvStereoGCState_lambda2_set, METH_VARARGS, (char *)"CvStereoGCState_lambda2_set(CvStereoGCState self, float lambda2)"},
+        { (char *)"CvStereoGCState_lambda2_get", _wrap_CvStereoGCState_lambda2_get, METH_VARARGS, (char *)"CvStereoGCState_lambda2_get(CvStereoGCState self) -> float"},
+        { (char *)"CvStereoGCState_occlusionCost_set", _wrap_CvStereoGCState_occlusionCost_set, METH_VARARGS, (char *)"CvStereoGCState_occlusionCost_set(CvStereoGCState self, int occlusionCost)"},
+        { (char *)"CvStereoGCState_occlusionCost_get", _wrap_CvStereoGCState_occlusionCost_get, METH_VARARGS, (char *)"CvStereoGCState_occlusionCost_get(CvStereoGCState self) -> int"},
+        { (char *)"CvStereoGCState_minDisparity_set", _wrap_CvStereoGCState_minDisparity_set, METH_VARARGS, (char *)"CvStereoGCState_minDisparity_set(CvStereoGCState self, int minDisparity)"},
+        { (char *)"CvStereoGCState_minDisparity_get", _wrap_CvStereoGCState_minDisparity_get, METH_VARARGS, (char *)"CvStereoGCState_minDisparity_get(CvStereoGCState self) -> int"},
+        { (char *)"CvStereoGCState_numberOfDisparities_set", _wrap_CvStereoGCState_numberOfDisparities_set, METH_VARARGS, (char *)"CvStereoGCState_numberOfDisparities_set(CvStereoGCState self, int numberOfDisparities)"},
+        { (char *)"CvStereoGCState_numberOfDisparities_get", _wrap_CvStereoGCState_numberOfDisparities_get, METH_VARARGS, (char *)"CvStereoGCState_numberOfDisparities_get(CvStereoGCState self) -> int"},
+        { (char *)"CvStereoGCState_maxIters_set", _wrap_CvStereoGCState_maxIters_set, METH_VARARGS, (char *)"CvStereoGCState_maxIters_set(CvStereoGCState self, int maxIters)"},
+        { (char *)"CvStereoGCState_maxIters_get", _wrap_CvStereoGCState_maxIters_get, METH_VARARGS, (char *)"CvStereoGCState_maxIters_get(CvStereoGCState self) -> int"},
+        { (char *)"CvStereoGCState_left_set", _wrap_CvStereoGCState_left_set, METH_VARARGS, (char *)"CvStereoGCState_left_set(CvStereoGCState self, CvMat left)"},
+        { (char *)"CvStereoGCState_left_get", _wrap_CvStereoGCState_left_get, METH_VARARGS, (char *)"CvStereoGCState_left_get(CvStereoGCState self) -> CvMat"},
+        { (char *)"CvStereoGCState_right_set", _wrap_CvStereoGCState_right_set, METH_VARARGS, (char *)"CvStereoGCState_right_set(CvStereoGCState self, CvMat right)"},
+        { (char *)"CvStereoGCState_right_get", _wrap_CvStereoGCState_right_get, METH_VARARGS, (char *)"CvStereoGCState_right_get(CvStereoGCState self) -> CvMat"},
+        { (char *)"CvStereoGCState_dispLeft_set", _wrap_CvStereoGCState_dispLeft_set, METH_VARARGS, (char *)"CvStereoGCState_dispLeft_set(CvStereoGCState self, CvMat dispLeft)"},
+        { (char *)"CvStereoGCState_dispLeft_get", _wrap_CvStereoGCState_dispLeft_get, METH_VARARGS, (char *)"CvStereoGCState_dispLeft_get(CvStereoGCState self) -> CvMat"},
+        { (char *)"CvStereoGCState_dispRight_set", _wrap_CvStereoGCState_dispRight_set, METH_VARARGS, (char *)"CvStereoGCState_dispRight_set(CvStereoGCState self, CvMat dispRight)"},
+        { (char *)"CvStereoGCState_dispRight_get", _wrap_CvStereoGCState_dispRight_get, METH_VARARGS, (char *)"CvStereoGCState_dispRight_get(CvStereoGCState self) -> CvMat"},
+        { (char *)"CvStereoGCState_ptrLeft_set", _wrap_CvStereoGCState_ptrLeft_set, METH_VARARGS, (char *)"CvStereoGCState_ptrLeft_set(CvStereoGCState self, CvMat ptrLeft)"},
+        { (char *)"CvStereoGCState_ptrLeft_get", _wrap_CvStereoGCState_ptrLeft_get, METH_VARARGS, (char *)"CvStereoGCState_ptrLeft_get(CvStereoGCState self) -> CvMat"},
+        { (char *)"CvStereoGCState_ptrRight_set", _wrap_CvStereoGCState_ptrRight_set, METH_VARARGS, (char *)"CvStereoGCState_ptrRight_set(CvStereoGCState self, CvMat ptrRight)"},
+        { (char *)"CvStereoGCState_ptrRight_get", _wrap_CvStereoGCState_ptrRight_get, METH_VARARGS, (char *)"CvStereoGCState_ptrRight_get(CvStereoGCState self) -> CvMat"},
+        { (char *)"CvStereoGCState_vtxBuf_set", _wrap_CvStereoGCState_vtxBuf_set, METH_VARARGS, (char *)"CvStereoGCState_vtxBuf_set(CvStereoGCState self, CvMat vtxBuf)"},
+        { (char *)"CvStereoGCState_vtxBuf_get", _wrap_CvStereoGCState_vtxBuf_get, METH_VARARGS, (char *)"CvStereoGCState_vtxBuf_get(CvStereoGCState self) -> CvMat"},
+        { (char *)"CvStereoGCState_edgeBuf_set", _wrap_CvStereoGCState_edgeBuf_set, METH_VARARGS, (char *)"CvStereoGCState_edgeBuf_set(CvStereoGCState self, CvMat edgeBuf)"},
+        { (char *)"CvStereoGCState_edgeBuf_get", _wrap_CvStereoGCState_edgeBuf_get, METH_VARARGS, (char *)"CvStereoGCState_edgeBuf_get(CvStereoGCState self) -> CvMat"},
+        { (char *)"new_CvStereoGCState", _wrap_new_CvStereoGCState, METH_VARARGS, (char *)"new_CvStereoGCState() -> CvStereoGCState"},
+        { (char *)"delete_CvStereoGCState", _wrap_delete_CvStereoGCState, METH_VARARGS, (char *)"delete_CvStereoGCState(CvStereoGCState self)"},
         { (char *)"CvStereoGCState_swigregister", CvStereoGCState_swigregister, METH_VARARGS, NULL},
-        { (char *)"cvCreateStereoGCState", _wrap_cvCreateStereoGCState, METH_VARARGS, NULL},
-        { (char *)"cvReleaseStereoGCState", _wrap_cvReleaseStereoGCState, METH_VARARGS, NULL},
-        { (char *)"cvFindStereoCorrespondenceGC", _wrap_cvFindStereoCorrespondenceGC, METH_VARARGS, NULL},
-        { (char *)"cvReprojectImageTo3D", _wrap_cvReprojectImageTo3D, METH_VARARGS, NULL},
-        { (char *)"delete_CvLSH", _wrap_delete_CvLSH, METH_VARARGS, NULL},
+        { (char *)"cvCreateStereoGCState", _wrap_cvCreateStereoGCState, METH_VARARGS, (char *)"cvCreateStereoGCState(int numberOfDisparities, int maxIters) -> CvStereoGCState"},
+        { (char *)"cvReleaseStereoGCState", _wrap_cvReleaseStereoGCState, METH_VARARGS, (char *)"cvReleaseStereoGCState(CvStereoGCState state)"},
+        { (char *)"cvFindStereoCorrespondenceGC", _wrap_cvFindStereoCorrespondenceGC, METH_VARARGS, (char *)"\n"
+               "cvFindStereoCorrespondenceGC(CvArr left, CvArr right, CvArr disparityLeft, CvArr disparityRight, \n"
+               "    CvStereoGCState state, int useDisparityGuess = 0)\n"
+               ""},
+        { (char *)"cvReprojectImageTo3D", _wrap_cvReprojectImageTo3D, METH_VARARGS, (char *)"cvReprojectImageTo3D(CvArr disparityImage, CvArr _3dImage, CvMat Q, int handleMissingValues = 0)"},
+        { (char *)"delete_CvLSH", _wrap_delete_CvLSH, METH_VARARGS, (char *)"delete_CvLSH(CvLSH self)"},
         { (char *)"CvLSH_swigregister", CvLSH_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvTuple_CvPoint_2_val_set", _wrap_CvTuple_CvPoint_2_val_set, METH_VARARGS, NULL},
-        { (char *)"CvTuple_CvPoint_2_val_get", _wrap_CvTuple_CvPoint_2_val_get, METH_VARARGS, NULL},
-        { (char *)"CvTuple_CvPoint_2___setitem__", _wrap_CvTuple_CvPoint_2___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvTuple_CvPoint_2___getitem__", _wrap_CvTuple_CvPoint_2___getitem__, METH_VARARGS, NULL},
-        { (char *)"new_CvTuple_CvPoint_2", _wrap_new_CvTuple_CvPoint_2, METH_VARARGS, NULL},
-        { (char *)"delete_CvTuple_CvPoint_2", _wrap_delete_CvTuple_CvPoint_2, METH_VARARGS, NULL},
+        { (char *)"CvTuple_CvPoint_2_val_set", _wrap_CvTuple_CvPoint_2_val_set, METH_VARARGS, (char *)"CvTuple_CvPoint_2_val_set(CvTuple_CvPoint_2 self, CvPoint val)"},
+        { (char *)"CvTuple_CvPoint_2_val_get", _wrap_CvTuple_CvPoint_2_val_get, METH_VARARGS, (char *)"CvTuple_CvPoint_2_val_get(CvTuple_CvPoint_2 self) -> CvPoint"},
+        { (char *)"CvTuple_CvPoint_2___setitem__", _wrap_CvTuple_CvPoint_2___setitem__, METH_VARARGS, (char *)"CvTuple_CvPoint_2___setitem__(CvTuple_CvPoint_2 self, int i, CvPoint obj)"},
+        { (char *)"CvTuple_CvPoint_2___getitem__", _wrap_CvTuple_CvPoint_2___getitem__, METH_VARARGS, (char *)"CvTuple_CvPoint_2___getitem__(CvTuple_CvPoint_2 self, int i) -> CvPoint"},
+        { (char *)"new_CvTuple_CvPoint_2", _wrap_new_CvTuple_CvPoint_2, METH_VARARGS, (char *)"new_CvTuple_CvPoint_2() -> CvTuple_CvPoint_2"},
+        { (char *)"delete_CvTuple_CvPoint_2", _wrap_delete_CvTuple_CvPoint_2, METH_VARARGS, (char *)"delete_CvTuple_CvPoint_2(CvTuple_CvPoint_2 self)"},
         { (char *)"CvTuple_CvPoint_2_swigregister", CvTuple_CvPoint_2_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvTuple_float_2_val_set", _wrap_CvTuple_float_2_val_set, METH_VARARGS, NULL},
-        { (char *)"CvTuple_float_2_val_get", _wrap_CvTuple_float_2_val_get, METH_VARARGS, NULL},
-        { (char *)"CvTuple_float_2___setitem__", _wrap_CvTuple_float_2___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvTuple_float_2___getitem__", _wrap_CvTuple_float_2___getitem__, METH_VARARGS, NULL},
-        { (char *)"new_CvTuple_float_2", _wrap_new_CvTuple_float_2, METH_VARARGS, NULL},
-        { (char *)"delete_CvTuple_float_2", _wrap_delete_CvTuple_float_2, METH_VARARGS, NULL},
+        { (char *)"CvTuple_float_2_val_set", _wrap_CvTuple_float_2_val_set, METH_VARARGS, (char *)"CvTuple_float_2_val_set(CvTuple_float_2 self, float val)"},
+        { (char *)"CvTuple_float_2_val_get", _wrap_CvTuple_float_2_val_get, METH_VARARGS, (char *)"CvTuple_float_2_val_get(CvTuple_float_2 self) -> float"},
+        { (char *)"CvTuple_float_2___setitem__", _wrap_CvTuple_float_2___setitem__, METH_VARARGS, (char *)"CvTuple_float_2___setitem__(CvTuple_float_2 self, int i, float obj)"},
+        { (char *)"CvTuple_float_2___getitem__", _wrap_CvTuple_float_2___getitem__, METH_VARARGS, (char *)"CvTuple_float_2___getitem__(CvTuple_float_2 self, int i) -> float"},
+        { (char *)"new_CvTuple_float_2", _wrap_new_CvTuple_float_2, METH_VARARGS, (char *)"new_CvTuple_float_2() -> CvTuple_float_2"},
+        { (char *)"delete_CvTuple_float_2", _wrap_delete_CvTuple_float_2, METH_VARARGS, (char *)"delete_CvTuple_float_2(CvTuple_float_2 self)"},
         { (char *)"CvTuple_float_2_swigregister", CvTuple_float_2_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvTuple_float_3_val_set", _wrap_CvTuple_float_3_val_set, METH_VARARGS, NULL},
-        { (char *)"CvTuple_float_3_val_get", _wrap_CvTuple_float_3_val_get, METH_VARARGS, NULL},
-        { (char *)"CvTuple_float_3___setitem__", _wrap_CvTuple_float_3___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvTuple_float_3___getitem__", _wrap_CvTuple_float_3___getitem__, METH_VARARGS, NULL},
-        { (char *)"new_CvTuple_float_3", _wrap_new_CvTuple_float_3, METH_VARARGS, NULL},
-        { (char *)"delete_CvTuple_float_3", _wrap_delete_CvTuple_float_3, METH_VARARGS, NULL},
+        { (char *)"CvTuple_float_3_val_set", _wrap_CvTuple_float_3_val_set, METH_VARARGS, (char *)"CvTuple_float_3_val_set(CvTuple_float_3 self, float val)"},
+        { (char *)"CvTuple_float_3_val_get", _wrap_CvTuple_float_3_val_get, METH_VARARGS, (char *)"CvTuple_float_3_val_get(CvTuple_float_3 self) -> float"},
+        { (char *)"CvTuple_float_3___setitem__", _wrap_CvTuple_float_3___setitem__, METH_VARARGS, (char *)"CvTuple_float_3___setitem__(CvTuple_float_3 self, int i, float obj)"},
+        { (char *)"CvTuple_float_3___getitem__", _wrap_CvTuple_float_3___getitem__, METH_VARARGS, (char *)"CvTuple_float_3___getitem__(CvTuple_float_3 self, int i) -> float"},
+        { (char *)"new_CvTuple_float_3", _wrap_new_CvTuple_float_3, METH_VARARGS, (char *)"new_CvTuple_float_3() -> CvTuple_float_3"},
+        { (char *)"delete_CvTuple_float_3", _wrap_delete_CvTuple_float_3, METH_VARARGS, (char *)"delete_CvTuple_float_3(CvTuple_float_3 self)"},
         { (char *)"CvTuple_float_3_swigregister", CvTuple_float_3_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint_cast", _wrap_CvSeq_CvPoint_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint___getitem__", _wrap_CvSeq_CvPoint___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint___setitem__", _wrap_CvSeq_CvPoint___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint_append", _wrap_CvSeq_CvPoint_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint_pop", _wrap_CvSeq_CvPoint_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_CvPoint", _wrap_new_CvSeq_CvPoint, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_CvPoint", _wrap_delete_CvSeq_CvPoint, METH_VARARGS, NULL},
+        { (char *)"CvSeq_CvPoint_cast", _wrap_CvSeq_CvPoint_cast, METH_VARARGS, (char *)"CvSeq_CvPoint_cast(CvSeq seq) -> CvSeq_CvPoint"},
+        { (char *)"CvSeq_CvPoint___getitem__", _wrap_CvSeq_CvPoint___getitem__, METH_VARARGS, (char *)"CvSeq_CvPoint___getitem__(CvSeq_CvPoint self, int i) -> CvPoint"},
+        { (char *)"CvSeq_CvPoint___setitem__", _wrap_CvSeq_CvPoint___setitem__, METH_VARARGS, (char *)"CvSeq_CvPoint___setitem__(CvSeq_CvPoint self, int i, CvPoint obj)"},
+        { (char *)"CvSeq_CvPoint_append", _wrap_CvSeq_CvPoint_append, METH_VARARGS, (char *)"CvSeq_CvPoint_append(CvSeq_CvPoint self, CvPoint obj)"},
+        { (char *)"CvSeq_CvPoint_pop", _wrap_CvSeq_CvPoint_pop, METH_VARARGS, (char *)"CvSeq_CvPoint_pop(CvSeq_CvPoint self) -> CvPoint"},
+        { (char *)"new_CvSeq_CvPoint", _wrap_new_CvSeq_CvPoint, METH_VARARGS, (char *)"new_CvSeq_CvPoint() -> CvSeq_CvPoint"},
+        { (char *)"delete_CvSeq_CvPoint", _wrap_delete_CvSeq_CvPoint, METH_VARARGS, (char *)"delete_CvSeq_CvPoint(CvSeq_CvPoint self)"},
         { (char *)"CvSeq_CvPoint_swigregister", CvSeq_CvPoint_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint2D32f_cast", _wrap_CvSeq_CvPoint2D32f_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint2D32f___getitem__", _wrap_CvSeq_CvPoint2D32f___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint2D32f___setitem__", _wrap_CvSeq_CvPoint2D32f___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint2D32f_append", _wrap_CvSeq_CvPoint2D32f_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint2D32f_pop", _wrap_CvSeq_CvPoint2D32f_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_CvPoint2D32f", _wrap_new_CvSeq_CvPoint2D32f, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_CvPoint2D32f", _wrap_delete_CvSeq_CvPoint2D32f, METH_VARARGS, NULL},
+        { (char *)"CvSeq_CvPoint2D32f_cast", _wrap_CvSeq_CvPoint2D32f_cast, METH_VARARGS, (char *)"CvSeq_CvPoint2D32f_cast(CvSeq seq) -> CvSeq_CvPoint2D32f"},
+        { (char *)"CvSeq_CvPoint2D32f___getitem__", _wrap_CvSeq_CvPoint2D32f___getitem__, METH_VARARGS, (char *)"CvSeq_CvPoint2D32f___getitem__(CvSeq_CvPoint2D32f self, int i) -> CvPoint2D32f"},
+        { (char *)"CvSeq_CvPoint2D32f___setitem__", _wrap_CvSeq_CvPoint2D32f___setitem__, METH_VARARGS, (char *)"CvSeq_CvPoint2D32f___setitem__(CvSeq_CvPoint2D32f self, int i, CvPoint2D32f obj)"},
+        { (char *)"CvSeq_CvPoint2D32f_append", _wrap_CvSeq_CvPoint2D32f_append, METH_VARARGS, (char *)"CvSeq_CvPoint2D32f_append(CvSeq_CvPoint2D32f self, CvPoint2D32f obj)"},
+        { (char *)"CvSeq_CvPoint2D32f_pop", _wrap_CvSeq_CvPoint2D32f_pop, METH_VARARGS, (char *)"CvSeq_CvPoint2D32f_pop(CvSeq_CvPoint2D32f self) -> CvPoint2D32f"},
+        { (char *)"new_CvSeq_CvPoint2D32f", _wrap_new_CvSeq_CvPoint2D32f, METH_VARARGS, (char *)"new_CvSeq_CvPoint2D32f() -> CvSeq_CvPoint2D32f"},
+        { (char *)"delete_CvSeq_CvPoint2D32f", _wrap_delete_CvSeq_CvPoint2D32f, METH_VARARGS, (char *)"delete_CvSeq_CvPoint2D32f(CvSeq_CvPoint2D32f self)"},
         { (char *)"CvSeq_CvPoint2D32f_swigregister", CvSeq_CvPoint2D32f_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvRect_cast", _wrap_CvSeq_CvRect_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvRect___getitem__", _wrap_CvSeq_CvRect___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvRect___setitem__", _wrap_CvSeq_CvRect___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvRect_append", _wrap_CvSeq_CvRect_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvRect_pop", _wrap_CvSeq_CvRect_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_CvRect", _wrap_new_CvSeq_CvRect, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_CvRect", _wrap_delete_CvSeq_CvRect, METH_VARARGS, NULL},
+        { (char *)"CvSeq_CvRect_cast", _wrap_CvSeq_CvRect_cast, METH_VARARGS, (char *)"CvSeq_CvRect_cast(CvSeq seq) -> CvSeq_CvRect"},
+        { (char *)"CvSeq_CvRect___getitem__", _wrap_CvSeq_CvRect___getitem__, METH_VARARGS, (char *)"CvSeq_CvRect___getitem__(CvSeq_CvRect self, int i) -> CvRect"},
+        { (char *)"CvSeq_CvRect___setitem__", _wrap_CvSeq_CvRect___setitem__, METH_VARARGS, (char *)"CvSeq_CvRect___setitem__(CvSeq_CvRect self, int i, CvRect obj)"},
+        { (char *)"CvSeq_CvRect_append", _wrap_CvSeq_CvRect_append, METH_VARARGS, (char *)"CvSeq_CvRect_append(CvSeq_CvRect self, CvRect obj)"},
+        { (char *)"CvSeq_CvRect_pop", _wrap_CvSeq_CvRect_pop, METH_VARARGS, (char *)"CvSeq_CvRect_pop(CvSeq_CvRect self) -> CvRect"},
+        { (char *)"new_CvSeq_CvRect", _wrap_new_CvSeq_CvRect, METH_VARARGS, (char *)"new_CvSeq_CvRect() -> CvSeq_CvRect"},
+        { (char *)"delete_CvSeq_CvRect", _wrap_delete_CvSeq_CvRect, METH_VARARGS, (char *)"delete_CvSeq_CvRect(CvSeq_CvRect self)"},
         { (char *)"CvSeq_CvRect_swigregister", CvSeq_CvRect_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvSeq_cast", _wrap_CvSeq_CvSeq_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvSeq___getitem__", _wrap_CvSeq_CvSeq___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvSeq___setitem__", _wrap_CvSeq_CvSeq___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvSeq_append", _wrap_CvSeq_CvSeq_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvSeq_pop", _wrap_CvSeq_CvSeq_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_CvSeq", _wrap_new_CvSeq_CvSeq, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_CvSeq", _wrap_delete_CvSeq_CvSeq, METH_VARARGS, NULL},
+        { (char *)"CvSeq_CvSeq_cast", _wrap_CvSeq_CvSeq_cast, METH_VARARGS, (char *)"CvSeq_CvSeq_cast(CvSeq seq) -> CvSeq_CvSeq"},
+        { (char *)"CvSeq_CvSeq___getitem__", _wrap_CvSeq_CvSeq___getitem__, METH_VARARGS, (char *)"CvSeq_CvSeq___getitem__(CvSeq_CvSeq self, int i) -> CvSeq"},
+        { (char *)"CvSeq_CvSeq___setitem__", _wrap_CvSeq_CvSeq___setitem__, METH_VARARGS, (char *)"CvSeq_CvSeq___setitem__(CvSeq_CvSeq self, int i, CvSeq obj)"},
+        { (char *)"CvSeq_CvSeq_append", _wrap_CvSeq_CvSeq_append, METH_VARARGS, (char *)"CvSeq_CvSeq_append(CvSeq_CvSeq self, CvSeq obj)"},
+        { (char *)"CvSeq_CvSeq_pop", _wrap_CvSeq_CvSeq_pop, METH_VARARGS, (char *)"CvSeq_CvSeq_pop(CvSeq_CvSeq self) -> CvSeq"},
+        { (char *)"new_CvSeq_CvSeq", _wrap_new_CvSeq_CvSeq, METH_VARARGS, (char *)"new_CvSeq_CvSeq() -> CvSeq_CvSeq"},
+        { (char *)"delete_CvSeq_CvSeq", _wrap_delete_CvSeq_CvSeq, METH_VARARGS, (char *)"delete_CvSeq_CvSeq(CvSeq_CvSeq self)"},
         { (char *)"CvSeq_CvSeq_swigregister", CvSeq_CvSeq_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvQuadEdge2D_cast", _wrap_CvSeq_CvQuadEdge2D_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvQuadEdge2D___getitem__", _wrap_CvSeq_CvQuadEdge2D___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvQuadEdge2D___setitem__", _wrap_CvSeq_CvQuadEdge2D___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvQuadEdge2D_append", _wrap_CvSeq_CvQuadEdge2D_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvQuadEdge2D_pop", _wrap_CvSeq_CvQuadEdge2D_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_CvQuadEdge2D", _wrap_new_CvSeq_CvQuadEdge2D, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_CvQuadEdge2D", _wrap_delete_CvSeq_CvQuadEdge2D, METH_VARARGS, NULL},
+        { (char *)"CvSeq_CvQuadEdge2D_cast", _wrap_CvSeq_CvQuadEdge2D_cast, METH_VARARGS, (char *)"CvSeq_CvQuadEdge2D_cast(CvSeq seq) -> CvSeq_CvQuadEdge2D"},
+        { (char *)"CvSeq_CvQuadEdge2D___getitem__", _wrap_CvSeq_CvQuadEdge2D___getitem__, METH_VARARGS, (char *)"CvSeq_CvQuadEdge2D___getitem__(CvSeq_CvQuadEdge2D self, int i) -> CvQuadEdge2D"},
+        { (char *)"CvSeq_CvQuadEdge2D___setitem__", _wrap_CvSeq_CvQuadEdge2D___setitem__, METH_VARARGS, (char *)"CvSeq_CvQuadEdge2D___setitem__(CvSeq_CvQuadEdge2D self, int i, CvQuadEdge2D obj)"},
+        { (char *)"CvSeq_CvQuadEdge2D_append", _wrap_CvSeq_CvQuadEdge2D_append, METH_VARARGS, (char *)"CvSeq_CvQuadEdge2D_append(CvSeq_CvQuadEdge2D self, CvQuadEdge2D obj)"},
+        { (char *)"CvSeq_CvQuadEdge2D_pop", _wrap_CvSeq_CvQuadEdge2D_pop, METH_VARARGS, (char *)"CvSeq_CvQuadEdge2D_pop(CvSeq_CvQuadEdge2D self) -> CvQuadEdge2D"},
+        { (char *)"new_CvSeq_CvQuadEdge2D", _wrap_new_CvSeq_CvQuadEdge2D, METH_VARARGS, (char *)"new_CvSeq_CvQuadEdge2D() -> CvSeq_CvQuadEdge2D"},
+        { (char *)"delete_CvSeq_CvQuadEdge2D", _wrap_delete_CvSeq_CvQuadEdge2D, METH_VARARGS, (char *)"delete_CvSeq_CvQuadEdge2D(CvSeq_CvQuadEdge2D self)"},
         { (char *)"CvSeq_CvQuadEdge2D_swigregister", CvSeq_CvQuadEdge2D_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvConnectedComp_cast", _wrap_CvSeq_CvConnectedComp_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvConnectedComp___getitem__", _wrap_CvSeq_CvConnectedComp___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvConnectedComp___setitem__", _wrap_CvSeq_CvConnectedComp___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvConnectedComp_append", _wrap_CvSeq_CvConnectedComp_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvConnectedComp_pop", _wrap_CvSeq_CvConnectedComp_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_CvConnectedComp", _wrap_new_CvSeq_CvConnectedComp, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_CvConnectedComp", _wrap_delete_CvSeq_CvConnectedComp, METH_VARARGS, NULL},
+        { (char *)"CvSeq_CvConnectedComp_cast", _wrap_CvSeq_CvConnectedComp_cast, METH_VARARGS, (char *)"CvSeq_CvConnectedComp_cast(CvSeq seq) -> CvSeq_CvConnectedComp"},
+        { (char *)"CvSeq_CvConnectedComp___getitem__", _wrap_CvSeq_CvConnectedComp___getitem__, METH_VARARGS, (char *)"CvSeq_CvConnectedComp___getitem__(CvSeq_CvConnectedComp self, int i) -> CvConnectedComp"},
+        { (char *)"CvSeq_CvConnectedComp___setitem__", _wrap_CvSeq_CvConnectedComp___setitem__, METH_VARARGS, (char *)"CvSeq_CvConnectedComp___setitem__(CvSeq_CvConnectedComp self, int i, CvConnectedComp obj)"},
+        { (char *)"CvSeq_CvConnectedComp_append", _wrap_CvSeq_CvConnectedComp_append, METH_VARARGS, (char *)"CvSeq_CvConnectedComp_append(CvSeq_CvConnectedComp self, CvConnectedComp obj)"},
+        { (char *)"CvSeq_CvConnectedComp_pop", _wrap_CvSeq_CvConnectedComp_pop, METH_VARARGS, (char *)"CvSeq_CvConnectedComp_pop(CvSeq_CvConnectedComp self) -> CvConnectedComp"},
+        { (char *)"new_CvSeq_CvConnectedComp", _wrap_new_CvSeq_CvConnectedComp, METH_VARARGS, (char *)"new_CvSeq_CvConnectedComp() -> CvSeq_CvConnectedComp"},
+        { (char *)"delete_CvSeq_CvConnectedComp", _wrap_delete_CvSeq_CvConnectedComp, METH_VARARGS, (char *)"delete_CvSeq_CvConnectedComp(CvSeq_CvConnectedComp self)"},
         { (char *)"CvSeq_CvConnectedComp_swigregister", CvSeq_CvConnectedComp_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint_2_cast", _wrap_CvSeq_CvPoint_2_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint_2___getitem__", _wrap_CvSeq_CvPoint_2___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint_2___setitem__", _wrap_CvSeq_CvPoint_2___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint_2_append", _wrap_CvSeq_CvPoint_2_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_CvPoint_2_pop", _wrap_CvSeq_CvPoint_2_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_CvPoint_2", _wrap_new_CvSeq_CvPoint_2, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_CvPoint_2", _wrap_delete_CvSeq_CvPoint_2, METH_VARARGS, NULL},
+        { (char *)"CvSeq_CvPoint_2_cast", _wrap_CvSeq_CvPoint_2_cast, METH_VARARGS, (char *)"CvSeq_CvPoint_2_cast(CvSeq seq) -> CvSeq_CvPoint_2"},
+        { (char *)"CvSeq_CvPoint_2___getitem__", _wrap_CvSeq_CvPoint_2___getitem__, METH_VARARGS, (char *)"CvSeq_CvPoint_2___getitem__(CvSeq_CvPoint_2 self, int i) -> CvTuple_CvPoint_2"},
+        { (char *)"CvSeq_CvPoint_2___setitem__", _wrap_CvSeq_CvPoint_2___setitem__, METH_VARARGS, (char *)"CvSeq_CvPoint_2___setitem__(CvSeq_CvPoint_2 self, int i, CvTuple_CvPoint_2 obj)"},
+        { (char *)"CvSeq_CvPoint_2_append", _wrap_CvSeq_CvPoint_2_append, METH_VARARGS, (char *)"CvSeq_CvPoint_2_append(CvSeq_CvPoint_2 self, CvTuple_CvPoint_2 obj)"},
+        { (char *)"CvSeq_CvPoint_2_pop", _wrap_CvSeq_CvPoint_2_pop, METH_VARARGS, (char *)"CvSeq_CvPoint_2_pop(CvSeq_CvPoint_2 self) -> CvTuple_CvPoint_2"},
+        { (char *)"new_CvSeq_CvPoint_2", _wrap_new_CvSeq_CvPoint_2, METH_VARARGS, (char *)"new_CvSeq_CvPoint_2() -> CvSeq_CvPoint_2"},
+        { (char *)"delete_CvSeq_CvPoint_2", _wrap_delete_CvSeq_CvPoint_2, METH_VARARGS, (char *)"delete_CvSeq_CvPoint_2(CvSeq_CvPoint_2 self)"},
         { (char *)"CvSeq_CvPoint_2_swigregister", CvSeq_CvPoint_2_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_2_cast", _wrap_CvSeq_float_2_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_2___getitem__", _wrap_CvSeq_float_2___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_2___setitem__", _wrap_CvSeq_float_2___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_2_append", _wrap_CvSeq_float_2_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_2_pop", _wrap_CvSeq_float_2_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_float_2", _wrap_new_CvSeq_float_2, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_float_2", _wrap_delete_CvSeq_float_2, METH_VARARGS, NULL},
+        { (char *)"CvSeq_float_2_cast", _wrap_CvSeq_float_2_cast, METH_VARARGS, (char *)"CvSeq_float_2_cast(CvSeq seq) -> CvSeq_float_2"},
+        { (char *)"CvSeq_float_2___getitem__", _wrap_CvSeq_float_2___getitem__, METH_VARARGS, (char *)"CvSeq_float_2___getitem__(CvSeq_float_2 self, int i) -> CvTuple_float_2"},
+        { (char *)"CvSeq_float_2___setitem__", _wrap_CvSeq_float_2___setitem__, METH_VARARGS, (char *)"CvSeq_float_2___setitem__(CvSeq_float_2 self, int i, CvTuple_float_2 obj)"},
+        { (char *)"CvSeq_float_2_append", _wrap_CvSeq_float_2_append, METH_VARARGS, (char *)"CvSeq_float_2_append(CvSeq_float_2 self, CvTuple_float_2 obj)"},
+        { (char *)"CvSeq_float_2_pop", _wrap_CvSeq_float_2_pop, METH_VARARGS, (char *)"CvSeq_float_2_pop(CvSeq_float_2 self) -> CvTuple_float_2"},
+        { (char *)"new_CvSeq_float_2", _wrap_new_CvSeq_float_2, METH_VARARGS, (char *)"new_CvSeq_float_2() -> CvSeq_float_2"},
+        { (char *)"delete_CvSeq_float_2", _wrap_delete_CvSeq_float_2, METH_VARARGS, (char *)"delete_CvSeq_float_2(CvSeq_float_2 self)"},
         { (char *)"CvSeq_float_2_swigregister", CvSeq_float_2_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_3_cast", _wrap_CvSeq_float_3_cast, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_3___getitem__", _wrap_CvSeq_float_3___getitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_3___setitem__", _wrap_CvSeq_float_3___setitem__, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_3_append", _wrap_CvSeq_float_3_append, METH_VARARGS, NULL},
-        { (char *)"CvSeq_float_3_pop", _wrap_CvSeq_float_3_pop, METH_VARARGS, NULL},
-        { (char *)"new_CvSeq_float_3", _wrap_new_CvSeq_float_3, METH_VARARGS, NULL},
-        { (char *)"delete_CvSeq_float_3", _wrap_delete_CvSeq_float_3, METH_VARARGS, NULL},
+        { (char *)"CvSeq_float_3_cast", _wrap_CvSeq_float_3_cast, METH_VARARGS, (char *)"CvSeq_float_3_cast(CvSeq seq) -> CvSeq_float_3"},
+        { (char *)"CvSeq_float_3___getitem__", _wrap_CvSeq_float_3___getitem__, METH_VARARGS, (char *)"CvSeq_float_3___getitem__(CvSeq_float_3 self, int i) -> CvTuple_float_3"},
+        { (char *)"CvSeq_float_3___setitem__", _wrap_CvSeq_float_3___setitem__, METH_VARARGS, (char *)"CvSeq_float_3___setitem__(CvSeq_float_3 self, int i, CvTuple_float_3 obj)"},
+        { (char *)"CvSeq_float_3_append", _wrap_CvSeq_float_3_append, METH_VARARGS, (char *)"CvSeq_float_3_append(CvSeq_float_3 self, CvTuple_float_3 obj)"},
+        { (char *)"CvSeq_float_3_pop", _wrap_CvSeq_float_3_pop, METH_VARARGS, (char *)"CvSeq_float_3_pop(CvSeq_float_3 self) -> CvTuple_float_3"},
+        { (char *)"new_CvSeq_float_3", _wrap_new_CvSeq_float_3, METH_VARARGS, (char *)"new_CvSeq_float_3() -> CvSeq_float_3"},
+        { (char *)"delete_CvSeq_float_3", _wrap_delete_CvSeq_float_3, METH_VARARGS, (char *)"delete_CvSeq_float_3(CvSeq_float_3 self)"},
         { (char *)"CvSeq_float_3_swigregister", CvSeq_float_3_swigregister, METH_VARARGS, NULL},
-        { (char *)"SendErrorToPython", _wrap_SendErrorToPython, METH_VARARGS, NULL},
-        { (char *)"function_ptr_generator", _wrap_function_ptr_generator, METH_VARARGS, NULL},
-        { (char *)"void_ptr_generator", _wrap_void_ptr_generator, METH_VARARGS, NULL},
-        { (char *)"void_ptrptr_generator", _wrap_void_ptrptr_generator, METH_VARARGS, NULL},
+        { (char *)"SendErrorToPython", _wrap_SendErrorToPython, METH_VARARGS, (char *)"\n"
+               "SendErrorToPython(int status, char func_name, char err_msg, char file_name, \n"
+               "    int line, void arg5) -> int\n"
+               ""},
+        { (char *)"function_ptr_generator", _wrap_function_ptr_generator, METH_VARARGS, (char *)"function_ptr_generator() -> CvErrorCallback"},
+        { (char *)"void_ptr_generator", _wrap_void_ptr_generator, METH_VARARGS, (char *)"void_ptr_generator() -> void"},
+        { (char *)"void_ptrptr_generator", _wrap_void_ptrptr_generator, METH_VARARGS, (char *)"void_ptrptr_generator() -> void"},
         { NULL, NULL, 0, NULL }
 };
 
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_p_CvTypedSeqTCvTupleTCvPoint_2_t_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvTuple<CvPoint,2 > > **) x));
+static void *_p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvTuple< CvPoint,2 > > **) x));
 }
-static void *_p_p_CvTypedSeqTCvTupleTfloat_2_t_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvTuple<float,2 > > **) x));
+static void *_p_p_CvTypedSeqT_CvTupleT_float_2_t_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvTuple< float,2 > > **) x));
 }
-static void *_p_p_CvTypedSeqTCvConnectedComp_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvConnectedComp > **) x));
+static void *_p_p_CvTypedSeqT_CvConnectedComp_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvConnectedComp > **) x));
 }
-static void *_p_p_CvTypedSeqTCvRect_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvRect > **) x));
+static void *_p_p_CvTypedSeqT_CvRect_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvRect > **) x));
 }
-static void *_p_p_CvTypedSeqTCvPoint_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvPoint > **) x));
+static void *_p_p_CvTypedSeqT_CvPoint_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvPoint > **) x));
 }
-static void *_p_p_CvTypedSeqTCvTupleTfloat_3_t_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvTuple<float,3 > > **) x));
+static void *_p_p_CvTypedSeqT_CvTupleT_float_3_t_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvTuple< float,3 > > **) x));
 }
-static void *_p_p_CvTypedSeqTCvSeq_p_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvSeq * > **) x));
+static void *_p_p_CvTypedSeqT_CvSeq_p_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvSeq * > **) x));
 }
-static void *_p_p_CvTypedSeqTCvQuadEdge2D_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvQuadEdge2D > **) x));
+static void *_p_p_CvTypedSeqT_CvQuadEdge2D_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvQuadEdge2D > **) x));
 }
-static void *_p_p_CvTypedSeqTCvPoint2D32f_tTo_p_p_CvSeq(void *x) {
-    return (void *)((CvSeq **)  ((CvTypedSeq<CvPoint2D32f > **) x));
+static void *_p_p_CvTypedSeqT_CvPoint2D32f_tTo_p_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq **)  ((CvTypedSeq< CvPoint2D32f > **) x));
 }
-static void *_p_CvTypedSeqTCvTupleTCvPoint_2_t_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvTuple<CvPoint,2 > > *) x));
+static void *_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvTuple< CvPoint,2 > > *) x));
 }
-static void *_p_CvTypedSeqTCvTupleTfloat_2_t_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvTuple<float,2 > > *) x));
+static void *_p_CvTypedSeqT_CvTupleT_float_2_t_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvTuple< float,2 > > *) x));
 }
-static void *_p_CvTypedSeqTCvConnectedComp_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvConnectedComp > *) x));
+static void *_p_CvTypedSeqT_CvConnectedComp_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvConnectedComp > *) x));
 }
-static void *_p_CvTypedSeqTCvRect_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvRect > *) x));
+static void *_p_CvTypedSeqT_CvRect_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvRect > *) x));
 }
-static void *_p_CvTypedSeqTCvPoint_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvPoint > *) x));
+static void *_p_CvTypedSeqT_CvPoint_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvPoint > *) x));
 }
-static void *_p_CvTypedSeqTCvTupleTfloat_3_t_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvTuple<float,3 > > *) x));
+static void *_p_CvTypedSeqT_CvTupleT_float_3_t_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvTuple< float,3 > > *) x));
 }
-static void *_p_CvTypedSeqTCvSeq_p_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvSeq * > *) x));
+static void *_p_CvTypedSeqT_CvSeq_p_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvSeq * > *) x));
 }
-static void *_p_CvTypedSeqTCvQuadEdge2D_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvQuadEdge2D > *) x));
+static void *_p_CvTypedSeqT_CvQuadEdge2D_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvQuadEdge2D > *) x));
 }
-static void *_p_CvTypedSeqTCvPoint2D32f_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvPoint2D32f > *) x));
+static void *_p_CvTypedSeqT_CvPoint2D32f_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvPoint2D32f > *) x));
 }
 static swig_type_info _swigt__p_Cv32suf = {"_p_Cv32suf", "Cv32suf *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Cv64suf = {"_p_Cv64suf", "Cv64suf *", 0, 0, (void*)0, 0};
@@ -106749,7 +107715,7 @@ static swig_type_info _swigt__p_CvChain = {"_p_CvChain", "CvChain *", 0, 0, (voi
 static swig_type_info _swigt__p_CvChainPtReader = {"_p_CvChainPtReader", "CvChainPtReader *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConDensation = {"_p_CvConDensation", "CvConDensation *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConnectedComp = {"_p_CvConnectedComp", "CvConnectedComp *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvContour = {"_p_CvContour", "CvContour *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvContour = {"_p_CvContour", "CvPoint2DSeq *|CvContour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvContourTree = {"_p_CvContourTree", "CvContourTree *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConvexityDefect = {"_p_CvConvexityDefect", "CvConvexityDefect *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvFeatureTree = {"_p_CvFeatureTree", "CvFeatureTree *", 0, 0, (void*)0, 0};
@@ -106831,20 +107797,20 @@ static swig_type_info _swigt__p_CvSubdiv2DPoint = {"_p_CvSubdiv2DPoint", "CvSubd
 static swig_type_info _swigt__p_CvSubdiv2DPointLocation = {"_p_CvSubdiv2DPointLocation", "enum CvSubdiv2DPointLocation *|CvSubdiv2DPointLocation *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvTermCriteria = {"_p_CvTermCriteria", "CvTermCriteria *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvTreeNodeIterator = {"_p_CvTreeNodeIterator", "CvTreeNodeIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTupleTCvPoint_2_t = {"_p_CvTupleTCvPoint_2_t", "CvTuple<CvPoint,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTupleTfloat_2_t = {"_p_CvTupleTfloat_2_t", "CvTuple<float,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTupleTfloat_3_t = {"_p_CvTupleTfloat_3_t", "CvTuple<float,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTupleT_CvPoint_2_t = {"_p_CvTupleT_CvPoint_2_t", "CvTuple< CvPoint,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTupleT_float_2_t = {"_p_CvTupleT_float_2_t", "CvTuple< float,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTupleT_float_3_t = {"_p_CvTupleT_float_3_t", "CvTuple< float,3 > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvType = {"_p_CvType", "CvType *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvTypeInfo = {"_p_CvTypeInfo", "CvTypeInfo *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvConnectedComp_t = {"_p_CvTypedSeqTCvConnectedComp_t", "CvTypedSeq<CvConnectedComp > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvPoint2D32f_t = {"_p_CvTypedSeqTCvPoint2D32f_t", "CvTypedSeq<CvPoint2D32f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvPoint_t = {"_p_CvTypedSeqTCvPoint_t", "CvTypedSeq<CvPoint > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvQuadEdge2D_t = {"_p_CvTypedSeqTCvQuadEdge2D_t", "CvTypedSeq<CvQuadEdge2D > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvRect_t = {"_p_CvTypedSeqTCvRect_t", "CvTypedSeq<CvRect > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvSeq_p_t = {"_p_CvTypedSeqTCvSeq_p_t", "CvTypedSeq<CvSeq * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvTupleTCvPoint_2_t_t = {"_p_CvTypedSeqTCvTupleTCvPoint_2_t_t", "CvTypedSeq<CvTuple<CvPoint,2 > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvTupleTfloat_2_t_t = {"_p_CvTypedSeqTCvTupleTfloat_2_t_t", "CvTypedSeq<CvTuple<float,2 > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvTupleTfloat_3_t_t = {"_p_CvTypedSeqTCvTupleTfloat_3_t_t", "CvTypedSeq<CvTuple<float,3 > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvConnectedComp_t = {"_p_CvTypedSeqT_CvConnectedComp_t", "CvTypedSeq< CvConnectedComp > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvPoint2D32f_t = {"_p_CvTypedSeqT_CvPoint2D32f_t", "CvTypedSeq< CvPoint2D32f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvPoint_t = {"_p_CvTypedSeqT_CvPoint_t", "CvTypedSeq< CvPoint > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvQuadEdge2D_t = {"_p_CvTypedSeqT_CvQuadEdge2D_t", "CvTypedSeq< CvQuadEdge2D > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvRect_t = {"_p_CvTypedSeqT_CvRect_t", "CvTypedSeq< CvRect > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvSeq_p_t = {"_p_CvTypedSeqT_CvSeq_p_t", "CvTypedSeq< CvSeq * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t = {"_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t", "CvTypedSeq< CvTuple< CvPoint,2 > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t = {"_p_CvTypedSeqT_CvTupleT_float_2_t_t", "CvTypedSeq< CvTuple< float,2 > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t = {"_p_CvTypedSeqT_CvTupleT_float_3_t_t", "CvTypedSeq< CvTuple< float,3 > > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p__CvContourScanner = {"_p__CvContourScanner", "_CvContourScanner *|CvContourScanner", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p__IplConvKernel = {"_p__IplConvKernel", "_IplConvKernel *|IplConvKernel *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p__IplConvKernelFP = {"_p__IplConvKernelFP", "_IplConvKernelFP *|IplConvKernelFP *", 0, 0, (void*)0, 0};
@@ -106858,28 +107824,28 @@ static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocato
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_int_int_int_int_int__p__IplROI = {"_p_f_int_int_int_int_int__p__IplROI", "_IplROI *(*)(int,int,int,int,int)|Cv_iplCreateROI", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_int_int_int_int_int__p__IplROI = {"_p_f_int_int_int_int_int__p__IplROI", "Cv_iplCreateROI|_IplROI *(*)(int,int,int,int,int)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_int_int_int_p_char_p_char_int_int_int_int_int_p_IplROI_p_IplImage_p_void_p_IplTileInfo__p__IplImage = {"_p_f_int_int_int_p_char_p_char_int_int_int_int_int_p_IplROI_p_IplImage_p_void_p_IplTileInfo__p__IplImage", "_IplImage *(*)(int,int,int,char *,char *,int,int,int,int,int,IplROI *,IplImage *,void *,IplTileInfo *)|Cv_iplCreateImageHeader", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_int_p_q_const__char_p_q_const__char_p_q_const__char_int_p_void__int = {"_p_f_int_p_q_const__char_p_q_const__char_p_q_const__char_int_p_void__int", "int (*)(int,char const *,char const *,char const *,int,void *)|CvErrorCallback", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_CvFileStorage_p_CvFileNode__p_void = {"_p_f_p_CvFileStorage_p_CvFileNode__p_void", "void *(*)(CvFileStorage *,CvFileNode *)|CvReadFunc", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void = {"_p_f_p_CvFileStorage_p_q_const__char_p_q_const__void_CvAttrList__void", "void (*)(CvFileStorage *,char const *,void const *,CvAttrList)|CvWriteFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p__IplImage_int__void = {"_p_f_p__IplImage_int__void", "void (*)(_IplImage *,int)|Cv_iplDeallocate", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p__IplImage_int_int__void = {"_p_f_p__IplImage_int_int__void", "void (*)(_IplImage *,int,int)|Cv_iplAllocateImageData", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p__IplImage_int__void = {"_p_f_p__IplImage_int__void", "Cv_iplDeallocate|void (*)(_IplImage *,int)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p__IplImage_int_int__void = {"_p_f_p__IplImage_int_int__void", "Cv_iplAllocateImageData|void (*)(_IplImage *,int,int)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_void__void = {"_p_f_p_p_void__void", "void (*)(void **)|CvReleaseFunc", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__IplImage__p__IplImage = {"_p_f_p_q_const__IplImage__p__IplImage", "_IplImage *(*)(IplImage const *)|Cv_iplCloneImage", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_int__p_CvMat = {"_p_f_p_q_const__char_int__p_CvMat", "CvMat *(*)(char const *,int)|CvLoadImageMFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__char_int__p__IplImage = {"_p_f_p_q_const__char_int__p__IplImage", "_IplImage *(*)(char const *,int)|CvLoadImageFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__void__void = {"_p_f_p_q_const__char_p_q_const__void__void", "void (*)(char const *,void const *)|CvShowImageFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__void_p_q_const__int__int = {"_p_f_p_q_const__char_p_q_const__void_p_q_const__int__int", "int (*)(char const *,void const *,int const *)|CvSaveImageFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__float_p_q_const__float_p_void__float = {"_p_f_p_q_const__float_p_q_const__float_p_void__float", "float (*)(float const *,float const *,void *)|CvDistanceFunction", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__void__int = {"_p_f_p_q_const__void__int", "int (*)(void const *)|CvIsInstanceFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__void__p_void = {"_p_f_p_q_const__void__p_void", "void *(*)(void const *)|CvCloneFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_q_const__void_p_q_const__void_p_void__int = {"_p_f_p_q_const__void_p_q_const__void_p_void__int", "int (*)(void const *,void const *,void *)|CvCmpFunc", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__char_int__p__IplImage = {"_p_f_p_q_const__char_int__p__IplImage", "CvLoadImageFunc|_IplImage *(*)(char const *,int)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__void__void = {"_p_f_p_q_const__char_p_q_const__void__void", "CvShowImageFunc|void (*)(char const *,void const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__void_p_q_const__int__int = {"_p_f_p_q_const__char_p_q_const__void_p_q_const__int__int", "CvSaveImageFunc|int (*)(char const *,void const *,int const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__float_p_q_const__float_p_void__float = {"_p_f_p_q_const__float_p_q_const__float_p_void__float", "CvDistanceFunction|float (*)(float const *,float const *,void *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__void__int = {"_p_f_p_q_const__void__int", "CvIsInstanceFunc|int (*)(void const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__void__p_void = {"_p_f_p_q_const__void__p_void", "CvCloneFunc|void *(*)(void const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__void_p_q_const__void_p_void__int = {"_p_f_p_q_const__void_p_q_const__void_p_void__int", "CvCmpFunc|int (*)(void const *,void const *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_void__int = {"_p_f_p_void_p_void__int", "int (*)(void *,void *)|CvFreeFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_size_t_p_void__p_void = {"_p_f_size_t_p_void__p_void", "void *(*)(size_t,void *)|CvAllocFunc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_float = {"_p_float", "float *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_long_long = {"_p_long_long", "long long *|int64 *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_size_t_p_void__p_void = {"_p_f_size_t_p_void__p_void", "CvAllocFunc|void *(*)(size_t,void *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_float = {"_p_float", "float *|CvVect32f|CvMatr32f", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "CvHistType *|int *|CVStatus *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64 *|long long *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvFileStorage = {"_p_p_CvFileStorage", "CvFileStorage **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvGraphEdge = {"_p_p_CvGraphEdge", "CvGraphEdge **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvGraphVtx = {"_p_p_CvGraphVtx", "CvGraphVtx **", 0, 0, (void*)0, 0};
@@ -106890,45 +107856,45 @@ static swig_type_info _swigt__p_p_CvMatND = {"_p_p_CvMatND", "CvMatND **", 0, 0,
 static swig_type_info _swigt__p_p_CvPOSITObject = {"_p_p_CvPOSITObject", "CvPOSITObject **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvPoint = {"_p_p_CvPoint", "CvPoint **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvSeq = {"_p_p_CvSeq", "CvSeq **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvTupleTCvPoint_2_t_t = {"_p_p_CvTypedSeqTCvTupleTCvPoint_2_t_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvTupleTfloat_2_t_t = {"_p_p_CvTypedSeqTCvTupleTfloat_2_t_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvRect_t = {"_p_p_CvTypedSeqTCvRect_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvPoint_t = {"_p_p_CvTypedSeqTCvPoint_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvQuadEdge2D_t = {"_p_p_CvTypedSeqTCvQuadEdge2D_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvSeq_p_t = {"_p_p_CvTypedSeqTCvSeq_p_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvPoint2D32f_t = {"_p_p_CvTypedSeqTCvPoint2D32f_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvTupleTfloat_3_t_t = {"_p_p_CvTypedSeqTCvTupleTfloat_3_t_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_p_CvTypedSeqTCvConnectedComp_t = {"_p_p_CvTypedSeqTCvConnectedComp_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t = {"_p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvTupleT_float_2_t_t = {"_p_p_CvTypedSeqT_CvTupleT_float_2_t_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvRect_t = {"_p_p_CvTypedSeqT_CvRect_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvPoint_t = {"_p_p_CvTypedSeqT_CvPoint_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvQuadEdge2D_t = {"_p_p_CvTypedSeqT_CvQuadEdge2D_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvSeq_p_t = {"_p_p_CvTypedSeqT_CvSeq_p_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvPoint2D32f_t = {"_p_p_CvTypedSeqT_CvPoint2D32f_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvTupleT_float_3_t_t = {"_p_p_CvTypedSeqT_CvTupleT_float_3_t_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_CvTypedSeqT_CvConnectedComp_t = {"_p_p_CvTypedSeqT_CvConnectedComp_t", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_p_CvSeqBlock = {"_p_p_CvSeqBlock", "CvSeqBlock **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvSetElem = {"_p_p_CvSetElem", "CvSetElem **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvStereoBMState = {"_p_p_CvStereoBMState", "CvStereoBMState **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvStereoGCState = {"_p_p_CvStereoGCState", "CvStereoGCState **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvSubdiv2DPoint = {"_p_p_CvSubdiv2DPoint", "CvSubdiv2DPoint **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_PyObject = {"_p_p_PyObject", "PyObject **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p__CvContourScanner = {"_p_p__CvContourScanner", "_CvContourScanner **|CvContourScanner *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p__CvContourScanner = {"_p_p__CvContourScanner", "CvContourScanner *|_CvContourScanner **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p__IplImage = {"_p_p__IplImage", "_IplImage **|IplImage **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_float = {"_p_p_float", "float **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_p_CvMat = {"_p_p_p_CvMat", "CvMat ***", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_unsigned_char = {"_p_p_unsigned_char", "unsigned char **|uchar **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **|CvArr **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_short = {"_p_short", "short *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|schar *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "schar *|signed char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_t = {"_p_size_t", "size_t *|CvSubdiv2DEdge *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__invalid_argument = {"_p_std__invalid_argument", "std::invalid_argument *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t = {"_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t", "std::vector<CvPoint > *|std::vector<CvPoint,std::allocator<CvPoint > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__allocator_type = {"_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__allocator_type", "std::allocator<CvPoint > *|std::vector<CvPoint >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type = {"_p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type", "CvPoint *|std::vector<CvPoint >::value_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTfloat_std__allocatorTfloat_t_t = {"_p_std__vectorTfloat_std__allocatorTfloat_t_t", "std::vector<float > *|std::vector<float,std::allocator<float > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTfloat_std__allocatorTfloat_t_t__allocator_type = {"_p_std__vectorTfloat_std__allocatorTfloat_t_t__allocator_type", "std::allocator<float > *|std::vector<float >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_swig__PySwigIterator = {"_p_swig__PySwigIterator", "swig::PySwigIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uchar *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t = {"_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t", "std::vector< CvPoint,std::allocator< CvPoint > > *|std::vector< CvPoint > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type = {"_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type", "std::vector< CvPoint >::allocator_type *|std::allocator< CvPoint > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type = {"_p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type", "std::vector< CvPoint >::value_type *|CvPoint *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_float_std__allocatorT_float_t_t = {"_p_std__vectorT_float_std__allocatorT_float_t_t", "std::vector< float > *|std::vector< float,std::allocator< float > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type = {"_p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type", "std::vector< float >::allocator_type *|std::allocator< float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_swig__SwigPyIterator = {"_p_swig__SwigPyIterator", "swig::SwigPyIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "uchar *|unsigned char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "unsigned long long *|CvRNG *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "uint64 *|unsigned long long *|CvRNG *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|ushort *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_void = {"_p_void", "CvArr *|void *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_Cv32suf,
@@ -107022,20 +107988,20 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvSubdiv2DPointLocation,
   &_swigt__p_CvTermCriteria,
   &_swigt__p_CvTreeNodeIterator,
-  &_swigt__p_CvTupleTCvPoint_2_t,
-  &_swigt__p_CvTupleTfloat_2_t,
-  &_swigt__p_CvTupleTfloat_3_t,
+  &_swigt__p_CvTupleT_CvPoint_2_t,
+  &_swigt__p_CvTupleT_float_2_t,
+  &_swigt__p_CvTupleT_float_3_t,
   &_swigt__p_CvType,
   &_swigt__p_CvTypeInfo,
-  &_swigt__p_CvTypedSeqTCvConnectedComp_t,
-  &_swigt__p_CvTypedSeqTCvPoint2D32f_t,
-  &_swigt__p_CvTypedSeqTCvPoint_t,
-  &_swigt__p_CvTypedSeqTCvQuadEdge2D_t,
-  &_swigt__p_CvTypedSeqTCvRect_t,
-  &_swigt__p_CvTypedSeqTCvSeq_p_t,
-  &_swigt__p_CvTypedSeqTCvTupleTCvPoint_2_t_t,
-  &_swigt__p_CvTypedSeqTCvTupleTfloat_2_t_t,
-  &_swigt__p_CvTypedSeqTCvTupleTfloat_3_t_t,
+  &_swigt__p_CvTypedSeqT_CvConnectedComp_t,
+  &_swigt__p_CvTypedSeqT_CvPoint2D32f_t,
+  &_swigt__p_CvTypedSeqT_CvPoint_t,
+  &_swigt__p_CvTypedSeqT_CvQuadEdge2D_t,
+  &_swigt__p_CvTypedSeqT_CvRect_t,
+  &_swigt__p_CvTypedSeqT_CvSeq_p_t,
+  &_swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t,
+  &_swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t,
+  &_swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t,
   &_swigt__p__CvContourScanner,
   &_swigt__p__IplConvKernel,
   &_swigt__p__IplConvKernelFP,
@@ -107086,15 +108052,15 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_CvStereoBMState,
   &_swigt__p_p_CvStereoGCState,
   &_swigt__p_p_CvSubdiv2DPoint,
-  &_swigt__p_p_CvTypedSeqTCvConnectedComp_t,
-  &_swigt__p_p_CvTypedSeqTCvPoint2D32f_t,
-  &_swigt__p_p_CvTypedSeqTCvPoint_t,
-  &_swigt__p_p_CvTypedSeqTCvQuadEdge2D_t,
-  &_swigt__p_p_CvTypedSeqTCvRect_t,
-  &_swigt__p_p_CvTypedSeqTCvSeq_p_t,
-  &_swigt__p_p_CvTypedSeqTCvTupleTCvPoint_2_t_t,
-  &_swigt__p_p_CvTypedSeqTCvTupleTfloat_2_t_t,
-  &_swigt__p_p_CvTypedSeqTCvTupleTfloat_3_t_t,
+  &_swigt__p_p_CvTypedSeqT_CvConnectedComp_t,
+  &_swigt__p_p_CvTypedSeqT_CvPoint2D32f_t,
+  &_swigt__p_p_CvTypedSeqT_CvPoint_t,
+  &_swigt__p_p_CvTypedSeqT_CvQuadEdge2D_t,
+  &_swigt__p_p_CvTypedSeqT_CvRect_t,
+  &_swigt__p_p_CvTypedSeqT_CvSeq_p_t,
+  &_swigt__p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t,
+  &_swigt__p_p_CvTypedSeqT_CvTupleT_float_2_t_t,
+  &_swigt__p_p_CvTypedSeqT_CvTupleT_float_3_t_t,
   &_swigt__p_p_PyObject,
   &_swigt__p_p__CvContourScanner,
   &_swigt__p_p__IplImage,
@@ -107108,12 +108074,12 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_size_t,
   &_swigt__p_size_type,
   &_swigt__p_std__invalid_argument,
-  &_swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t,
-  &_swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__allocator_type,
-  &_swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,
-  &_swigt__p_std__vectorTfloat_std__allocatorTfloat_t_t,
-  &_swigt__p_std__vectorTfloat_std__allocatorTfloat_t_t__allocator_type,
-  &_swigt__p_swig__PySwigIterator,
+  &_swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t,
+  &_swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type,
+  &_swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,
+  &_swigt__p_std__vectorT_float_std__allocatorT_float_t_t,
+  &_swigt__p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type,
+  &_swigt__p_swig__SwigPyIterator,
   &_swigt__p_unsigned_char,
   &_swigt__p_unsigned_int,
   &_swigt__p_unsigned_long_long,
@@ -107177,7 +108143,7 @@ static swig_cast_info _swigc__p_CvNArrayIterator[] = {  {&_swigt__p_CvNArrayIter
 static swig_cast_info _swigc__p_CvNextEdgeType[] = {  {&_swigt__p_CvNextEdgeType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPOSITObject[] = {  {&_swigt__p_CvPOSITObject, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPluginFuncInfo[] = {  {&_swigt__p_CvPluginFuncInfo, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvPoint[] = {  {&_swigt__p_CvPoint, 0, 0, 0},  {&_swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvPoint[] = {  {&_swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0, 0, 0},  {&_swigt__p_CvPoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPoint2D32f[] = {  {&_swigt__p_CvPoint2D32f, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPoint2D64f[] = {  {&_swigt__p_CvPoint2D64f, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvPoint3D32f[] = {  {&_swigt__p_CvPoint3D32f, 0, 0, 0},{0, 0, 0, 0}};
@@ -107189,7 +108155,7 @@ static swig_cast_info _swigc__p_CvRect[] = {  {&_swigt__p_CvRect, 0, 0, 0},{0, 0
 static swig_cast_info _swigc__p_CvSURFParams[] = {  {&_swigt__p_CvSURFParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSURFPoint[] = {  {&_swigt__p_CvSURFPoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvScalar[] = {  {&_swigt__p_CvScalar, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvSeq[] = {  {&_swigt__p_CvTypedSeqTCvTupleTCvPoint_2_t_t, _p_CvTypedSeqTCvTupleTCvPoint_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvTupleTfloat_2_t_t, _p_CvTypedSeqTCvTupleTfloat_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvRect_t, _p_CvTypedSeqTCvRect_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvPoint_t, _p_CvTypedSeqTCvPoint_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvQuadEdge2D_t, _p_CvTypedSeqTCvQuadEdge2D_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvSeq_p_t, _p_CvTypedSeqTCvSeq_p_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvPoint2D32f_t, _p_CvTypedSeqTCvPoint2D32f_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvSeq, 0, 0, 0},  {&_swigt__p_CvTypedSeqTCvTupleTfloat_3_t_t, _p_CvTypedSeqTCvTupleTfloat_3_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvConnectedComp_t, _p_CvTypedSeqTCvConnectedComp_tTo_p_CvSeq, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvSeq[] = {  {&_swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, _p_CvTypedSeqT_CvTupleT_CvPoint_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t, _p_CvTypedSeqT_CvTupleT_float_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvRect_t, _p_CvTypedSeqT_CvRect_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvPoint_t, _p_CvTypedSeqT_CvPoint_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvQuadEdge2D_t, _p_CvTypedSeqT_CvQuadEdge2D_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvSeq_p_t, _p_CvTypedSeqT_CvSeq_p_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvPoint2D32f_t, _p_CvTypedSeqT_CvPoint2D32f_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvSeq, 0, 0, 0},  {&_swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t, _p_CvTypedSeqT_CvTupleT_float_3_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvConnectedComp_t, _p_CvTypedSeqT_CvConnectedComp_tTo_p_CvSeq, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeqBlock[] = {  {&_swigt__p_CvSeqBlock, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeqReader[] = {  {&_swigt__p_CvSeqReader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeqWriter[] = {  {&_swigt__p_CvSeqWriter, 0, 0, 0},{0, 0, 0, 0}};
@@ -107213,20 +108179,20 @@ static swig_cast_info _swigc__p_CvSubdiv2DPoint[] = {  {&_swigt__p_CvSubdiv2DPoi
 static swig_cast_info _swigc__p_CvSubdiv2DPointLocation[] = {  {&_swigt__p_CvSubdiv2DPointLocation, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvTermCriteria[] = {  {&_swigt__p_CvTermCriteria, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvTreeNodeIterator[] = {  {&_swigt__p_CvTreeNodeIterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTupleTCvPoint_2_t[] = {  {&_swigt__p_CvTupleTCvPoint_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTupleTfloat_2_t[] = {  {&_swigt__p_CvTupleTfloat_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTupleTfloat_3_t[] = {  {&_swigt__p_CvTupleTfloat_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTupleT_CvPoint_2_t[] = {  {&_swigt__p_CvTupleT_CvPoint_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTupleT_float_2_t[] = {  {&_swigt__p_CvTupleT_float_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTupleT_float_3_t[] = {  {&_swigt__p_CvTupleT_float_3_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvType[] = {  {&_swigt__p_CvType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvTypeInfo[] = {  {&_swigt__p_CvTypeInfo, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvConnectedComp_t[] = {  {&_swigt__p_CvTypedSeqTCvConnectedComp_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvPoint2D32f_t[] = {  {&_swigt__p_CvTypedSeqTCvPoint2D32f_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvPoint_t[] = {  {&_swigt__p_CvTypedSeqTCvPoint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvQuadEdge2D_t[] = {  {&_swigt__p_CvTypedSeqTCvQuadEdge2D_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvRect_t[] = {  {&_swigt__p_CvTypedSeqTCvRect_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvSeq_p_t[] = {  {&_swigt__p_CvTypedSeqTCvSeq_p_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvTupleTCvPoint_2_t_t[] = {  {&_swigt__p_CvTypedSeqTCvTupleTCvPoint_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvTupleTfloat_2_t_t[] = {  {&_swigt__p_CvTypedSeqTCvTupleTfloat_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvTupleTfloat_3_t_t[] = {  {&_swigt__p_CvTypedSeqTCvTupleTfloat_3_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvConnectedComp_t[] = {  {&_swigt__p_CvTypedSeqT_CvConnectedComp_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvPoint2D32f_t[] = {  {&_swigt__p_CvTypedSeqT_CvPoint2D32f_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvPoint_t[] = {  {&_swigt__p_CvTypedSeqT_CvPoint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvQuadEdge2D_t[] = {  {&_swigt__p_CvTypedSeqT_CvQuadEdge2D_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvRect_t[] = {  {&_swigt__p_CvTypedSeqT_CvRect_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvSeq_p_t[] = {  {&_swigt__p_CvTypedSeqT_CvSeq_p_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t[] = {  {&_swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvTupleT_float_2_t_t[] = {  {&_swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvTupleT_float_3_t_t[] = {  {&_swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p__CvContourScanner[] = {  {&_swigt__p__CvContourScanner, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p__IplConvKernel[] = {  {&_swigt__p__IplConvKernel, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p__IplConvKernelFP[] = {  {&_swigt__p__IplConvKernelFP, 0, 0, 0},{0, 0, 0, 0}};
@@ -107271,16 +108237,16 @@ static swig_cast_info _swigc__p_p_CvMat[] = {  {&_swigt__p_p_CvMat, 0, 0, 0},{0,
 static swig_cast_info _swigc__p_p_CvMatND[] = {  {&_swigt__p_p_CvMatND, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvPOSITObject[] = {  {&_swigt__p_p_CvPOSITObject, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvPoint[] = {  {&_swigt__p_p_CvPoint, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvTupleTCvPoint_2_t_t[] = {{&_swigt__p_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvTupleTfloat_2_t_t[] = {{&_swigt__p_p_CvTypedSeqTCvTupleTfloat_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvRect_t[] = {{&_swigt__p_p_CvTypedSeqTCvRect_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvPoint_t[] = {{&_swigt__p_p_CvTypedSeqTCvPoint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvQuadEdge2D_t[] = {{&_swigt__p_p_CvTypedSeqTCvQuadEdge2D_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvSeq_p_t[] = {{&_swigt__p_p_CvTypedSeqTCvSeq_p_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvPoint2D32f_t[] = {{&_swigt__p_p_CvTypedSeqTCvPoint2D32f_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvTupleTfloat_3_t_t[] = {{&_swigt__p_p_CvTypedSeqTCvTupleTfloat_3_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvTypedSeqTCvConnectedComp_t[] = {{&_swigt__p_p_CvTypedSeqTCvConnectedComp_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_CvSeq[] = {  {&_swigt__p_p_CvTypedSeqTCvTupleTCvPoint_2_t_t, _p_p_CvTypedSeqTCvTupleTCvPoint_2_t_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqTCvTupleTfloat_2_t_t, _p_p_CvTypedSeqTCvTupleTfloat_2_t_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqTCvRect_t, _p_p_CvTypedSeqTCvRect_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqTCvPoint_t, _p_p_CvTypedSeqTCvPoint_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqTCvQuadEdge2D_t, _p_p_CvTypedSeqTCvQuadEdge2D_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqTCvSeq_p_t, _p_p_CvTypedSeqTCvSeq_p_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqTCvPoint2D32f_t, _p_p_CvTypedSeqTCvPoint2D32f_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvSeq, 0, 0, 0},  {&_swigt__p_p_CvTypedSeqTCvTupleTfloat_3_t_t, _p_p_CvTypedSeqTCvTupleTfloat_3_t_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqTCvConnectedComp_t, _p_p_CvTypedSeqTCvConnectedComp_tTo_p_p_CvSeq, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t[] = {{&_swigt__p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvTupleT_float_2_t_t[] = {{&_swigt__p_p_CvTypedSeqT_CvTupleT_float_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvRect_t[] = {{&_swigt__p_p_CvTypedSeqT_CvRect_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvPoint_t[] = {{&_swigt__p_p_CvTypedSeqT_CvPoint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvQuadEdge2D_t[] = {{&_swigt__p_p_CvTypedSeqT_CvQuadEdge2D_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvSeq_p_t[] = {{&_swigt__p_p_CvTypedSeqT_CvSeq_p_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvPoint2D32f_t[] = {{&_swigt__p_p_CvTypedSeqT_CvPoint2D32f_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvTupleT_float_3_t_t[] = {{&_swigt__p_p_CvTypedSeqT_CvTupleT_float_3_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvTypedSeqT_CvConnectedComp_t[] = {{&_swigt__p_p_CvTypedSeqT_CvConnectedComp_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_CvSeq[] = {  {&_swigt__p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, _p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqT_CvTupleT_float_2_t_t, _p_p_CvTypedSeqT_CvTupleT_float_2_t_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqT_CvRect_t, _p_p_CvTypedSeqT_CvRect_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqT_CvPoint_t, _p_p_CvTypedSeqT_CvPoint_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqT_CvQuadEdge2D_t, _p_p_CvTypedSeqT_CvQuadEdge2D_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqT_CvSeq_p_t, _p_p_CvTypedSeqT_CvSeq_p_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqT_CvPoint2D32f_t, _p_p_CvTypedSeqT_CvPoint2D32f_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvSeq, 0, 0, 0},  {&_swigt__p_p_CvTypedSeqT_CvTupleT_float_3_t_t, _p_p_CvTypedSeqT_CvTupleT_float_3_t_tTo_p_p_CvSeq, 0, 0},  {&_swigt__p_p_CvTypedSeqT_CvConnectedComp_t, _p_p_CvTypedSeqT_CvConnectedComp_tTo_p_p_CvSeq, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvSeqBlock[] = {  {&_swigt__p_p_CvSeqBlock, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvSetElem[] = {  {&_swigt__p_p_CvSetElem, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_CvStereoBMState[] = {  {&_swigt__p_p_CvStereoBMState, 0, 0, 0},{0, 0, 0, 0}};
@@ -107299,12 +108265,12 @@ static swig_cast_info _swigc__p_signed_char[] = {  {&_swigt__p_signed_char, 0, 0
 static swig_cast_info _swigc__p_size_t[] = {  {&_swigt__p_size_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_size_type[] = {  {&_swigt__p_size_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_std__invalid_argument[] = {  {&_swigt__p_std__invalid_argument, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t[] = {  {&_swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type[] = {  {&_swigt__p_CvPoint, 0, 0, 0},  {&_swigt__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTfloat_std__allocatorTfloat_t_t[] = {  {&_swigt__p_std__vectorTfloat_std__allocatorTfloat_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTfloat_std__allocatorTfloat_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTfloat_std__allocatorTfloat_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_swig__PySwigIterator[] = {  {&_swigt__p_swig__PySwigIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t[] = {  {&_swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type[] = {  {&_swigt__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type, 0, 0, 0},  {&_swigt__p_CvPoint, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_float_std__allocatorT_float_t_t[] = {  {&_swigt__p_std__vectorT_float_std__allocatorT_float_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_swig__SwigPyIterator[] = {  {&_swigt__p_swig__SwigPyIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_long_long[] = {  {&_swigt__p_unsigned_long_long, 0, 0, 0},{0, 0, 0, 0}};
@@ -107404,20 +108370,20 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvSubdiv2DPointLocation,
   _swigc__p_CvTermCriteria,
   _swigc__p_CvTreeNodeIterator,
-  _swigc__p_CvTupleTCvPoint_2_t,
-  _swigc__p_CvTupleTfloat_2_t,
-  _swigc__p_CvTupleTfloat_3_t,
+  _swigc__p_CvTupleT_CvPoint_2_t,
+  _swigc__p_CvTupleT_float_2_t,
+  _swigc__p_CvTupleT_float_3_t,
   _swigc__p_CvType,
   _swigc__p_CvTypeInfo,
-  _swigc__p_CvTypedSeqTCvConnectedComp_t,
-  _swigc__p_CvTypedSeqTCvPoint2D32f_t,
-  _swigc__p_CvTypedSeqTCvPoint_t,
-  _swigc__p_CvTypedSeqTCvQuadEdge2D_t,
-  _swigc__p_CvTypedSeqTCvRect_t,
-  _swigc__p_CvTypedSeqTCvSeq_p_t,
-  _swigc__p_CvTypedSeqTCvTupleTCvPoint_2_t_t,
-  _swigc__p_CvTypedSeqTCvTupleTfloat_2_t_t,
-  _swigc__p_CvTypedSeqTCvTupleTfloat_3_t_t,
+  _swigc__p_CvTypedSeqT_CvConnectedComp_t,
+  _swigc__p_CvTypedSeqT_CvPoint2D32f_t,
+  _swigc__p_CvTypedSeqT_CvPoint_t,
+  _swigc__p_CvTypedSeqT_CvQuadEdge2D_t,
+  _swigc__p_CvTypedSeqT_CvRect_t,
+  _swigc__p_CvTypedSeqT_CvSeq_p_t,
+  _swigc__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t,
+  _swigc__p_CvTypedSeqT_CvTupleT_float_2_t_t,
+  _swigc__p_CvTypedSeqT_CvTupleT_float_3_t_t,
   _swigc__p__CvContourScanner,
   _swigc__p__IplConvKernel,
   _swigc__p__IplConvKernelFP,
@@ -107468,15 +108434,15 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_CvStereoBMState,
   _swigc__p_p_CvStereoGCState,
   _swigc__p_p_CvSubdiv2DPoint,
-  _swigc__p_p_CvTypedSeqTCvConnectedComp_t,
-  _swigc__p_p_CvTypedSeqTCvPoint2D32f_t,
-  _swigc__p_p_CvTypedSeqTCvPoint_t,
-  _swigc__p_p_CvTypedSeqTCvQuadEdge2D_t,
-  _swigc__p_p_CvTypedSeqTCvRect_t,
-  _swigc__p_p_CvTypedSeqTCvSeq_p_t,
-  _swigc__p_p_CvTypedSeqTCvTupleTCvPoint_2_t_t,
-  _swigc__p_p_CvTypedSeqTCvTupleTfloat_2_t_t,
-  _swigc__p_p_CvTypedSeqTCvTupleTfloat_3_t_t,
+  _swigc__p_p_CvTypedSeqT_CvConnectedComp_t,
+  _swigc__p_p_CvTypedSeqT_CvPoint2D32f_t,
+  _swigc__p_p_CvTypedSeqT_CvPoint_t,
+  _swigc__p_p_CvTypedSeqT_CvQuadEdge2D_t,
+  _swigc__p_p_CvTypedSeqT_CvRect_t,
+  _swigc__p_p_CvTypedSeqT_CvSeq_p_t,
+  _swigc__p_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t,
+  _swigc__p_p_CvTypedSeqT_CvTupleT_float_2_t_t,
+  _swigc__p_p_CvTypedSeqT_CvTupleT_float_3_t_t,
   _swigc__p_p_PyObject,
   _swigc__p_p__CvContourScanner,
   _swigc__p_p__IplImage,
@@ -107490,12 +108456,12 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_size_t,
   _swigc__p_size_type,
   _swigc__p_std__invalid_argument,
-  _swigc__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t,
-  _swigc__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__allocator_type,
-  _swigc__p_std__vectorTCvPoint_std__allocatorTCvPoint_t_t__value_type,
-  _swigc__p_std__vectorTfloat_std__allocatorTfloat_t_t,
-  _swigc__p_std__vectorTfloat_std__allocatorTfloat_t_t__allocator_type,
-  _swigc__p_swig__PySwigIterator,
+  _swigc__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t,
+  _swigc__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__allocator_type,
+  _swigc__p_std__vectorT_CvPoint_std__allocatorT_CvPoint_t_t__value_type,
+  _swigc__p_std__vectorT_float_std__allocatorT_float_t_t,
+  _swigc__p_std__vectorT_float_std__allocatorT_float_t_t__allocator_type,
+  _swigc__p_swig__SwigPyIterator,
   _swigc__p_unsigned_char,
   _swigc__p_unsigned_int,
   _swigc__p_unsigned_long_long,
@@ -107570,7 +108536,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
   
   clientdata = clientdata;
   
@@ -107580,6 +108546,9 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -107608,6 +108577,12 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -107770,26 +108745,58 @@ extern "C" {
   
   SWIGINTERN PyObject *
   swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
+#if PY_VERSION_HEX >= 0x03000000
+    return PyUnicode_InternFromString("<Swig global variables>");
+#else
     return PyString_FromString("<Swig global variables>");
+#endif
   }
   
   SWIGINTERN PyObject *
   swig_varlink_str(swig_varlinkobject *v) {
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *str = PyUnicode_InternFromString("(");
+    PyObject *tail;
+    PyObject *joined;
+    swig_globalvar *var;
+    for (var = v->vars; var; var=var->next) {
+      tail = PyUnicode_FromString(var->name);
+      joined = PyUnicode_Concat(str, tail);
+      Py_DecRef(str);
+      Py_DecRef(tail);
+      str = joined;
+      if (var->next) {
+        tail = PyUnicode_InternFromString(", ");
+        joined = PyUnicode_Concat(str, tail);
+        Py_DecRef(str);
+        Py_DecRef(tail);
+        str = joined;
+      }
+    }
+    tail = PyUnicode_InternFromString(")");
+    joined = PyUnicode_Concat(str, tail);
+    Py_DecRef(str);
+    Py_DecRef(tail);
+    str = joined;
+#else
     PyObject *str = PyString_FromString("(");
-    swig_globalvar  *var;
+    swig_globalvar *var;
     for (var = v->vars; var; var=var->next) {
       PyString_ConcatAndDel(&str,PyString_FromString(var->name));
       if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
     }
     PyString_ConcatAndDel(&str,PyString_FromString(")"));
+#endif
     return str;
   }
   
   SWIGINTERN int
   swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
+    char *tmp;
     PyObject *str = swig_varlink_str(v);
     fprintf(fp,"Swig global variables ");
-    fprintf(fp,"%s\n", PyString_AsString(str));
+    fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
+    SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(str);
     return 0;
   }
@@ -107847,8 +108854,13 @@ extern "C" {
     if (!type_init) {
       const PyTypeObject tmp
       = {
+        /* PyObject header changed in Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+        PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else
         PyObject_HEAD_INIT(NULL)
         0,                                  /* Number of items in variable part (ob_size) */
+#endif
         (char *)"swigvarlink",              /* Type name (tp_name) */
         sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
         0,                                  /* Itemsize (tp_itemsize) */
@@ -107884,7 +108896,10 @@ extern "C" {
 #endif
       };
       varlink_type = tmp;
+      /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
       varlink_type.ob_type = &PyType_Type;
+#endif
       type_init = 1;
     }
     return &varlink_type;
@@ -108009,13 +109024,37 @@ extern "C" {
 #ifdef __cplusplus
 extern "C"
 #endif
-SWIGEXPORT void SWIG_init(void) {
-  PyObject *m, *d;
+
+SWIGEXPORT 
+#if PY_VERSION_HEX >= 0x03000000
+PyObject*
+#else
+void
+#endif
+SWIG_init(void) {
+  PyObject *m, *d;  
+#if PY_VERSION_HEX >= 0x03000000
+  static struct PyModuleDef SWIG_module = {
+    PyModuleDef_HEAD_INIT,
+    (char *) SWIG_name,
+    NULL,
+    -1,
+    SwigMethods,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  };
+#endif
   
   /* Fix SwigMethods to carry the callback ptrs when needed */
   SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
   
+#if PY_VERSION_HEX >= 0x03000000
+  m = PyModule_Create(&SWIG_module);
+#else
   m = Py_InitModule((char *) SWIG_name, SwigMethods);
+#endif
   d = PyModule_GetDict(m);
   
   SWIG_InitializeModule(0);
@@ -108122,8 +109161,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CV_ErrModeSilent",SWIG_From_int(static_cast< int >(2)));
   SWIG_Python_SetConstant(d, "CV_MAJOR_VERSION",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "CV_MINOR_VERSION",SWIG_From_int(static_cast< int >(1)));
-  SWIG_Python_SetConstant(d, "CV_SUBMINOR_VERSION",SWIG_From_int(static_cast< int >(0)));
-  SWIG_Python_SetConstant(d, "CV_VERSION",SWIG_FromCharPtr("1.1.0"));
+  SWIG_Python_SetConstant(d, "CV_SUBMINOR_VERSION",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "CV_PI",SWIG_From_double(static_cast< double >(3.1415926535897932384626433832795)));
   SWIG_Python_SetConstant(d, "CV_LOG2",SWIG_From_double(static_cast< double >(0.69314718055994530941723212145818)));
   SWIG_Python_SetConstant(d, "IPL_DEPTH_SIGN",SWIG_From_int(static_cast< int >(0x80000000)));
@@ -108165,37 +109203,37 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CV_32F",SWIG_From_int(static_cast< int >(5)));
   SWIG_Python_SetConstant(d, "CV_64F",SWIG_From_int(static_cast< int >(6)));
   SWIG_Python_SetConstant(d, "CV_USRTYPE1",SWIG_From_int(static_cast< int >(7)));
-  SWIG_Python_SetConstant(d, "CV_8UC1",SWIG_From_int(static_cast< int >(((0) +(((1) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_8UC2",SWIG_From_int(static_cast< int >(((0) +(((2) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_8UC3",SWIG_From_int(static_cast< int >(((0) +(((3) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_8UC4",SWIG_From_int(static_cast< int >(((0) +(((4) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_8SC1",SWIG_From_int(static_cast< int >(((1) +(((1) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_8SC2",SWIG_From_int(static_cast< int >(((1) +(((2) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_8SC3",SWIG_From_int(static_cast< int >(((1) +(((3) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_8SC4",SWIG_From_int(static_cast< int >(((1) +(((4) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_16UC1",SWIG_From_int(static_cast< int >(((2) +(((1) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_16UC2",SWIG_From_int(static_cast< int >(((2) +(((2) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_16UC3",SWIG_From_int(static_cast< int >(((2) +(((3) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_16UC4",SWIG_From_int(static_cast< int >(((2) +(((4) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_16SC1",SWIG_From_int(static_cast< int >(((3) +(((1) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_16SC2",SWIG_From_int(static_cast< int >(((3) +(((2) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_16SC3",SWIG_From_int(static_cast< int >(((3) +(((3) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_16SC4",SWIG_From_int(static_cast< int >(((3) +(((4) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_32SC1",SWIG_From_int(static_cast< int >(((4) +(((1) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_32SC2",SWIG_From_int(static_cast< int >(((4) +(((2) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_32SC3",SWIG_From_int(static_cast< int >(((4) +(((3) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_32SC4",SWIG_From_int(static_cast< int >(((4) +(((4) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_32FC1",SWIG_From_int(static_cast< int >(((5) +(((1) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_32FC2",SWIG_From_int(static_cast< int >(((5) +(((2) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_32FC3",SWIG_From_int(static_cast< int >(((5) +(((3) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_32FC4",SWIG_From_int(static_cast< int >(((5) +(((4) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_64FC1",SWIG_From_int(static_cast< int >(((6) +(((1) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_64FC2",SWIG_From_int(static_cast< int >(((6) +(((2) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_64FC3",SWIG_From_int(static_cast< int >(((6) +(((3) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_64FC4",SWIG_From_int(static_cast< int >(((6) +(((4) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_MAT_DEPTH_MASK",SWIG_From_int(static_cast< int >(((1 << 3) -1))));
+  SWIG_Python_SetConstant(d, "CV_8UC1",SWIG_From_int(static_cast< int >((((0) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_8UC2",SWIG_From_int(static_cast< int >((((0) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_8UC3",SWIG_From_int(static_cast< int >((((0) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_8UC4",SWIG_From_int(static_cast< int >((((0) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_8SC1",SWIG_From_int(static_cast< int >((((1) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_8SC2",SWIG_From_int(static_cast< int >((((1) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_8SC3",SWIG_From_int(static_cast< int >((((1) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_8SC4",SWIG_From_int(static_cast< int >((((1) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_16UC1",SWIG_From_int(static_cast< int >((((2) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_16UC2",SWIG_From_int(static_cast< int >((((2) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_16UC3",SWIG_From_int(static_cast< int >((((2) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_16UC4",SWIG_From_int(static_cast< int >((((2) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_16SC1",SWIG_From_int(static_cast< int >((((3) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_16SC2",SWIG_From_int(static_cast< int >((((3) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_16SC3",SWIG_From_int(static_cast< int >((((3) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_16SC4",SWIG_From_int(static_cast< int >((((3) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_32SC1",SWIG_From_int(static_cast< int >((((4) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_32SC2",SWIG_From_int(static_cast< int >((((4) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_32SC3",SWIG_From_int(static_cast< int >((((4) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_32SC4",SWIG_From_int(static_cast< int >((((4) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_32FC1",SWIG_From_int(static_cast< int >((((5) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_32FC2",SWIG_From_int(static_cast< int >((((5) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_32FC3",SWIG_From_int(static_cast< int >((((5) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_32FC4",SWIG_From_int(static_cast< int >((((5) &((1 << 3) -1)) +(((4) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_64FC1",SWIG_From_int(static_cast< int >((((6) &((1 << 3) -1)) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_64FC2",SWIG_From_int(static_cast< int >((((6) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_64FC3",SWIG_From_int(static_cast< int >((((6) &((1 << 3) -1)) +(((3) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_64FC4",SWIG_From_int(static_cast< int >((((6) &((1 << 3) -1)) +(((4) -1) << 3)))));
   SWIG_Python_SetConstant(d, "CV_AUTO_STEP",SWIG_From_int(static_cast< int >(0x7fffffff)));
   SWIG_Python_SetConstant(d, "CV_MAT_CN_MASK",SWIG_From_int(static_cast< int >(((64-1) << 3))));
-  SWIG_Python_SetConstant(d, "CV_MAT_DEPTH_MASK",SWIG_From_int(static_cast< int >(((1 << 3) -1))));
   SWIG_Python_SetConstant(d, "CV_MAT_TYPE_MASK",SWIG_From_int(static_cast< int >(((1 << 3) *64-1))));
   SWIG_Python_SetConstant(d, "CV_MAT_CONT_FLAG_SHIFT",SWIG_From_int(static_cast< int >(14)));
   SWIG_Python_SetConstant(d, "CV_MAT_CONT_FLAG",SWIG_From_int(static_cast< int >((1 << 14))));
@@ -108230,17 +109268,17 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CV_SET_MAGIC_VAL",SWIG_From_int(static_cast< int >(0x42980000)));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_BITS",SWIG_From_int(static_cast< int >(9)));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_MASK",SWIG_From_int(static_cast< int >(((1 << 9) -1))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_POINT",SWIG_From_int(static_cast< int >(((4) +(((2) -1) << 3)))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_CODE",SWIG_From_int(static_cast< int >(((0) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_POINT",SWIG_From_int(static_cast< int >((((4) &((1 << 3) -1)) +(((2) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_CODE",SWIG_From_int(static_cast< int >((((0) &((1 << 3) -1)) +(((1) -1) << 3)))));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_GENERIC",SWIG_From_int(static_cast< int >(0)));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_PTR",SWIG_From_int(static_cast< int >(7)));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_PPOINT",SWIG_From_int(static_cast< int >(7)));
-  SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_INDEX",SWIG_From_int(static_cast< int >(((4) +(((1) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_INDEX",SWIG_From_int(static_cast< int >((((4) &((1 << 3) -1)) +(((1) -1) << 3)))));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_GRAPH_EDGE",SWIG_From_int(static_cast< int >(0)));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_GRAPH_VERTEX",SWIG_From_int(static_cast< int >(0)));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_TRIAN_ATR",SWIG_From_int(static_cast< int >(0)));
   SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_CONNECTED_COMP",SWIG_From_int(static_cast< int >(0)));
-  SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_POINT3D",SWIG_From_int(static_cast< int >(((5) +(((3) -1) << 3)))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_ELTYPE_POINT3D",SWIG_From_int(static_cast< int >((((5) &((1 << 3) -1)) +(((3) -1) << 3)))));
   SWIG_Python_SetConstant(d, "CV_SEQ_KIND_BITS",SWIG_From_int(static_cast< int >(3)));
   SWIG_Python_SetConstant(d, "CV_SEQ_KIND_MASK",SWIG_From_int(static_cast< int >((((1 << 3) -1) << 9))));
   SWIG_Python_SetConstant(d, "CV_SEQ_KIND_GENERIC",SWIG_From_int(static_cast< int >((0 << 9))));
@@ -108256,17 +109294,17 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CV_GRAPH_FLAG_ORIENTED",SWIG_From_int(static_cast< int >((1 << (3+9)))));
   SWIG_Python_SetConstant(d, "CV_GRAPH",SWIG_From_int(static_cast< int >((3 << 9))));
   SWIG_Python_SetConstant(d, "CV_ORIENTED_GRAPH",SWIG_From_int(static_cast< int >(((3 << 9)|(1 << (3+9))))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_POINT_SET",SWIG_From_int(static_cast< int >(((0 << 9)|((4) +(((2) -1) << 3))))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_POINT3D_SET",SWIG_From_int(static_cast< int >(((0 << 9)|((5) +(((3) -1) << 3))))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_POLYLINE",SWIG_From_int(static_cast< int >(((1 << 9)|((4) +(((2) -1) << 3))))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_POLYGON",SWIG_From_int(static_cast< int >(((1 << (3+9))|((1 << 9)|((4) +(((2) -1) << 3)))))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_CONTOUR",SWIG_From_int(static_cast< int >(((1 << (3+9))|((1 << 9)|((4) +(((2) -1) << 3)))))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_SIMPLE_POLYGON",SWIG_From_int(static_cast< int >(((2 << (3+9))|((1 << (3+9))|((1 << 9)|((4) +(((2) -1) << 3))))))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_CHAIN",SWIG_From_int(static_cast< int >(((1 << 9)|((0) +(((1) -1) << 3))))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_CHAIN_CONTOUR",SWIG_From_int(static_cast< int >(((1 << (3+9))|((1 << 9)|((0) +(((1) -1) << 3)))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_POINT_SET",SWIG_From_int(static_cast< int >(((0 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_POINT3D_SET",SWIG_From_int(static_cast< int >(((0 << 9)|(((5) &((1 << 3) -1)) +(((3) -1) << 3))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_POLYLINE",SWIG_From_int(static_cast< int >(((1 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_POLYGON",SWIG_From_int(static_cast< int >(((1 << (3+9))|((1 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3)))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_CONTOUR",SWIG_From_int(static_cast< int >(((1 << (3+9))|((1 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3)))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_SIMPLE_POLYGON",SWIG_From_int(static_cast< int >(((2 << (3+9))|((1 << (3+9))|((1 << 9)|(((4) &((1 << 3) -1)) +(((2) -1) << 3))))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_CHAIN",SWIG_From_int(static_cast< int >(((1 << 9)|(((0) &((1 << 3) -1)) +(((1) -1) << 3))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_CHAIN_CONTOUR",SWIG_From_int(static_cast< int >(((1 << (3+9))|((1 << 9)|(((0) &((1 << 3) -1)) +(((1) -1) << 3)))))));
   SWIG_Python_SetConstant(d, "CV_SEQ_POLYGON_TREE",SWIG_From_int(static_cast< int >(((2 << 9)|0))));
   SWIG_Python_SetConstant(d, "CV_SEQ_CONNECTED_COMP",SWIG_From_int(static_cast< int >(((0 << 9)|0))));
-  SWIG_Python_SetConstant(d, "CV_SEQ_INDEX",SWIG_From_int(static_cast< int >(((0 << 9)|((4) +(((1) -1) << 3))))));
+  SWIG_Python_SetConstant(d, "CV_SEQ_INDEX",SWIG_From_int(static_cast< int >(((0 << 9)|(((4) &((1 << 3) -1)) +(((1) -1) << 3))))));
   SWIG_Python_SetConstant(d, "CV_STORAGE_READ",SWIG_From_int(static_cast< int >(0)));
   SWIG_Python_SetConstant(d, "CV_STORAGE_WRITE",SWIG_From_int(static_cast< int >(1)));
   SWIG_Python_SetConstant(d, "CV_STORAGE_WRITE_TEXT",SWIG_From_int(static_cast< int >(1)));
@@ -108528,10 +109566,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CV_TYPE_NAME_HAAR",SWIG_FromCharPtr("opencv-haar-classifier"));
   SWIG_Python_SetConstant(d, "CV_HAAR_FEATURE_MAX",SWIG_From_int(static_cast< int >(3)));
   PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
-  SWIG_addvarlink(SWIG_globals(),(char*)"CvModule_first",CvModule_first_get, CvModule_first_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CvModule_last",CvModule_last_get, CvModule_last_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CvType_first",CvType_first_get, CvType_first_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CvType_last",CvType_last_get, CvType_last_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CvModule_first",Swig_var_CvModule_first_get, Swig_var_CvModule_first_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CvModule_last",Swig_var_CvModule_last_get, Swig_var_CvModule_last_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CvType_first",Swig_var_CvType_first_get, Swig_var_CvType_first_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CvType_last",Swig_var_CvType_last_get, Swig_var_CvType_last_set);
   SWIG_Python_SetConstant(d, "CV_PTLOC_ERROR",SWIG_From_int(static_cast< int >(CV_PTLOC_ERROR)));
   SWIG_Python_SetConstant(d, "CV_PTLOC_OUTSIDE_RECT",SWIG_From_int(static_cast< int >(CV_PTLOC_OUTSIDE_RECT)));
   SWIG_Python_SetConstant(d, "CV_PTLOC_INSIDE",SWIG_From_int(static_cast< int >(CV_PTLOC_INSIDE)));
@@ -108546,5 +109584,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CV_PREV_AROUND_LEFT",SWIG_From_int(static_cast< int >(CV_PREV_AROUND_LEFT)));
   SWIG_Python_SetConstant(d, "CV_PREV_AROUND_RIGHT",SWIG_From_int(static_cast< int >(CV_PREV_AROUND_RIGHT)));
   SWIG_Python_SetConstant(d, "CV_GAUSSIAN_5x5",SWIG_From_int(static_cast< int >(CV_GAUSSIAN_5x5)));
+#if PY_VERSION_HEX >= 0x03000000
+  return m;
+#else
+  return;
+#endif
 }
 
index a4ef7e00765b45a7470de33841270c7a003c8931..417eccfbc0e24ae69b5c3b6015dc4e5670f9e4af 100644 (file)
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.39
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
 #define SWIGPYTHON
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
 
+
 #ifdef __cplusplus
-template<class T> class SwigValueWrapper {
-    T *tt;
+/* SwigValueWrapper is described in swig.swg */
+template<typename T> class SwigValueWrapper {
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
-    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -34,14 +42,14 @@ private:
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -69,6 +77,12 @@ private:
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -124,6 +138,12 @@ private:
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 
 /* Python.h has to appear first */
 #include <Python.h>
@@ -131,13 +151,13 @@ private:
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
  * type checking.
  * ----------------------------------------------------------------------------- */
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -150,11 +170,11 @@ private:
 
 /*
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the swig runtime code.
-  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  creating a static or dynamic library from the SWIG runtime code.
+  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
   
-  But only do this if is strictly necessary, ie, if you have problems
-  with your compiler or so.
+  But only do this if strictly necessary, ie, if you have problems
+  with your compiler or suchlike.
 */
 
 #ifndef SWIGRUNTIME
@@ -172,6 +192,7 @@ private:
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -180,14 +201,14 @@ private:
 /* 
    Flags/methods for returning states.
    
-   The swig conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
    Use the following macros/flags to set or process the returning
    states.
    
-   In old swig versions, you usually write code as:
+   In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
        // success code
@@ -195,7 +216,7 @@ private:
        //fail code
      }
 
-   Now you can be more explicit as:
+   Now you can be more explicit:
 
     int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
     if (SWIG_IsOK(res)) {
@@ -204,7 +225,7 @@ private:
       // fail code
     }
 
-   that seems to be the same, but now you can also do
+   which is the same really, but now you can also do
 
     Type *ptr;
     int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -222,7 +243,7 @@ private:
     
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
-   requires also to SWIG_ConvertPtr to return new result values, as
+   also requires SWIG_ConvertPtr to return new result values, such as
 
       int SWIG_ConvertPtr(obj, ptr,...) {         
         if (<obj is ok>) {                            
@@ -240,7 +261,7 @@ private:
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
    more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   swig errors code.
+   SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
    allows to return the 'cast rank', for example, if you have this
@@ -254,9 +275,8 @@ private:
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
+*/
 
-
- */
 #define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
@@ -281,7 +301,6 @@ private:
 #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
 #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
 
-
 /* Cast-Rank Mode */
 #if defined(SWIG_CASTRANK_MODE)
 #  ifndef SWIG_TypeRank
@@ -304,18 +323,16 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
-
-
 #include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;                        /* mangled name of this type */
   const char             *str;                 /* human readable name of this type */
@@ -360,7 +377,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
 /*
@@ -402,48 +419,66 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
 }
 
 
-/* think of this as a c++ template<> or a scheme macro */
-#define SWIG_TypeCheck_Template(comparison, ty)         \
-  if (ty) {                                             \
-    swig_cast_info *iter = ty->cast;                    \
-    while (iter) {                                      \
-      if (comparison) {                                 \
-        if (iter == ty->cast) return iter;              \
-        /* Move iter to the top of the linked list */   \
-        iter->prev->next = iter->next;                  \
-        if (iter->next)                                 \
-          iter->next->prev = iter->prev;                \
-        iter->next = ty->cast;                          \
-        iter->prev = 0;                                 \
-        if (ty->cast) ty->cast->prev = iter;            \
-        ty->cast = iter;                                \
-        return iter;                                    \
-      }                                                 \
-      iter = iter->next;                                \
-    }                                                   \
-  }                                                     \
-  return 0
-
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (strcmp(iter->type->name, c) == 0) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
-/* Same as previous function, except strcmp is replaced with a pointer comparison */
+/* 
+  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
-  SWIG_TypeCheck_Template(iter->type == from, into);
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (iter->type == from) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
 /*
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -714,6 +749,67 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 
 
+/* Compatibility marcos for Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+
+#define PyClass_Check(obj) PyObject_IsInstance(obj, (PyObject *)&PyType_Type)
+#define PyInt_Check(x) PyLong_Check(x)
+#define PyInt_AsLong(x) PyLong_AsLong(x)
+#define PyInt_FromLong(x) PyLong_FromLong(x)
+#define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
+
+#endif
+
+#ifndef Py_TYPE
+#  define Py_TYPE(op) ((op)->ob_type)
+#endif
+
+/* SWIG APIs for compatibility of both Python 2 & 3 */
+
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_Python_str_FromFormat PyUnicode_FromFormat
+#else
+#  define SWIG_Python_str_FromFormat PyString_FromFormat
+#endif
+
+
+/* Warning: This function will allocate a new string in Python 3,
+ * so please call SWIG_Python_str_DelForPy3(x) to free the space.
+ */
+SWIGINTERN char*
+SWIG_Python_str_AsChar(PyObject *str)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  char *cstr;
+  char *newstr;
+  int len;
+  str = PyUnicode_AsUTF8String(str);
+  PyBytes_AsStringAndSize(str, &cstr, &len);
+  newstr = (char *) malloc(len+1);
+  memcpy(newstr, cstr, len+1);
+  Py_XDECREF(str);
+  return newstr;
+#else
+  return PyString_AsString(str);
+#endif
+}
+
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
+#else
+#  define SWIG_Python_str_DelForPy3(x) 
+#endif
+
+
+SWIGINTERN PyObject*
+SWIG_Python_str_FromChar(const char *c)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  return PyUnicode_FromString(c); 
+#else
+  return PyString_FromString(c);
+#endif
+}
 
 /* Add PyOS_snprintf for old Pythons */
 #if PY_VERSION_HEX < 0x02020000
@@ -760,6 +856,7 @@ PyString_FromFormat(const char *fmt, ...) {
 #  define PyObject_GenericGetAttr 0
 # endif
 #endif
+
 /* Py_NotImplemented is defined in 2.1 and up. */
 #if PY_VERSION_HEX < 0x02010000
 # ifndef Py_NotImplemented
@@ -767,7 +864,6 @@ PyString_FromFormat(const char *fmt, ...) {
 # endif
 #endif
 
-
 /* A crude PyString_AsStringAndSize implementation for old Pythons */
 #if PY_VERSION_HEX < 0x02010000
 # ifndef PyString_AsStringAndSize
@@ -782,7 +878,6 @@ PyString_FromFormat(const char *fmt, ...) {
 # endif
 #endif
 
-
 /* PyBool_FromLong for old Pythons */
 #if PY_VERSION_HEX < 0x02030000
 static
@@ -860,19 +955,20 @@ SWIG_Python_AddErrorMsg(const char* mesg)
 
   if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
   if (value) {
+    char *tmp;
     PyObject *old_str = PyObject_Str(value);
     PyErr_Clear();
     Py_XINCREF(type);
-    PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+
+    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+    SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
 
-
-
 #if defined(SWIG_PYTHON_NO_THREADS)
 #  if defined(SWIG_PYTHON_THREADS)
 #    undef SWIG_PYTHON_THREADS
@@ -969,6 +1065,20 @@ typedef struct swig_const_info {
   swig_type_info **ptype;
 } swig_const_info;
 
+
+/* -----------------------------------------------------------------------------
+ * Wrapper of PyInstanceMethod_New() used in Python 3
+ * It is exported to the generated module, used for -fastproxy
+ * ----------------------------------------------------------------------------- */
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  return PyInstanceMethod_New(func);
+#else
+  return NULL;
+#endif
+}
+
 #ifdef __cplusplus
 #if 0
 { /* cc-mode */
@@ -1021,7 +1131,7 @@ typedef struct swig_const_info {
 
 #define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
 #define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
-#define SWIG_NewClientData(obj)                         PySwigClientData_New(obj)
+#define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
 
 #define SWIG_SetErrorObj                                SWIG_Python_SetErrorObj                            
 #define SWIG_SetErrorMsg                               SWIG_Python_SetErrorMsg                            
@@ -1107,14 +1217,14 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
 {
   if (!args) {
     if (!min && !max) {
       return 1;
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-                  name, (min == max ? "" : "at least "), min);
+                  name, (min == max ? "" : "at least "), (int)min);
       return 0;
     }
   }  
@@ -1122,14 +1232,14 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyOb
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register int l = PyTuple_GET_SIZE(args);
+    register Py_ssize_t l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-                  name, (min == max ? "" : "at least "), min, l);
+                  name, (min == max ? "" : "at least "), (int)min, (int)l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-                  name, (min == max ? "" : "at most "), max, l);
+                  name, (min == max ? "" : "at most "), (int)max, (int)l);
       return 0;
     } else {
       register int i;
@@ -1217,7 +1327,7 @@ SWIG_Py_Void(void)
   return none;
 }
 
-/* PySwigClientData */
+/* SwigPyClientData */
 
 typedef struct {
   PyObject *klass;
@@ -1226,30 +1336,30 @@ typedef struct {
   PyObject *destroy;
   int delargs;
   int implicitconv;
-} PySwigClientData;
+} SwigPyClientData;
 
 SWIGRUNTIMEINLINE int 
 SWIG_Python_CheckImplicit(swig_type_info *ty)
 {
-  PySwigClientData *data = (PySwigClientData *)ty->clientdata;
+  SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
   return data ? data->implicitconv : 0;
 }
 
 SWIGRUNTIMEINLINE PyObject *
 SWIG_Python_ExceptionType(swig_type_info *desc) {
-  PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0;
+  SwigPyClientData *data = desc ? (SwigPyClientData *) desc->clientdata : 0;
   PyObject *klass = data ? data->klass : 0;
   return (klass ? klass : PyExc_RuntimeError);
 }
 
 
-SWIGRUNTIME PySwigClientData * 
-PySwigClientData_New(PyObject* obj)
+SWIGRUNTIME SwigPyClientData * 
+SwigPyClientData_New(PyObject* obj)
 {
   if (!obj) {
     return 0;
   } else {
-    PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData));
+    SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData));
     /* the klass element */
     data->klass = obj;
     Py_INCREF(data->klass);
@@ -1297,14 +1407,14 @@ PySwigClientData_New(PyObject* obj)
 }
 
 SWIGRUNTIME void 
-PySwigClientData_Del(PySwigClientData* data)
+SwigPyClientData_Del(SwigPyClientData* data)
 {
   Py_XDECREF(data->newraw);
   Py_XDECREF(data->newargs);
   Py_XDECREF(data->destroy);
 }
 
-/* =============== PySwigObject =====================*/
+/* =============== SwigPyObject =====================*/
 
 typedef struct {
   PyObject_HEAD
@@ -1312,24 +1422,28 @@ typedef struct {
   swig_type_info *ty;
   int own;
   PyObject *next;
-} PySwigObject;
+} SwigPyObject;
 
 SWIGRUNTIME PyObject *
-PySwigObject_long(PySwigObject *v)
+SwigPyObject_long(SwigPyObject *v)
 {
   return PyLong_FromVoidPtr(v->ptr);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_format(const char* fmt, PySwigObject *v)
+SwigPyObject_format(const char* fmt, SwigPyObject *v)
 {
   PyObject *res = NULL;
   PyObject *args = PyTuple_New(1);
   if (args) {
-    if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) {
-      PyObject *ofmt = PyString_FromString(fmt);
+    if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) {
+      PyObject *ofmt = SWIG_Python_str_FromChar(fmt);
       if (ofmt) {
+#if PY_VERSION_HEX >= 0x03000000
+       res = PyUnicode_Format(ofmt,args);
+#else
        res = PyString_Format(ofmt,args);
+#endif
        Py_DECREF(ofmt);
       }
       Py_DECREF(args);
@@ -1339,49 +1453,59 @@ PySwigObject_format(const char* fmt, PySwigObject *v)
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_oct(PySwigObject *v)
+SwigPyObject_oct(SwigPyObject *v)
 {
-  return PySwigObject_format("%o",v);
+  return SwigPyObject_format("%o",v);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_hex(PySwigObject *v)
+SwigPyObject_hex(SwigPyObject *v)
 {
-  return PySwigObject_format("%x",v);
+  return SwigPyObject_format("%x",v);
 }
 
 SWIGRUNTIME PyObject *
 #ifdef METH_NOARGS
-PySwigObject_repr(PySwigObject *v)
+SwigPyObject_repr(SwigPyObject *v)
 #else
-PySwigObject_repr(PySwigObject *v, PyObject *args)
+SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 #endif
 {
   const char *name = SWIG_TypePrettyName(v->ty);
-  PyObject *hex = PySwigObject_hex(v);    
-  PyObject *repr = PyString_FromFormat("<Swig Object of type '%s' at 0x%s>", name, PyString_AsString(hex));
+  PyObject *hex = SwigPyObject_hex(v);    
+  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, hex);
   Py_DECREF(hex);
   if (v->next) {
 #ifdef METH_NOARGS
-    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next);
+    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
 #else
-    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next, args);
+    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
 #endif
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *joined = PyUnicode_Concat(repr, nrep);
+    Py_DecRef(repr);
+    Py_DecRef(nrep);
+    repr = joined;
+#else
     PyString_ConcatAndDel(&repr,nrep);
+#endif
   }
   return repr;  
 }
 
 SWIGRUNTIME int
-PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 {
+  char *str;
 #ifdef METH_NOARGS
-  PyObject *repr = PySwigObject_repr(v);
+  PyObject *repr = SwigPyObject_repr(v);
 #else
-  PyObject *repr = PySwigObject_repr(v, NULL);
+  PyObject *repr = SwigPyObject_repr(v, NULL);
 #endif
   if (repr) {
-    fputs(PyString_AsString(repr), fp);
+    str = SWIG_Python_str_AsChar(repr); 
+    fputs(str, fp);
+    SWIG_Python_str_DelForPy3(str);
     Py_DECREF(repr);
     return 0; 
   } else {
@@ -1390,53 +1514,71 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_str(PySwigObject *v)
+SwigPyObject_str(SwigPyObject *v)
 {
   char result[SWIG_BUFFER_SIZE];
   return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    PyString_FromString(result) : 0;
+    SWIG_Python_str_FromChar(result) : 0;
 }
 
 SWIGRUNTIME int
-PySwigObject_compare(PySwigObject *v, PySwigObject *w)
+SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
   void *j = w->ptr;
   return (i < j) ? -1 : ((i > j) ? 1 : 0);
 }
 
+/* Added for Python 3.x, whould it also useful for Python 2.x? */
+SWIGRUNTIME PyObject*
+SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
+{
+  PyObject* res;
+  if( op != Py_EQ && op != Py_NE ) {
+    Py_INCREF(Py_NotImplemented);
+    return Py_NotImplemented;
+  }
+  if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) )
+    res = Py_True;
+  else
+    res = Py_False;
+  Py_INCREF(res);
+  return res;  
+}
+
+
 SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
 
 SWIGRUNTIME PyTypeObject*
-PySwigObject_type(void) {
+SwigPyObject_type(void) {
   static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
   return type;
 }
 
 SWIGRUNTIMEINLINE int
-PySwigObject_Check(PyObject *op) {
-  return ((op)->ob_type == PySwigObject_type())
-    || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
+SwigPyObject_Check(PyObject *op) {
+  return (Py_TYPE(op) == SwigPyObject_type())
+    || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_New(void *ptr, swig_type_info *ty, int own);
+SwigPyObject_New(void *ptr, swig_type_info *ty, int own);
 
 SWIGRUNTIME void
-PySwigObject_dealloc(PyObject *v)
+SwigPyObject_dealloc(PyObject *v)
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own) {
+  if (sobj->own == SWIG_POINTER_OWN) {
     swig_type_info *ty = sobj->ty;
-    PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+    SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
     if (destroy) {
       /* destroy is always a VARARGS method */
       PyObject *res;
       if (data->delargs) {
        /* we need to create a temporal object to carry the destroy operation */
-       PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0);
+       PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0);
        res = SWIG_Python_CallFunctor(destroy, tmp);
        Py_DECREF(tmp);
       } else {
@@ -1445,27 +1587,28 @@ PySwigObject_dealloc(PyObject *v)
        res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } else {
-      const char *name = SWIG_TypePrettyName(ty);
+    } 
 #if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
-#endif
+    else {
+      const char *name = SWIG_TypePrettyName(ty);
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
     }
+#endif
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
 }
 
 SWIGRUNTIME PyObject* 
-PySwigObject_append(PyObject* v, PyObject* next)
+SwigPyObject_append(PyObject* v, PyObject* next)
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
 #ifndef METH_O
   PyObject *tmp = 0;
   if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
   next = tmp;
 #endif
-  if (!PySwigObject_Check(next)) {
+  if (!SwigPyObject_Check(next)) {
     return NULL;
   }
   sobj->next = next;
@@ -1475,12 +1618,12 @@ PySwigObject_append(PyObject* v, PyObject* next)
 
 SWIGRUNTIME PyObject* 
 #ifdef METH_NOARGS
-PySwigObject_next(PyObject* v)
+SwigPyObject_next(PyObject* v)
 #else
-PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
   if (sobj->next) {    
     Py_INCREF(sobj->next);
     return sobj->next;
@@ -1491,30 +1634,30 @@ PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 
 SWIGINTERN PyObject*
 #ifdef METH_NOARGS
-PySwigObject_disown(PyObject *v)
+SwigPyObject_disown(PyObject *v)
 #else
-PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *)v;
+  SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = 0;
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject*
 #ifdef METH_NOARGS
-PySwigObject_acquire(PyObject *v)
+SwigPyObject_acquire(PyObject *v)
 #else
-PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *)v;
+  SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = SWIG_POINTER_OWN;
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject*
-PySwigObject_own(PyObject *v, PyObject *args)
+SwigPyObject_own(PyObject *v, PyObject *args)
 {
   PyObject *val = 0;
 #if (PY_VERSION_HEX < 0x02020000)
@@ -1527,20 +1670,20 @@ PySwigObject_own(PyObject *v, PyObject *args)
     } 
   else
     {
-      PySwigObject *sobj = (PySwigObject *)v;
+      SwigPyObject *sobj = (SwigPyObject *)v;
       PyObject *obj = PyBool_FromLong(sobj->own);
       if (val) {
 #ifdef METH_NOARGS
        if (PyObject_IsTrue(val)) {
-         PySwigObject_acquire(v);
+         SwigPyObject_acquire(v);
        } else {
-         PySwigObject_disown(v);
+         SwigPyObject_disown(v);
        }
 #else
        if (PyObject_IsTrue(val)) {
-         PySwigObject_acquire(v,args);
+         SwigPyObject_acquire(v,args);
        } else {
-         PySwigObject_disown(v,args);
+         SwigPyObject_disown(v,args);
        }
 #endif
       } 
@@ -1551,30 +1694,30 @@ PySwigObject_own(PyObject *v, PyObject *args)
 #ifdef METH_O
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_O,       (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
+  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
   {0, 0, 0, 0}  
 };
 #else
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
+  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
   {0, 0, 0, 0}  
 };
 #endif
 
 #if PY_VERSION_HEX < 0x02020000
 SWIGINTERN PyObject *
-PySwigObject_getattr(PySwigObject *sobj,char *name)
+SwigPyObject_getattr(SwigPyObject *sobj,char *name)
 {
   return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
 }
@@ -1584,11 +1727,14 @@ SWIGRUNTIME PyTypeObject*
 _PySwigObject_type(void) {
   static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
   
-  static PyNumberMethods PySwigObject_as_number = {
+  static PyNumberMethods SwigPyObject_as_number = {
     (binaryfunc)0, /*nb_add*/
     (binaryfunc)0, /*nb_subtract*/
     (binaryfunc)0, /*nb_multiply*/
+    /* nb_divide removed in Python 3 */
+#if PY_VERSION_HEX < 0x03000000
     (binaryfunc)0, /*nb_divide*/
+#endif
     (binaryfunc)0, /*nb_remainder*/
     (binaryfunc)0, /*nb_divmod*/
     (ternaryfunc)0,/*nb_power*/
@@ -1602,45 +1748,66 @@ _PySwigObject_type(void) {
     0,            /*nb_and*/
     0,            /*nb_xor*/
     0,            /*nb_or*/
-    (coercion)0,   /*nb_coerce*/
-    (unaryfunc)PySwigObject_long, /*nb_int*/
-    (unaryfunc)PySwigObject_long, /*nb_long*/
+#if PY_VERSION_HEX < 0x03000000
+    0,   /*nb_coerce*/
+#endif
+    (unaryfunc)SwigPyObject_long, /*nb_int*/
+#if PY_VERSION_HEX < 0x03000000
+    (unaryfunc)SwigPyObject_long, /*nb_long*/
+#else
+    0, /*nb_reserved*/
+#endif
     (unaryfunc)0,                 /*nb_float*/
-    (unaryfunc)PySwigObject_oct,  /*nb_oct*/
-    (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02020000
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
-#elif PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX < 0x03000000
+    (unaryfunc)SwigPyObject_oct,  /*nb_oct*/
+    (unaryfunc)SwigPyObject_hex,  /*nb_hex*/
+#endif
+#if PY_VERSION_HEX >= 0x03000000 /* 3.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
+#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
     0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
 
-  static PyTypeObject pyswigobject_type;  
+  static PyTypeObject swigpyobject_type;  
   static int type_init = 0;
   if (!type_init) {
     const PyTypeObject tmp
       = {
+       /* PyOjbect header changed in Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+       PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else    
        PyObject_HEAD_INIT(NULL)
        0,                                  /* ob_size */
-       (char *)"PySwigObject",             /* tp_name */
-       sizeof(PySwigObject),               /* tp_basicsize */
+#endif
+       (char *)"SwigPyObject",             /* tp_name */
+       sizeof(SwigPyObject),               /* tp_basicsize */
        0,                                  /* tp_itemsize */
-       (destructor)PySwigObject_dealloc,   /* tp_dealloc */
-       (printfunc)PySwigObject_print,      /* tp_print */
+       (destructor)SwigPyObject_dealloc,   /* tp_dealloc */
+       (printfunc)SwigPyObject_print,      /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
-       (getattrfunc)PySwigObject_getattr,  /* tp_getattr */ 
+       (getattrfunc)SwigPyObject_getattr,  /* tp_getattr */ 
 #else
        (getattrfunc)0,                     /* tp_getattr */ 
 #endif
        (setattrfunc)0,                     /* tp_setattr */ 
-       (cmpfunc)PySwigObject_compare,      /* tp_compare */ 
-       (reprfunc)PySwigObject_repr,        /* tp_repr */    
-       &PySwigObject_as_number,            /* tp_as_number */
+#if PY_VERSION_HEX >= 0x03000000
+    0, /* tp_reserved in 3.0.1 */
+#else
+       (cmpfunc)SwigPyObject_compare,      /* tp_compare */
+#endif
+       (reprfunc)SwigPyObject_repr,        /* tp_repr */    
+       &SwigPyObject_as_number,            /* tp_as_number */
        0,                                  /* tp_as_sequence */
        0,                                  /* tp_as_mapping */
        (hashfunc)0,                        /* tp_hash */
        (ternaryfunc)0,                     /* tp_call */
-       (reprfunc)PySwigObject_str,         /* tp_str */
+       (reprfunc)SwigPyObject_str,         /* tp_str */
        PyObject_GenericGetAttr,            /* tp_getattro */
        0,                                  /* tp_setattro */
        0,                                  /* tp_as_buffer */
@@ -1648,7 +1815,7 @@ _PySwigObject_type(void) {
        swigobject_doc,                     /* tp_doc */        
        0,                                  /* tp_traverse */
        0,                                  /* tp_clear */
-       0,                                  /* tp_richcompare */
+       (richcmpfunc)SwigPyObject_richcompare,           /* tp_richcompare */
        0,                                  /* tp_weaklistoffset */
 #if PY_VERSION_HEX >= 0x02020000
        0,                                  /* tp_iter */
@@ -1665,11 +1832,11 @@ _PySwigObject_type(void) {
        0,                                  /* tp_alloc */              
        0,                                  /* tp_new */                
        0,                                  /* tp_free */          
-        0,                                  /* tp_is_gc */  
+       0,                                  /* tp_is_gc */  
        0,                                  /* tp_bases */   
        0,                                  /* tp_mro */
        0,                                  /* tp_cache */   
-       0,                                  /* tp_subclasses */
+       0,                                  /* tp_subclasses */
        0,                                  /* tp_weaklist */
 #endif
 #if PY_VERSION_HEX >= 0x02030000
@@ -1679,17 +1846,20 @@ _PySwigObject_type(void) {
        0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
       };
-    pyswigobject_type = tmp;
-    pyswigobject_type.ob_type = &PyType_Type;
+    swigpyobject_type = tmp;
+    /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
+    swigpyobject_type.ob_type = &PyType_Type;
+#endif
     type_init = 1;
   }
-  return &pyswigobject_type;
+  return &swigpyobject_type;
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_New(void *ptr, swig_type_info *ty, int own)
+SwigPyObject_New(void *ptr, swig_type_info *ty, int own)
 {
-  PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type());
+  SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type());
   if (sobj) {
     sobj->ptr  = ptr;
     sobj->ty   = ty;
@@ -1708,10 +1878,10 @@ typedef struct {
   void *pack;
   swig_type_info *ty;
   size_t size;
-} PySwigPacked;
+} SwigPyPacked;
 
 SWIGRUNTIME int
-PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 {
   char result[SWIG_BUFFER_SIZE];
   fputs("<Swig Packed ", fp); 
@@ -1725,29 +1895,29 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 }
   
 SWIGRUNTIME PyObject *
-PySwigPacked_repr(PySwigPacked *v)
+SwigPyPacked_repr(SwigPyPacked *v)
 {
   char result[SWIG_BUFFER_SIZE];
   if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    return PyString_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
+    return SWIG_Python_str_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
   } else {
-    return PyString_FromFormat("<Swig Packed %s>", v->ty->name);
+    return SWIG_Python_str_FromFormat("<Swig Packed %s>", v->ty->name);
   }  
 }
 
 SWIGRUNTIME PyObject *
-PySwigPacked_str(PySwigPacked *v)
+SwigPyPacked_str(SwigPyPacked *v)
 {
   char result[SWIG_BUFFER_SIZE];
   if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
-    return PyString_FromFormat("%s%s", result, v->ty->name);
+    return SWIG_Python_str_FromFormat("%s%s", result, v->ty->name);
   } else {
-    return PyString_FromString(v->ty->name);
+    return SWIG_Python_str_FromChar(v->ty->name);
   }  
 }
 
 SWIGRUNTIME int
-PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
+SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
 {
   size_t i = v->size;
   size_t j = w->size;
@@ -1758,22 +1928,22 @@ PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
 SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void);
 
 SWIGRUNTIME PyTypeObject*
-PySwigPacked_type(void) {
+SwigPyPacked_type(void) {
   static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type();
   return type;
 }
 
 SWIGRUNTIMEINLINE int
-PySwigPacked_Check(PyObject *op) {
+SwigPyPacked_Check(PyObject *op) {
   return ((op)->ob_type == _PySwigPacked_type()) 
-    || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0);
+    || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0);
 }
 
 SWIGRUNTIME void
-PySwigPacked_dealloc(PyObject *v)
+SwigPyPacked_dealloc(PyObject *v)
 {
-  if (PySwigPacked_Check(v)) {
-    PySwigPacked *sobj = (PySwigPacked *) v;
+  if (SwigPyPacked_Check(v)) {
+    SwigPyPacked *sobj = (SwigPyPacked *) v;
     free(sobj->pack);
   }
   PyObject_DEL(v);
@@ -1782,28 +1952,37 @@ PySwigPacked_dealloc(PyObject *v)
 SWIGRUNTIME PyTypeObject*
 _PySwigPacked_type(void) {
   static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
-  static PyTypeObject pyswigpacked_type;
+  static PyTypeObject swigpypacked_type;
   static int type_init = 0;  
   if (!type_init) {
     const PyTypeObject tmp
       = {
+    /* PyObject header changed in Python 3 */
+#if PY_VERSION_HEX>=0x03000000
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else
        PyObject_HEAD_INIT(NULL)
-       0,                                  /* ob_size */       
-       (char *)"PySwigPacked",             /* tp_name */       
-       sizeof(PySwigPacked),               /* tp_basicsize */  
+    0,                             /* ob_size */       
+#endif
+       (char *)"SwigPyPacked",             /* tp_name */       
+       sizeof(SwigPyPacked),               /* tp_basicsize */  
        0,                                  /* tp_itemsize */   
-       (destructor)PySwigPacked_dealloc,   /* tp_dealloc */    
-       (printfunc)PySwigPacked_print,      /* tp_print */      
+       (destructor)SwigPyPacked_dealloc,   /* tp_dealloc */    
+       (printfunc)SwigPyPacked_print,      /* tp_print */      
        (getattrfunc)0,                     /* tp_getattr */    
        (setattrfunc)0,                     /* tp_setattr */    
-       (cmpfunc)PySwigPacked_compare,      /* tp_compare */    
-       (reprfunc)PySwigPacked_repr,        /* tp_repr */       
-       0,                                  /* tp_as_number */  
+#if PY_VERSION_HEX>=0x03000000
+    0, /* tp_reserved in 3.0.1 */
+#else
+    (cmpfunc)SwigPyPacked_compare,         /* tp_compare */
+#endif
+       (reprfunc)SwigPyPacked_repr,        /* tp_repr */
+       0,                                  /* tp_as_number */
        0,                                  /* tp_as_sequence */
-       0,                                  /* tp_as_mapping */ 
-       (hashfunc)0,                        /* tp_hash */       
-       (ternaryfunc)0,                     /* tp_call */       
-       (reprfunc)PySwigPacked_str,         /* tp_str */        
+       0,                                  /* tp_as_mapping */
+       (hashfunc)0,                        /* tp_hash */
+       (ternaryfunc)0,                     /* tp_call */
+       (reprfunc)SwigPyPacked_str,         /* tp_str */
        PyObject_GenericGetAttr,            /* tp_getattro */
        0,                                  /* tp_setattro */
        0,                                  /* tp_as_buffer */
@@ -1842,17 +2021,20 @@ _PySwigPacked_type(void) {
        0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
       };
-    pyswigpacked_type = tmp;
-    pyswigpacked_type.ob_type = &PyType_Type;
+    swigpypacked_type = tmp;
+    /* for Python 3 the ob_type already assigned in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
+    swigpypacked_type.ob_type = &PyType_Type;
+#endif
     type_init = 1;
   }
-  return &pyswigpacked_type;
+  return &swigpypacked_type;
 }
 
 SWIGRUNTIME PyObject *
-PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty)
+SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty)
 {
-  PySwigPacked *sobj = PyObject_NEW(PySwigPacked, PySwigPacked_type());
+  SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type());
   if (sobj) {
     void *pack = malloc(size);
     if (pack) {
@@ -1869,10 +2051,10 @@ PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty)
 }
 
 SWIGRUNTIME swig_type_info *
-PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
+SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
 {
-  if (PySwigPacked_Check(obj)) {
-    PySwigPacked *sobj = (PySwigPacked *)obj;
+  if (SwigPyPacked_Check(obj)) {
+    SwigPyPacked *sobj = (SwigPyPacked *)obj;
     if (sobj->size != size) return 0;
     memcpy(ptr, sobj->pack, size);
     return sobj->ty;
@@ -1888,7 +2070,7 @@ PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
 SWIGRUNTIMEINLINE PyObject *
 _SWIG_This(void)
 {
-  return PyString_FromString("this");
+    return SWIG_Python_str_FromChar("this");
 }
 
 SWIGRUNTIME PyObject *
@@ -1900,11 +2082,16 @@ SWIG_This(void)
 
 /* #define SWIG_PYTHON_SLOW_GETSET_THIS */
 
-SWIGRUNTIME PySwigObject *
+/* TODO: I don't know how to implement the fast getset in Python 3 right now */
+#if PY_VERSION_HEX>=0x03000000
+#define SWIG_PYTHON_SLOW_GETSET_THIS 
+#endif
+
+SWIGRUNTIME SwigPyObject *
 SWIG_Python_GetSwigThis(PyObject *pyobj) 
 {
-  if (PySwigObject_Check(pyobj)) {
-    return (PySwigObject *) pyobj;
+  if (SwigPyObject_Check(pyobj)) {
+    return (SwigPyObject *) pyobj;
   } else {
     PyObject *obj = 0;
 #if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
@@ -1940,12 +2127,12 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
       return 0;
     }
 #endif
-    if (obj && !PySwigObject_Check(obj)) {
+    if (obj && !SwigPyObject_Check(obj)) {
       /* a PyObject is called 'this', try to get the 'real this'
-        PySwigObject from it */ 
+        SwigPyObject from it */ 
       return SWIG_Python_GetSwigThis(obj);
     }
-    return (PySwigObject *)obj;
+    return (SwigPyObject *)obj;
   }
 }
 
@@ -1953,8 +2140,8 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own) {
-    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+  if (own == SWIG_POINTER_OWN) {
+    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
       sobj->own = own;
@@ -1973,7 +2160,9 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     if (ptr) *ptr = 0;
     return SWIG_OK;
   } else {
-    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -1985,9 +2174,17 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
        } else {
          swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
          if (!tc) {
-           sobj = (PySwigObject *)sobj->next;
+           sobj = (SwigPyObject *)sobj->next;
          } else {
-           if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+           if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
+              }
+            }
            break;
          }
        }
@@ -1997,7 +2194,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
       }
     }
     if (sobj) {
-      if (own) *own = sobj->own;
+      if (own)
+        *own = *own | sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
        sobj->own = 0;
       }
@@ -2005,7 +2203,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     } else {
       int res = SWIG_ERROR;
       if (flags & SWIG_POINTER_IMPLICIT_CONV) {
-       PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
        if (data && !data->implicitconv) {
          PyObject *klass = data->klass;
          if (klass) {
@@ -2018,7 +2216,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
              impconv = 0;
            }
            if (impconv) {
-             PySwigObject *iobj = SWIG_Python_GetSwigThis(impconv);
+             SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
              if (iobj) {
                void *vptr;
                res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
@@ -2062,8 +2260,13 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (!tc) return SWIG_ERROR;
-      *ptr = SWIG_TypeCast(tc,vptr);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
     } else {
       *ptr = vptr;
     }
@@ -2075,7 +2278,7 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
 
 SWIGRUNTIME int
 SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
-  swig_type_info *to = PySwigPacked_UnpackData(obj, ptr, sz);
+  swig_type_info *to = SwigPyPacked_UnpackData(obj, ptr, sz);
   if (!to) return SWIG_ERROR;
   if (ty) {
     if (to != ty) {
@@ -2097,7 +2300,7 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *t
 */
 
 SWIGRUNTIME PyObject* 
-SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this)
+SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 {
 #if (PY_VERSION_HEX >= 0x02020000)
   PyObject *inst = 0;
@@ -2121,10 +2324,16 @@ SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this)
 #endif
     }
   } else {
+#if PY_VERSION_HEX >= 0x03000000
+    inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
+    PyObject_SetAttr(inst, SWIG_This(), swig_this);
+    Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+#else
     PyObject *dict = PyDict_New();
     PyDict_SetItem(dict, SWIG_This(), swig_this);
     inst = PyInstance_NewRaw(data->newargs, dict);
     Py_DECREF(dict);
+#endif
   }
   return inst;
 #else
@@ -2187,9 +2396,9 @@ SWIG_Python_InitShadowInstance(PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) {
     return NULL;
   } else {
-    PySwigObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
+    SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
     if (sthis) {
-      PySwigObject_append((PyObject*) sthis, obj[1]);
+      SwigPyObject_append((PyObject*) sthis, obj[1]);
     } else {
       SWIG_Python_SetSwigThis(obj[0], obj[1]);
     }
@@ -2205,8 +2414,8 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
     return SWIG_Py_Void();
   } else {
     int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
-    PyObject *robj = PySwigObject_New(ptr, type, own);
-    PySwigClientData *clientdata = type ? (PySwigClientData *)(type->clientdata) : 0;
+    PyObject *robj = SwigPyObject_New(ptr, type, own);
+    SwigPyClientData *clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
     if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
       PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
       if (inst) {
@@ -2222,7 +2431,7 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
 
 SWIGRUNTIMEINLINE PyObject *
 SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
-  return ptr ? PySwigPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
+  return ptr ? SwigPyPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
 }
 
 /* -----------------------------------------------------------------------------*
@@ -2293,8 +2502,8 @@ SWIG_Python_DestroyModule(void *vptr)
   for (i =0; i < swig_module->size; ++i) {
     swig_type_info *ty = types[i];
     if (ty->owndata) {
-      PySwigClientData *data = (PySwigClientData *) ty->clientdata;
-      if (data) PySwigClientData_Del(data);
+      SwigPyClientData *data = (SwigPyClientData *) ty->clientdata;
+      if (data) SwigPyClientData_Del(data);
     }
   }
   Py_DECREF(SWIG_This());
@@ -2304,8 +2513,13 @@ SWIGRUNTIME void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
   static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
 
+#if PY_VERSION_HEX >= 0x03000000
+ /* Add a dummy module object into sys.modules */
+  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
+#else
   PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
                                   swig_empty_runtime_method_table);
+#endif
   PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
   if (pointer && module) {
     PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
@@ -2325,7 +2539,7 @@ SWIGRUNTIME swig_type_info *
 SWIG_Python_TypeQuery(const char *type)
 {
   PyObject *cache = SWIG_Python_TypeCache();
-  PyObject *key = PyString_FromString(type); 
+  PyObject *key = SWIG_Python_str_FromChar(type); 
   PyObject *obj = PyDict_GetItem(cache, key);
   swig_type_info *descriptor;
   if (obj) {
@@ -2352,21 +2566,23 @@ SWIG_Python_TypeQuery(const char *type)
 
 SWIGRUNTIME int
 SWIG_Python_AddErrMesg(const char* mesg, int infront)
-{
+{  
   if (PyErr_Occurred()) {
     PyObject *type = 0;
     PyObject *value = 0;
     PyObject *traceback = 0;
     PyErr_Fetch(&type, &value, &traceback);
     if (value) {
+      char *tmp;
       PyObject *old_str = PyObject_Str(value);
       Py_XINCREF(type);
       PyErr_Clear();
       if (infront) {
-       PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str));
+       PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
       } else {
-       PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+       PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
       }
+      SWIG_Python_str_DelForPy3(tmp);
       Py_DECREF(old_str);
     }
     return 1;
@@ -2389,9 +2605,9 @@ SWIG_Python_ArgFail(int argnum)
 }
 
 SWIGRUNTIMEINLINE const char *
-PySwigObject_GetDesc(PyObject *self)
+SwigPyObject_GetDesc(PyObject *self)
 {
-  PySwigObject *v = (PySwigObject *)self;
+  SwigPyObject *v = (SwigPyObject *)self;
   swig_type_info *ty = v ? v->ty : 0;
   return ty ? ty->str : (char*)"";
 }
@@ -2401,10 +2617,10 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
 {
   if (type) {
 #if defined(SWIG_COBJECT_TYPES)
-    if (obj && PySwigObject_Check(obj)) {
-      const char *otype = (const char *) PySwigObject_GetDesc(obj);
+    if (obj && SwigPyObject_Check(obj)) {
+      const char *otype = (const char *) SwigPyObject_GetDesc(obj);
       if (otype) {
-       PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received",
+       PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'SwigPyObject(%s)' is received",
                     type, otype);
        return;
       }
@@ -2414,10 +2630,11 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
       const char *otype = (obj ? obj->ob_type->tp_name : 0); 
       if (otype) {
        PyObject *str = PyObject_Str(obj);
-       const char *cstr = str ? PyString_AsString(str) : 0;
+       const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0;
        if (cstr) {
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
                       type, otype, cstr);
+          SWIG_Python_str_DelForPy3(cstr);
        } else {
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
@@ -2439,10 +2656,12 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
   void *result;
   if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
     PyErr_Clear();
-    if (flags & SWIG_POINTER_EXCEPTION) {
+#if SWIG_POINTER_EXCEPTION
+    if (flags) {
       SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
       SWIG_Python_ArgFail(argnum);
     }
+#endif
   }
   return result;
 }
@@ -2577,15 +2796,15 @@ double PyFloat_AS_DOUBLE (PyObject *obj) {
 #define SWIGTYPE_p_CvTermCriteria swig_types[78]
 #define SWIGTYPE_p_CvTreeNodeIterator swig_types[79]
 #define SWIGTYPE_p_CvTypeInfo swig_types[80]
-#define SWIGTYPE_p_CvTypedSeqTCvConnectedComp_t swig_types[81]
-#define SWIGTYPE_p_CvTypedSeqTCvPoint2D32f_t swig_types[82]
-#define SWIGTYPE_p_CvTypedSeqTCvPoint_t swig_types[83]
-#define SWIGTYPE_p_CvTypedSeqTCvQuadEdge2D_t swig_types[84]
-#define SWIGTYPE_p_CvTypedSeqTCvRect_t swig_types[85]
-#define SWIGTYPE_p_CvTypedSeqTCvSeq_p_t swig_types[86]
-#define SWIGTYPE_p_CvTypedSeqTCvTupleTCvPoint_2_t_t swig_types[87]
-#define SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_2_t_t swig_types[88]
-#define SWIGTYPE_p_CvTypedSeqTCvTupleTfloat_3_t_t swig_types[89]
+#define SWIGTYPE_p_CvTypedSeqT_CvConnectedComp_t swig_types[81]
+#define SWIGTYPE_p_CvTypedSeqT_CvPoint2D32f_t swig_types[82]
+#define SWIGTYPE_p_CvTypedSeqT_CvPoint_t swig_types[83]
+#define SWIGTYPE_p_CvTypedSeqT_CvQuadEdge2D_t swig_types[84]
+#define SWIGTYPE_p_CvTypedSeqT_CvRect_t swig_types[85]
+#define SWIGTYPE_p_CvTypedSeqT_CvSeq_p_t swig_types[86]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t swig_types[87]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_2_t_t swig_types[88]
+#define SWIGTYPE_p_CvTypedSeqT_CvTupleT_float_3_t_t swig_types[89]
 #define SWIGTYPE_p_CvVideoWriter swig_types[90]
 #define SWIGTYPE_p_CvvImage swig_types[91]
 #define SWIGTYPE_p__IplConvKernel swig_types[92]
@@ -2598,20 +2817,21 @@ double PyFloat_AS_DOUBLE (PyObject *obj) {
 #define SWIGTYPE_p_difference_type swig_types[99]
 #define SWIGTYPE_p_f_int__void swig_types[100]
 #define SWIGTYPE_p_f_int_int_int_int_p_void__void swig_types[101]
-#define SWIGTYPE_p_float swig_types[102]
-#define SWIGTYPE_p_int swig_types[103]
-#define SWIGTYPE_p_long_long swig_types[104]
-#define SWIGTYPE_p_p_char swig_types[105]
-#define SWIGTYPE_p_signed_char swig_types[106]
-#define SWIGTYPE_p_size_t swig_types[107]
-#define SWIGTYPE_p_size_type swig_types[108]
-#define SWIGTYPE_p_unsigned_char swig_types[109]
-#define SWIGTYPE_p_unsigned_long_long swig_types[110]
-#define SWIGTYPE_p_unsigned_short swig_types[111]
-#define SWIGTYPE_p_value_type swig_types[112]
-#define SWIGTYPE_p_void swig_types[113]
-static swig_type_info *swig_types[115];
-static swig_module_info swig_module = {swig_types, 114, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_int_p_void__void swig_types[102]
+#define SWIGTYPE_p_float swig_types[103]
+#define SWIGTYPE_p_int swig_types[104]
+#define SWIGTYPE_p_long_long swig_types[105]
+#define SWIGTYPE_p_p_char swig_types[106]
+#define SWIGTYPE_p_signed_char swig_types[107]
+#define SWIGTYPE_p_size_t swig_types[108]
+#define SWIGTYPE_p_size_type swig_types[109]
+#define SWIGTYPE_p_unsigned_char swig_types[110]
+#define SWIGTYPE_p_unsigned_long_long swig_types[111]
+#define SWIGTYPE_p_unsigned_short swig_types[112]
+#define SWIGTYPE_p_value_type swig_types[113]
+#define SWIGTYPE_p_void swig_types[114]
+static swig_type_info *swig_types[116];
+static swig_module_info swig_module = {swig_types, 115, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2626,11 +2846,16 @@ static swig_module_info swig_module = {swig_types, 114, 0, 0, 0, 0};
 /*-----------------------------------------------
               @(target):= _highgui.so
   ------------------------------------------------*/
-#define SWIG_init    init_highgui
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_init    PyInit__highgui
+
+#else
+#  define SWIG_init    init_highgui
 
+#endif
 #define SWIG_name    "_highgui"
 
-#define SWIGVERSION 0x010331 
+#define SWIGVERSION 0x010339 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2642,26 +2867,28 @@ static swig_module_info swig_module = {swig_types, 114, 0, 0, 0, 0};
 
 
 namespace swig {
-  class PyObject_ptr {
+  class SwigPtr_PyObject {
   protected:
     PyObject *_obj;
 
   public:
-    PyObject_ptr() :_obj(0)
+    SwigPtr_PyObject() :_obj(0)
     {
     }
 
-    PyObject_ptr(const PyObject_ptr& item) : _obj(item._obj)
+    SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj)
     {
       Py_XINCREF(_obj);      
     }
     
-    PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj)
+    SwigPtr_PyObject(PyObject *obj, bool initial_ref = true) :_obj(obj)
     {
-      if (initial_ref) Py_XINCREF(_obj);
+      if (initial_ref) {
+        Py_XINCREF(_obj);
+      }
     }
     
-    PyObject_ptr & operator=(const PyObject_ptr& item) 
+    SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) 
     {
       Py_XINCREF(item._obj);
       Py_XDECREF(_obj);
@@ -2669,7 +2896,7 @@ namespace swig {
       return *this;      
     }
     
-    ~PyObject_ptr() 
+    ~SwigPtr_PyObject() 
     {
       Py_XDECREF(_obj);
     }
@@ -2688,10 +2915,10 @@ namespace swig {
 
 
 namespace swig {
-  struct PyObject_var : PyObject_ptr {
-    PyObject_var(PyObject* obj = 0) : PyObject_ptr(obj, false) { }
+  struct SwigVar_PyObject : SwigPtr_PyObject {
+    SwigVar_PyObject(PyObject* obj = 0) : SwigPtr_PyObject(obj, false) { }
     
-    PyObject_var & operator = (PyObject* obj)
+    SwigVar_PyObject & operator = (PyObject* obj)
     {
       Py_XDECREF(_obj);
       _obj = obj;
@@ -3091,14 +3318,12 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
 
 
 #include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN     LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX     LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX    ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
 #endif
 
 
@@ -3248,10 +3473,28 @@ SWIG_pchar_descriptor(void)
 SWIGINTERN int
 SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 {
-  if (PyString_Check(obj)) {
+#if PY_VERSION_HEX>=0x03000000
+  if (PyUnicode_Check(obj))
+#else  
+  if (PyString_Check(obj))
+#endif
+  {
     char *cstr; Py_ssize_t len;
+#if PY_VERSION_HEX>=0x03000000
+    if (!alloc && cptr) {
+        /* We can't allow converting without allocation, since the internal
+           representation of string in Python 3 is UCS-2/UCS-4 but we require
+           a UTF-8 representation.
+           TODO(bhy) More detailed explanation */
+        return SWIG_RuntimeError;
+    }
+    obj = PyUnicode_AsUTF8String(obj);
+    PyBytes_AsStringAndSize(obj, &cstr, &len);
+    if(alloc) *alloc = SWIG_NEWOBJ;
+#else
     PyString_AsStringAndSize(obj, &cstr, &len);
-    if (cptr)  {
+#endif
+    if (cptr) {
       if (alloc) {
        /* 
           In python the user should not be able to modify the inner
@@ -3276,10 +3519,16 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
          *alloc = SWIG_OLDOBJ;
        }
       } else {
-       *cptr = PyString_AsString(obj);
+        #if PY_VERSION_HEX>=0x03000000
+        assert(0); /* Should never reach here in Python 3 */
+        #endif
+       *cptr = SWIG_Python_str_AsChar(obj);
       }
     }
     if (psize) *psize = len + 1;
+#if PY_VERSION_HEX>=0x03000000
+    Py_XDECREF(obj);
+#endif
     return SWIG_OK;
   } else {
     swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
@@ -3378,93 +3627,104 @@ namespace swig {
   struct stop_iteration {
   };
 
-  struct PySwigIterator {
+  struct SwigPyIterator {
   private:
-    PyObject_ptr _seq;
+    SwigPtr_PyObject _seq;
 
   protected:
-    PySwigIterator(PyObject *seq) : _seq(seq)
+    SwigPyIterator(PyObject *seq) : _seq(seq)
     {
     }
       
   public:
-    virtual ~PySwigIterator() {}
+    virtual ~SwigPyIterator() {}
 
     // Access iterator method, required by Python
     virtual PyObject *value() const = 0;
 
     // Forward iterator method, required by Python
-    virtual PySwigIterator *incr(size_t n = 1) = 0;
+    virtual SwigPyIterator *incr(size_t n = 1) = 0;
     
     // Backward iterator method, very common in C++, but not required in Python
-    virtual PySwigIterator *decr(size_t n = 1)
+    virtual SwigPyIterator *decr(size_t /*n*/ = 1)
     {
       throw stop_iteration();
     }
 
     // Random access iterator methods, but not required in Python
-    virtual ptrdiff_t distance(const PySwigIterator &x) const
+    virtual ptrdiff_t distance(const SwigPyIterator &/*x*/) const
     {
       throw std::invalid_argument("operation not supported");
     }
 
-    virtual bool equal (const PySwigIterator &x) const
+    virtual bool equal (const SwigPyIterator &/*x*/) const
     {
       throw std::invalid_argument("operation not supported");
     }
     
     // C++ common/needed methods
-    virtual PySwigIterator *copy() const = 0;
+    virtual SwigPyIterator *copy() const = 0;
 
-    PyObject *next()
+    PyObject *next()     
     {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       PyObject *obj = value();
-      incr();
-      return obj;
+      incr();       
+      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
+      return obj;     
+    }
+
+    /* Make an alias for Python 3.x */
+    PyObject *__next__()
+    {
+      return next();
     }
 
     PyObject *previous()
     {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       decr();
-      return value();
+      PyObject *obj = value();
+      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads       
+      return obj;
     }
 
-    PySwigIterator *advance(ptrdiff_t n)
+    SwigPyIterator *advance(ptrdiff_t n)
     {
       return  (n > 0) ?  incr(n) : decr(-n);
     }
       
-    bool operator == (const PySwigIterator& x)  const
+    bool operator == (const SwigPyIterator& x)  const
     {
       return equal(x);
     }
       
-    bool operator != (const PySwigIterator& x) const
+    bool operator != (const SwigPyIterator& x) const
     {
       return ! operator==(x);
     }
       
-    PySwigIterator& operator += (ptrdiff_t n)
+    SwigPyIterator& operator += (ptrdiff_t n)
     {
       return *advance(n);
     }
 
-    PySwigIterator& operator -= (ptrdiff_t n)
+    SwigPyIterator& operator -= (ptrdiff_t n)
     {
       return *advance(-n);
     }
       
-    PySwigIterator* operator + (ptrdiff_t n) const
+    SwigPyIterator* operator + (ptrdiff_t n) const
     {
       return copy()->advance(n);
     }
 
-    PySwigIterator* operator - (ptrdiff_t n) const
+    SwigPyIterator* operator - (ptrdiff_t n) const
     {
       return copy()->advance(-n);
     }
       
-    ptrdiff_t operator - (const PySwigIterator& x) const
+    ptrdiff_t operator - (const SwigPyIterator& x) const
     {
       return x.distance(*this);
     }
@@ -3473,7 +3733,7 @@ namespace swig {
       static int init = 0;
       static swig_type_info* desc = 0;
       if (!init) {
-       desc = SWIG_TypeQuery("swig::PySwigIterator *");
+       desc = SWIG_TypeQuery("swig::SwigPyIterator *");
        init = 1;
       }        
       return desc;
@@ -3597,7 +3857,7 @@ namespace swig {
   struct traits_asptr {   
     static int asptr(PyObject *obj, Type **val) {
       Type *p;
-      int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0;
+      int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
       if (SWIG_IsOK(res)) {
        if (val) *val = p;
       }
@@ -3662,7 +3922,7 @@ namespace swig {
       int res = asval(obj, &v);
       if (!obj || !SWIG_IsOK(res)) {
        if (!PyErr_Occurred()) {
-         SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
+         ::SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
        }
        if (throw_error) throw std::invalid_argument("bad type");
       }
@@ -3752,27 +4012,38 @@ namespace std {
     { 
       bool res;
       SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      res = PyObject_Compare(v, w) < 0;
+      res = PyObject_RichCompareBool(v, w, Py_LT) ? true : false;
+      /* This may fall into a case of inconsistent
+               eg. ObjA > ObjX > ObjB
+               but ObjA < ObjB
+      */
+      if( PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_TypeError) )
+      {
+        /* Objects can't be compared, this mostly occured in Python 3.0 */
+        /* Compare their ptr directly for a workaround */
+        res = (v < w);
+        PyErr_Clear();
+      }
       SWIG_PYTHON_THREAD_END_BLOCK;
       return res;
     }
   };
 
   template <>
-  struct less <swig::PyObject_ptr>: public binary_function<swig::PyObject_ptr, swig::PyObject_ptr, bool>
+  struct less <swig::SwigPtr_PyObject>: public binary_function<swig::SwigPtr_PyObject, swig::SwigPtr_PyObject, bool>
   {
     bool
-    operator()(const swig::PyObject_ptr& v, const swig::PyObject_ptr& w) const
+    operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const
     {
       return std::less<PyObject *>()(v, w);
     }
   };
 
   template <>
-  struct less <swig::PyObject_var>: public binary_function<swig::PyObject_var, swig::PyObject_var, bool>
+  struct less <swig::SwigVar_PyObject>: public binary_function<swig::SwigVar_PyObject, swig::SwigVar_PyObject, bool>
   {
     bool
-    operator()(const swig::PyObject_var& v, const swig::PyObject_var& w) const
+    operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const
     {
       return std::less<PyObject *>()(v, w);
     }
@@ -3914,23 +4185,27 @@ namespace swig {
 }
 
 
+#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
+#  if !defined(SWIG_NO_STD_NOITERATOR_TRAITS_STL)
+#    define SWIG_STD_NOITERATOR_TRAITS_STL
+#  endif
+#endif
+
 #if !defined(SWIG_STD_NOITERATOR_TRAITS_STL)
 #include <iterator>
 #else
-namespace std  {
+namespace std {
   template <class Iterator>
   struct iterator_traits {
     typedef ptrdiff_t difference_type;
     typedef typename Iterator::value_type value_type;
   };
 
-#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
   template <class Iterator, class Category,class T, class Reference, class Pointer, class Distance>
   struct iterator_traits<__reverse_bi_iterator<Iterator,Category,T,Reference,Pointer,Distance> > {
     typedef Distance difference_type;
     typedef T value_type;
   };
-#endif  
 
   template <class T>
   struct iterator_traits<T*> {
@@ -3948,22 +4223,21 @@ namespace std  {
     }
     return __n;
   }
-
-} 
+}
 #endif
 
 
 namespace swig {
   template<typename OutIterator>
-  class PySwigIterator_T :  public PySwigIterator
+  class SwigPyIterator_T :  public SwigPyIterator
   {
   public:
     typedef OutIterator out_iterator;
     typedef typename std::iterator_traits<out_iterator>::value_type value_type;    
-    typedef PySwigIterator_T<out_iterator> self_type;
+    typedef SwigPyIterator_T<out_iterator> self_type;
 
-    PySwigIterator_T(out_iterator curr, PyObject *seq)
-      : PySwigIterator(seq), current(curr)
+    SwigPyIterator_T(out_iterator curr, PyObject *seq)
+      : SwigPyIterator(seq), current(curr)
     {
     }
 
@@ -3973,7 +4247,7 @@ namespace swig {
     }
 
     
-    bool equal (const PySwigIterator &iter) const
+    bool equal (const SwigPyIterator &iter) const
     {
       const self_type *iters = dynamic_cast<const self_type *>(&iter);
       if (iters) {
@@ -3983,7 +4257,7 @@ namespace swig {
       }
     }
     
-    ptrdiff_t distance(const PySwigIterator &iter) const
+    ptrdiff_t distance(const SwigPyIterator &iter) const
     {
       const self_type *iters = dynamic_cast<const self_type *>(&iter);
       if (iters) {
@@ -4011,17 +4285,17 @@ namespace swig {
   template<typename OutIterator, 
           typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
           typename FromOper = from_oper<ValueType> >
-  class PySwigIteratorOpen_T :  public PySwigIterator_T<OutIterator>
+  class SwigPyIteratorOpen_T :  public SwigPyIterator_T<OutIterator>
   {
   public:
     FromOper from;
     typedef OutIterator out_iterator;
     typedef ValueType value_type;
-    typedef PySwigIterator_T<out_iterator>  base;
-    typedef PySwigIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
+    typedef SwigPyIterator_T<out_iterator>  base;
+    typedef SwigPyIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
     
-    PySwigIteratorOpen_T(out_iterator curr, PyObject *seq)
-      : PySwigIterator_T<OutIterator>(curr, seq)
+    SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq)
+      : SwigPyIterator_T<OutIterator>(curr, seq)
     {
     }
     
@@ -4029,12 +4303,12 @@ namespace swig {
       return from(static_cast<const value_type&>(*(base::current)));
     }
     
-    PySwigIterator *copy() const
+    SwigPyIterator *copy() const
     {
       return new self_type(*this);
     }
 
-    PySwigIterator *incr(size_t n = 1)
+    SwigPyIterator *incr(size_t n = 1)
     {
       while (n--) {
        ++base::current;
@@ -4042,7 +4316,7 @@ namespace swig {
       return this;
     }
 
-    PySwigIterator *decr(size_t n = 1)
+    SwigPyIterator *decr(size_t n = 1)
     {
       while (n--) {
        --base::current;
@@ -4054,17 +4328,17 @@ namespace swig {
   template<typename OutIterator, 
           typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
           typename FromOper = from_oper<ValueType> >
-  class PySwigIteratorClosed_T :  public PySwigIterator_T<OutIterator>
+  class SwigPyIteratorClosed_T :  public SwigPyIterator_T<OutIterator>
   {
   public:
     FromOper from;
     typedef OutIterator out_iterator;
     typedef ValueType value_type;
-    typedef PySwigIterator_T<out_iterator>  base;    
-    typedef PySwigIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
+    typedef SwigPyIterator_T<out_iterator>  base;    
+    typedef SwigPyIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
     
-    PySwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
-      : PySwigIterator_T<OutIterator>(curr, seq), begin(first), end(last)
+    SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
+      : SwigPyIterator_T<OutIterator>(curr, seq), begin(first), end(last)
     {
     }
     
@@ -4076,12 +4350,12 @@ namespace swig {
       }
     }
     
-    PySwigIterator *copy() const
+    SwigPyIterator *copy() const
     {
       return new self_type(*this);
     }
 
-    PySwigIterator *incr(size_t n = 1)
+    SwigPyIterator *incr(size_t n = 1)
     {
       while (n--) {
        if (base::current == end) {
@@ -4093,7 +4367,7 @@ namespace swig {
       return this;
     }
 
-    PySwigIterator *decr(size_t n = 1)
+    SwigPyIterator *decr(size_t n = 1)
     {
       while (n--) {
        if (base::current == begin) {
@@ -4111,17 +4385,17 @@ namespace swig {
   };
 
   template<typename OutIter>
-  inline PySwigIterator*
+  inline SwigPyIterator*
   make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
   {
-    return new PySwigIteratorClosed_T<OutIter>(current, begin, end, seq);
+    return new SwigPyIteratorClosed_T<OutIter>(current, begin, end, seq);
   }
 
   template<typename OutIter>
-  inline PySwigIterator*
+  inline SwigPyIterator*
   make_output_iterator(const OutIter& current, PyObject *seq = 0)
   {
-    return new PySwigIteratorOpen_T<OutIter>(current, seq);
+    return new SwigPyIteratorOpen_T<OutIter>(current, seq);
   }
 }
 
@@ -4129,23 +4403,23 @@ namespace swig {
 namespace swig
 {
   template <class T>
-  struct PySequence_Ref
+  struct SwigPySequence_Ref
   {
-    PySequence_Ref(PyObject* seq, int index)
+    SwigPySequence_Ref(PyObject* seq, int index)
       : _seq(seq), _index(index)
     {
     }
     
     operator T () const
     {
-      swig::PyObject_var item = PySequence_GetItem(_seq, _index);
+      swig::SwigVar_PyObject item = PySequence_GetItem(_seq, _index);
       try {
        return swig::as<T>(item, true);
       } catch (std::exception& e) {
        char msg[1024];
        sprintf(msg, "in sequence element %d ", _index);
        if (!PyErr_Occurred()) {
-         SWIG_Error(SWIG_TypeError,  swig::type_name<T>());
+         ::SWIG_Error(SWIG_TypeError,  swig::type_name<T>());
        }
        SWIG_Python_AddErrorMsg(msg);
        SWIG_Python_AddErrorMsg(e.what());
@@ -4153,7 +4427,7 @@ namespace swig
       }
     }
 
-    PySequence_Ref& operator=(const T& v)
+    SwigPySequence_Ref& operator=(const T& v)
     {
       PySequence_SetItem(_seq, _index, swig::from<T>(v));
       return *this;
@@ -4165,18 +4439,18 @@ namespace swig
   };
 
   template <class T>
-  struct PySequence_ArrowProxy
+  struct SwigPySequence_ArrowProxy
   {
-    PySequence_ArrowProxy(const T& x): m_value(x) {}
+    SwigPySequence_ArrowProxy(const T& x): m_value(x) {}
     const T* operator->() const { return &m_value; }
     operator const T*() const { return &m_value; }
     T m_value;
   };
 
   template <class T, class Reference >
-  struct PySequence_InputIterator
+  struct SwigPySequence_InputIterator
   {
-    typedef PySequence_InputIterator<T, Reference > self;
+    typedef SwigPySequence_InputIterator<T, Reference > self;
 
     typedef std::random_access_iterator_tag iterator_category;
     typedef Reference reference;
@@ -4184,11 +4458,11 @@ namespace swig
     typedef T* pointer;
     typedef int difference_type;
 
-    PySequence_InputIterator()
+    SwigPySequence_InputIterator()
     {
     }
 
-    PySequence_InputIterator(PyObject* seq, int index)
+    SwigPySequence_InputIterator(PyObject* seq, int index)
       : _seq(seq), _index(index)
     {
     }
@@ -4198,9 +4472,9 @@ namespace swig
       return reference(_seq, _index);
     }
 
-    PySequence_ArrowProxy<T>
+    SwigPySequence_ArrowProxy<T>
     operator->() const {
-      return PySequence_ArrowProxy<T>(operator*());
+      return SwigPySequence_ArrowProxy<T>(operator*());
     }
 
     bool operator==(const self& ri) const
@@ -4269,19 +4543,19 @@ namespace swig
   };
 
   template <class T>
-  struct PySequence_Cont
+  struct SwigPySequence_Cont
   {
-    typedef PySequence_Ref<T> reference;
-    typedef const PySequence_Ref<T> const_reference;
+    typedef SwigPySequence_Ref<T> reference;
+    typedef const SwigPySequence_Ref<T> const_reference;
     typedef T value_type;
     typedef T* pointer;
     typedef int difference_type;
     typedef int size_type;
     typedef const pointer const_pointer;
-    typedef PySequence_InputIterator<T, reference> iterator;
-    typedef PySequence_InputIterator<T, const_reference> const_iterator;
+    typedef SwigPySequence_InputIterator<T, reference> iterator;
+    typedef SwigPySequence_InputIterator<T, const_reference> const_iterator;
 
-    PySequence_Cont(PyObject* seq) : _seq(0)
+    SwigPySequence_Cont(PyObject* seq) : _seq(0)
     {
       if (!PySequence_Check(seq)) {
        throw std::invalid_argument("a sequence is expected");
@@ -4290,14 +4564,14 @@ namespace swig
       Py_INCREF(_seq);
     }
 
-    ~PySequence_Cont()
+    ~SwigPySequence_Cont()
     {
-      if (_seq) Py_DECREF(_seq);
+      Py_XDECREF(_seq);
     }
 
     size_type size() const
     {
-      return PySequence_Size(_seq);
+      return static_cast<size_type>(PySequence_Size(_seq));
     }
 
     bool empty() const
@@ -4339,7 +4613,7 @@ namespace swig
     {
       int s = size();
       for (int i = 0; i < s; ++i) {
-       swig::PyObject_var item = PySequence_GetItem(_seq, i);
+       swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i);
        if (!swig::check<value_type>(item)) {
          if (set_err) {
            char msg[1024];
@@ -4405,7 +4679,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
       return pchar_descriptor ? 
        SWIG_NewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
     } else {
+#if PY_VERSION_HEX >= 0x03000000
+      return PyUnicode_FromStringAndSize(carray, static_cast< int >(size));
+#else
       return PyString_FromStringAndSize(carray, static_cast< int >(size));
+#endif
     }
   } else {
     return SWIG_Py_Void();
@@ -4473,11 +4751,11 @@ extern "C" {
 SWIGINTERN PyObject *_wrap_new_CvRNG_Wrapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG *arg1 = 0 ;
-  CvRNG_Wrapper *result = 0 ;
   CvRNG temp1 ;
   unsigned long long val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG_Wrapper *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvRNG_Wrapper",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_long_SS_long(obj0, &val1);
@@ -4497,10 +4775,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
-  CvRNG *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRNG_Wrapper_ptr",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -4519,10 +4797,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
-  CvRNG *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRNG_Wrapper_ref",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -4530,10 +4808,7 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper_ref" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = reinterpret_cast< CvRNG_Wrapper * >(argp1);
-  {
-    CvRNG &_result_ref = (arg1)->ref();
-    result = (CvRNG *) &_result_ref;
-  }
+  result = (CvRNG *) &(arg1)->ref();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_long_long, 0 |  0 );
   return resultobj;
 fail:
@@ -4545,13 +4820,13 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper___eq__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRNG_Wrapper___eq__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -4579,13 +4854,13 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper___ne__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRNG_Wrapper___ne__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -4624,7 +4899,7 @@ SWIGINTERN PyObject *_wrap_delete_CvRNG_Wrapper(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvRNG_Wrapper * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -4640,7 +4915,7 @@ fail:
 
 SWIGINTERN PyObject *CvRNG_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvRNG_Wrapper, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4648,11 +4923,11 @@ SWIGINTERN PyObject *CvRNG_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self),
 SWIGINTERN PyObject *_wrap_new_CvSubdiv2DEdge_Wrapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge *arg1 = 0 ;
-  CvSubdiv2DEdge_Wrapper *result = 0 ;
   CvSubdiv2DEdge temp1 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge_Wrapper *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvSubdiv2DEdge_Wrapper",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
@@ -4672,10 +4947,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
-  CvSubdiv2DEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DEdge_Wrapper_ptr",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -4694,10 +4969,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
-  CvSubdiv2DEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DEdge_Wrapper_ref",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -4705,10 +4980,7 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ref(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper_ref" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = reinterpret_cast< CvSubdiv2DEdge_Wrapper * >(argp1);
-  {
-    CvSubdiv2DEdge &_result_ref = (arg1)->ref();
-    result = (CvSubdiv2DEdge *) &_result_ref;
-  }
+  result = (CvSubdiv2DEdge *) &(arg1)->ref();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_size_t, 0 |  0 );
   return resultobj;
 fail:
@@ -4720,13 +4992,13 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper___eq__(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSubdiv2DEdge_Wrapper___eq__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -4754,13 +5026,13 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper___ne__(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSubdiv2DEdge_Wrapper___ne__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -4799,7 +5071,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSubdiv2DEdge_Wrapper(PyObject *SWIGUNUSEDPAR
   arg1 = reinterpret_cast< CvSubdiv2DEdge_Wrapper * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -4815,7 +5087,7 @@ fail:
 
 SWIGINTERN PyObject *CvSubdiv2DEdge_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4883,7 +5155,7 @@ SWIGINTERN PyObject *_wrap_cvSetMouseCallback(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -4914,7 +5186,10 @@ SWIGINTERN PyObject *_wrap_cvSetMouseCallback(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvSetMouseCallback'.\n  Possible C/C++ prototypes are:\n    cvSetMouseCallbackPy(char const *,PyObject *,PyObject *)\n    cvSetMouseCallbackPy(char const *,PyObject *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvSetMouseCallback'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvSetMouseCallbackPy(char const *,PyObject *,PyObject *)\n"
+    "    cvSetMouseCallbackPy(char const *,PyObject *)\n");
   return NULL;
 }
 
@@ -5025,34 +5300,34 @@ static void icvPyTrackbarCB9(int pos){
 
 
        PyCvTrackbar my_trackbar_cb_funcs[ICV_PY_MAX_CB] = {
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB0, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB1, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB2, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB3, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB4, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB5, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB6, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB7, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB8, NULL, NULL }
 /*@SWIG@*/,
-               /*@SWIG:%ICV_PY_CB_TAB_ENTRY@*/
+               /*@SWIG:highgui.i,181,%ICV_PY_CB_TAB_ENTRY@*/
        {(CvTrackbarCallback) icvPyTrackbarCB9, NULL, NULL }
 /*@SWIG@*/
        };
@@ -5060,10 +5335,10 @@ static void icvPyTrackbarCB9(int pos){
 SWIGINTERN PyObject *_wrap_cvWaitKey__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  PyObject *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvWaitKey",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -5098,7 +5373,7 @@ SWIGINTERN PyObject *_wrap_cvWaitKey(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -5117,7 +5392,10 @@ SWIGINTERN PyObject *_wrap_cvWaitKey(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvWaitKey'.\n  Possible C/C++ prototypes are:\n    cvWaitKeyPy(int)\n    cvWaitKeyPy()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvWaitKey'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvWaitKeyPy(int)\n"
+    "    cvWaitKeyPy()\n");
   return NULL;
 }
 
@@ -5126,7 +5404,6 @@ SWIGINTERN PyObject *_wrap_cvLoadImage__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   int arg2 ;
-  CvMat *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -5134,6 +5411,7 @@ SWIGINTERN PyObject *_wrap_cvLoadImage__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvLoadImage",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -5167,11 +5445,11 @@ fail:
 SWIGINTERN PyObject *_wrap_cvLoadImage__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  CvMat *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvLoadImage",&obj0)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -5203,7 +5481,7 @@ SWIGINTERN PyObject *_wrap_cvLoadImage(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -5231,7 +5509,10 @@ SWIGINTERN PyObject *_wrap_cvLoadImage(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvLoadImage'.\n  Possible C/C++ prototypes are:\n    cvLoadImageMat(char const *,int)\n    cvLoadImageMat(char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'cvLoadImage'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    cvLoadImageMat(char const *,int)\n"
+    "    cvLoadImageMat(char const *)\n");
   return NULL;
 }
 
@@ -5239,10 +5520,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvRetrieveFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvCapture *arg1 = (CvCapture *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvRetrieveFrame",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
@@ -5269,10 +5550,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvQueryFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvCapture *arg1 = (CvCapture *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvQueryFrame",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
@@ -5300,13 +5581,13 @@ SWIGINTERN PyObject *_wrap_cvInitSystem(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   int arg1 ;
   char **arg2 = (char **) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   void *vptr2 ;
   char *buffer2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvInitSystem",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -5362,7 +5643,6 @@ SWIGINTERN PyObject *_wrap_cvNamedWindow(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   int arg2 = (int) 1 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -5370,6 +5650,7 @@ SWIGINTERN PyObject *_wrap_cvNamedWindow(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvNamedWindow",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -5609,11 +5890,11 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGetWindowHandle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  void *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  void *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetWindowHandle",&obj0)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -5642,9 +5923,9 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGetWindowName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   void *arg1 = (void *) 0 ;
-  char *result = 0 ;
   int res1 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGetWindowName",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0);
@@ -5674,7 +5955,6 @@ SWIGINTERN PyObject *_wrap_cvCreateTrackbar(PyObject *SWIGUNUSEDPARM(self), PyOb
   int *arg3 = (int *) 0 ;
   int arg4 ;
   CvTrackbarCallback arg5 = (CvTrackbarCallback) 0 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -5688,6 +5968,7 @@ SWIGINTERN PyObject *_wrap_cvCreateTrackbar(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:cvCreateTrackbar",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -5747,11 +6028,87 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_cvGetTrackbarPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_cvCreateTrackbar2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
+  int *arg3 = (int *) 0 ;
+  int arg4 ;
+  CvTrackbarCallback2 arg5 = (CvTrackbarCallback2) 0 ;
+  void *arg6 = (void *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int res6 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
   int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:cvCreateTrackbar2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvCreateTrackbar2" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "cvCreateTrackbar2" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    arg3 = (int *)malloc (sizeof (int));
+    *arg3 = PyInt_AsLong (obj2);
+  }
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "cvCreateTrackbar2" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  {
+    int res = SWIG_ConvertFunctionPtr(obj4, (void**)(&arg5), SWIGTYPE_p_f_int_p_void__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "cvCreateTrackbar2" "', argument " "5"" of type '" "CvTrackbarCallback2""'"); 
+    }
+  }
+  if (obj5) {
+    res6 = SWIG_ConvertPtr(obj5,SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "cvCreateTrackbar2" "', argument " "6"" of type '" "void *""'"); 
+    }
+  }
+  {
+    try {
+      result = (int)cvCreateTrackbar2((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_cvGetTrackbarPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -5760,6 +6117,7 @@ SWIGINTERN PyObject *_wrap_cvGetTrackbarPos(PyObject *SWIGUNUSEDPARM(self), PyOb
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGetTrackbarPos",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -5898,7 +6256,6 @@ SWIGINTERN PyObject *_wrap_cvLoadImageM(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
   int arg2 = (int) 1 ;
-  CvMat *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -5906,6 +6263,7 @@ SWIGINTERN PyObject *_wrap_cvLoadImageM(PyObject *SWIGUNUSEDPARM(self), PyObject
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvLoadImageM",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -5943,7 +6301,6 @@ SWIGINTERN PyObject *_wrap_cvSaveImage(PyObject *SWIGUNUSEDPARM(self), PyObject
   char *arg1 = (char *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   int *arg3 = (int *) 0 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -5953,6 +6310,7 @@ SWIGINTERN PyObject *_wrap_cvSaveImage(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvSaveImage",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -6006,12 +6364,12 @@ SWIGINTERN PyObject *_wrap_cvDecodeImage(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 = (int) 1 ;
-  IplImage *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvDecodeImage",&obj0,&obj1)) SWIG_fail;
   {
@@ -6059,12 +6417,12 @@ SWIGINTERN PyObject *_wrap_cvDecodeImageM(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 = (int) 1 ;
-  CvMat *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvDecodeImageM",&obj0,&obj1)) SWIG_fail;
   {
@@ -6110,7 +6468,6 @@ SWIGINTERN PyObject *_wrap_cvEncodeImage(PyObject *SWIGUNUSEDPARM(self), PyObjec
   char *arg1 = (char *) 0 ;
   CvArr *arg2 = (CvArr *) 0 ;
   int *arg3 = (int *) 0 ;
-  CvMat *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -6120,6 +6477,7 @@ SWIGINTERN PyObject *_wrap_cvEncodeImage(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO|O:cvEncodeImage",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -6243,10 +6601,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvWaitKeyC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 = (int) 0 ;
-  int result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"|O:cvWaitKeyC",&obj0)) SWIG_fail;
   if (obj0) {
@@ -6275,11 +6633,11 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCreateFileCapture(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  CvCapture *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvCapture *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCreateFileCapture",&obj0)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -6308,10 +6666,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvCreateCameraCapture(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  CvCapture *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvCapture *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvCreateCameraCapture",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -6338,10 +6696,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvGrabFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvCapture *arg1 = (CvCapture *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvGrabFrame",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
@@ -6369,13 +6727,13 @@ SWIGINTERN PyObject *_wrap_cvRetrieveFrame__Deprecated(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   CvCapture *arg1 = (CvCapture *) 0 ;
   int arg2 = (int) 0 ;
-  IplImage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O|O:cvRetrieveFrame__Deprecated",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
@@ -6412,10 +6770,10 @@ fail:
 SWIGINTERN PyObject *_wrap_cvQueryFrame__Deprecated(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvCapture *arg1 = (CvCapture *) 0 ;
-  IplImage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:cvQueryFrame__Deprecated",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
@@ -6446,13 +6804,13 @@ SWIGINTERN PyObject *_wrap_cvGetCaptureProperty(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvCapture *arg1 = (CvCapture *) 0 ;
   int arg2 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvGetCaptureProperty",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
@@ -6486,7 +6844,6 @@ SWIGINTERN PyObject *_wrap_cvSetCaptureProperty(PyObject *SWIGUNUSEDPARM(self),
   CvCapture *arg1 = (CvCapture *) 0 ;
   int arg2 ;
   double arg3 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -6496,6 +6853,7 @@ SWIGINTERN PyObject *_wrap_cvSetCaptureProperty(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:cvSetCaptureProperty",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
@@ -6529,13 +6887,42 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_cvGetCaptureDomain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CvCapture *arg1 = (CvCapture *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:cvGetCaptureDomain",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvCapture, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cvGetCaptureDomain" "', argument " "1"" of type '" "CvCapture *""'"); 
+  }
+  arg1 = reinterpret_cast< CvCapture * >(argp1);
+  {
+    try {
+      result = (int)cvGetCaptureDomain(arg1); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_CV_FOURCC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char arg1 ;
   char arg2 ;
   char arg3 ;
   char arg4 ;
-  int result;
   char val1 ;
   int ecode1 = 0 ;
   char val2 ;
@@ -6548,6 +6935,7 @@ SWIGINTERN PyObject *_wrap_CV_FOURCC(PyObject *SWIGUNUSEDPARM(self), PyObject *a
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CV_FOURCC",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_char(obj0, &val1);
@@ -6593,7 +6981,6 @@ SWIGINTERN PyObject *_wrap_cvCreateVideoWriter(PyObject *SWIGUNUSEDPARM(self), P
   double arg3 ;
   CvSize arg4 ;
   int arg5 = (int) 1 ;
-  CvVideoWriter *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -6609,6 +6996,7 @@ SWIGINTERN PyObject *_wrap_cvCreateVideoWriter(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvVideoWriter *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:cvCreateVideoWriter",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -6676,12 +7064,12 @@ SWIGINTERN PyObject *_wrap_cvWriteFrame(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject *resultobj = 0;
   CvVideoWriter *arg1 = (CvVideoWriter *) 0 ;
   IplImage *arg2 = (IplImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   IplImage header2 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:cvWriteFrame",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVideoWriter, 0 |  0 );
@@ -6750,7 +7138,7 @@ SWIGINTERN PyObject *_wrap_delete_CvvImage(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = reinterpret_cast< CvvImage * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -6771,7 +7159,6 @@ SWIGINTERN PyObject *_wrap_CvvImage_Create__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   int arg3 ;
   int arg4 ;
   int arg5 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -6787,6 +7174,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_Create__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvvImage_Create",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -6836,7 +7224,6 @@ SWIGINTERN PyObject *_wrap_CvvImage_Create__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   int arg2 ;
   int arg3 ;
   int arg4 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -6849,6 +7236,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_Create__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvvImage_Create",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -6893,7 +7281,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_Create(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -6959,7 +7347,10 @@ SWIGINTERN PyObject *_wrap_CvvImage_Create(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvvImage_Create'.\n  Possible C/C++ prototypes are:\n    Create(int,int,int,int)\n    Create(int,int,int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvvImage_Create'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Create(CvvImage *,int,int,int,int)\n"
+    "    Create(CvvImage *,int,int,int)\n");
   return NULL;
 }
 
@@ -6969,7 +7360,6 @@ SWIGINTERN PyObject *_wrap_CvvImage_Load__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   CvvImage *arg1 = (CvvImage *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -6980,6 +7370,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_Load__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvvImage_Load",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -7019,7 +7410,6 @@ SWIGINTERN PyObject *_wrap_CvvImage_Load__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvvImage *arg1 = (CvvImage *) 0 ;
   char *arg2 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -7027,6 +7417,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_Load__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvvImage_Load",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -7063,7 +7454,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_Load(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -7101,7 +7492,10 @@ SWIGINTERN PyObject *_wrap_CvvImage_Load(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvvImage_Load'.\n  Possible C/C++ prototypes are:\n    Load(char const *,int)\n    Load(char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvvImage_Load'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Load(CvvImage *,char const *,int)\n"
+    "    Load(CvvImage *,char const *)\n");
   return NULL;
 }
 
@@ -7112,7 +7506,6 @@ SWIGINTERN PyObject *_wrap_CvvImage_LoadRect(PyObject *SWIGUNUSEDPARM(self), PyO
   char *arg2 = (char *) 0 ;
   int arg3 ;
   CvRect arg4 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -7125,6 +7518,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_LoadRect(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvvImage_LoadRect",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -7185,7 +7579,6 @@ SWIGINTERN PyObject *_wrap_CvvImage_Save(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvvImage *arg1 = (CvvImage *) 0 ;
   char *arg2 = (char *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -7193,6 +7586,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_Save(PyObject *SWIGUNUSEDPARM(self), PyObjec
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvvImage_Save",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -7411,7 +7805,7 @@ SWIGINTERN PyObject *_wrap_CvvImage_CopyOf(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -7485,7 +7879,12 @@ SWIGINTERN PyObject *_wrap_CvvImage_CopyOf(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvvImage_CopyOf'.\n  Possible C/C++ prototypes are:\n    CopyOf(CvvImage &,int)\n    CopyOf(CvvImage &)\n    CopyOf(IplImage *,int)\n    CopyOf(IplImage *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvvImage_CopyOf'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CopyOf(CvvImage *,CvvImage &,int)\n"
+    "    CopyOf(CvvImage *,CvvImage &)\n"
+    "    CopyOf(CvvImage *,IplImage *,int)\n"
+    "    CopyOf(CvvImage *,IplImage *)\n");
   return NULL;
 }
 
@@ -7493,10 +7892,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvvImage_GetImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvvImage *arg1 = (CvvImage *) 0 ;
-  IplImage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  IplImage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvvImage_GetImage",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -7555,10 +7954,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvvImage_Width(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvvImage *arg1 = (CvvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvvImage_Width",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -7585,10 +7984,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvvImage_Height(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvvImage *arg1 = (CvvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvvImage_Height",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -7615,10 +8014,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvvImage_Bpp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvvImage *arg1 = (CvvImage *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvvImage_Bpp",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvvImage, 0 |  0 );
@@ -7723,7 +8122,7 @@ fail:
 
 SWIGINTERN PyObject *CvvImage_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvvImage, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7743,7 +8142,7 @@ SWIGINTERN PyObject *_wrap_delete_CvCapture(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< CvCapture * >(argp1);
   {
     try {
-      delete_CvCapture(arg1);
+      delete_CvCapture(arg1); 
     } 
     catch (...) 
     {
@@ -7759,7 +8158,7 @@ fail:
 
 SWIGINTERN PyObject *CvCapture_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvCapture, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -7779,7 +8178,7 @@ SWIGINTERN PyObject *_wrap_delete_CvVideoWriter(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvVideoWriter * >(argp1);
   {
     try {
-      delete_CvVideoWriter(arg1);
+      delete_CvVideoWriter(arg1); 
     } 
     catch (...) 
     {
@@ -7795,80 +8194,106 @@ fail:
 
 SWIGINTERN PyObject *CvVideoWriter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvVideoWriter, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 static PyMethodDef SwigMethods[] = {
+        { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
         { (char *)"new_CvRNG_Wrapper", _wrap_new_CvRNG_Wrapper, METH_VARARGS, NULL},
         { (char *)"CvRNG_Wrapper_ptr", _wrap_CvRNG_Wrapper_ptr, METH_VARARGS, NULL},
         { (char *)"CvRNG_Wrapper_ref", _wrap_CvRNG_Wrapper_ref, METH_VARARGS, NULL},
         { (char *)"CvRNG_Wrapper___eq__", _wrap_CvRNG_Wrapper___eq__, METH_VARARGS, NULL},
         { (char *)"CvRNG_Wrapper___ne__", _wrap_CvRNG_Wrapper___ne__, METH_VARARGS, NULL},
-        { (char *)"delete_CvRNG_Wrapper", _wrap_delete_CvRNG_Wrapper, METH_VARARGS, NULL},
+        { (char *)"delete_CvRNG_Wrapper", _wrap_delete_CvRNG_Wrapper, METH_VARARGS, (char *)"delete_CvRNG_Wrapper(CvRNG_Wrapper self)"},
         { (char *)"CvRNG_Wrapper_swigregister", CvRNG_Wrapper_swigregister, METH_VARARGS, NULL},
         { (char *)"new_CvSubdiv2DEdge_Wrapper", _wrap_new_CvSubdiv2DEdge_Wrapper, METH_VARARGS, NULL},
         { (char *)"CvSubdiv2DEdge_Wrapper_ptr", _wrap_CvSubdiv2DEdge_Wrapper_ptr, METH_VARARGS, NULL},
         { (char *)"CvSubdiv2DEdge_Wrapper_ref", _wrap_CvSubdiv2DEdge_Wrapper_ref, METH_VARARGS, NULL},
         { (char *)"CvSubdiv2DEdge_Wrapper___eq__", _wrap_CvSubdiv2DEdge_Wrapper___eq__, METH_VARARGS, NULL},
         { (char *)"CvSubdiv2DEdge_Wrapper___ne__", _wrap_CvSubdiv2DEdge_Wrapper___ne__, METH_VARARGS, NULL},
-        { (char *)"delete_CvSubdiv2DEdge_Wrapper", _wrap_delete_CvSubdiv2DEdge_Wrapper, METH_VARARGS, NULL},
+        { (char *)"delete_CvSubdiv2DEdge_Wrapper", _wrap_delete_CvSubdiv2DEdge_Wrapper, METH_VARARGS, (char *)"delete_CvSubdiv2DEdge_Wrapper(CvSubdiv2DEdge_Wrapper self)"},
         { (char *)"CvSubdiv2DEdge_Wrapper_swigregister", CvSubdiv2DEdge_Wrapper_swigregister, METH_VARARGS, NULL},
         { (char *)"cvSetMouseCallback", _wrap_cvSetMouseCallback, METH_VARARGS, NULL},
         { (char *)"cvWaitKey", _wrap_cvWaitKey, METH_VARARGS, NULL},
-        { (char *)"cvLoadImage", _wrap_cvLoadImage, METH_VARARGS, NULL},
-        { (char *)"cvRetrieveFrame", _wrap_cvRetrieveFrame, METH_VARARGS, NULL},
-        { (char *)"cvQueryFrame", _wrap_cvQueryFrame, METH_VARARGS, NULL},
-        { (char *)"cvInitSystem", _wrap_cvInitSystem, METH_VARARGS, NULL},
-        { (char *)"cvStartWindowThread", _wrap_cvStartWindowThread, METH_VARARGS, NULL},
-        { (char *)"cvNamedWindow", _wrap_cvNamedWindow, METH_VARARGS, NULL},
-        { (char *)"cvShowImage", _wrap_cvShowImage, METH_VARARGS, NULL},
-        { (char *)"cvResizeWindow", _wrap_cvResizeWindow, METH_VARARGS, NULL},
-        { (char *)"cvMoveWindow", _wrap_cvMoveWindow, METH_VARARGS, NULL},
-        { (char *)"cvDestroyWindow", _wrap_cvDestroyWindow, METH_VARARGS, NULL},
-        { (char *)"cvDestroyAllWindows", _wrap_cvDestroyAllWindows, METH_VARARGS, NULL},
-        { (char *)"cvGetWindowHandle", _wrap_cvGetWindowHandle, METH_VARARGS, NULL},
-        { (char *)"cvGetWindowName", _wrap_cvGetWindowName, METH_VARARGS, NULL},
-        { (char *)"cvCreateTrackbar", _wrap_cvCreateTrackbar, METH_VARARGS, NULL},
-        { (char *)"cvGetTrackbarPos", _wrap_cvGetTrackbarPos, METH_VARARGS, NULL},
-        { (char *)"cvSetTrackbarPos", _wrap_cvSetTrackbarPos, METH_VARARGS, NULL},
-        { (char *)"cvSetMouseCallbackOld", _wrap_cvSetMouseCallbackOld, METH_VARARGS, NULL},
-        { (char *)"cvLoadImageM", _wrap_cvLoadImageM, METH_VARARGS, NULL},
-        { (char *)"cvSaveImage", _wrap_cvSaveImage, METH_VARARGS, NULL},
-        { (char *)"cvDecodeImage", _wrap_cvDecodeImage, METH_VARARGS, NULL},
-        { (char *)"cvDecodeImageM", _wrap_cvDecodeImageM, METH_VARARGS, NULL},
-        { (char *)"cvEncodeImage", _wrap_cvEncodeImage, METH_VARARGS, NULL},
-        { (char *)"cvConvertImage", _wrap_cvConvertImage, METH_VARARGS, NULL},
-        { (char *)"cvWaitKeyC", _wrap_cvWaitKeyC, METH_VARARGS, NULL},
-        { (char *)"cvCreateFileCapture", _wrap_cvCreateFileCapture, METH_VARARGS, NULL},
-        { (char *)"cvCreateCameraCapture", _wrap_cvCreateCameraCapture, METH_VARARGS, NULL},
-        { (char *)"cvGrabFrame", _wrap_cvGrabFrame, METH_VARARGS, NULL},
-        { (char *)"cvRetrieveFrame__Deprecated", _wrap_cvRetrieveFrame__Deprecated, METH_VARARGS, NULL},
-        { (char *)"cvQueryFrame__Deprecated", _wrap_cvQueryFrame__Deprecated, METH_VARARGS, NULL},
-        { (char *)"cvGetCaptureProperty", _wrap_cvGetCaptureProperty, METH_VARARGS, NULL},
-        { (char *)"cvSetCaptureProperty", _wrap_cvSetCaptureProperty, METH_VARARGS, NULL},
-        { (char *)"CV_FOURCC", _wrap_CV_FOURCC, METH_VARARGS, NULL},
-        { (char *)"cvCreateVideoWriter", _wrap_cvCreateVideoWriter, METH_VARARGS, NULL},
-        { (char *)"cvWriteFrame", _wrap_cvWriteFrame, METH_VARARGS, NULL},
-        { (char *)"new_CvvImage", _wrap_new_CvvImage, METH_VARARGS, NULL},
-        { (char *)"delete_CvvImage", _wrap_delete_CvvImage, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Create", _wrap_CvvImage_Create, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Load", _wrap_CvvImage_Load, METH_VARARGS, NULL},
-        { (char *)"CvvImage_LoadRect", _wrap_CvvImage_LoadRect, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Save", _wrap_CvvImage_Save, METH_VARARGS, NULL},
-        { (char *)"CvvImage_CopyOf", _wrap_CvvImage_CopyOf, METH_VARARGS, NULL},
-        { (char *)"CvvImage_GetImage", _wrap_CvvImage_GetImage, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Destroy", _wrap_CvvImage_Destroy, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Width", _wrap_CvvImage_Width, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Height", _wrap_CvvImage_Height, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Bpp", _wrap_CvvImage_Bpp, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Fill", _wrap_CvvImage_Fill, METH_VARARGS, NULL},
-        { (char *)"CvvImage_Show", _wrap_CvvImage_Show, METH_VARARGS, NULL},
+        { (char *)"cvLoadImage", _wrap_cvLoadImage, METH_VARARGS, (char *)"\n"
+               "cvLoadImage(char filename, int iscolor = 1) -> CvMat\n"
+               "cvLoadImage(char filename) -> CvMat\n"
+               ""},
+        { (char *)"cvRetrieveFrame", _wrap_cvRetrieveFrame, METH_VARARGS, (char *)"cvRetrieveFrame(CvCapture capture) -> CvMat"},
+        { (char *)"cvQueryFrame", _wrap_cvQueryFrame, METH_VARARGS, (char *)"cvQueryFrame(CvCapture capture) -> CvMat"},
+        { (char *)"cvInitSystem", _wrap_cvInitSystem, METH_VARARGS, (char *)"cvInitSystem(int argc, char argv) -> int"},
+        { (char *)"cvStartWindowThread", _wrap_cvStartWindowThread, METH_VARARGS, (char *)"cvStartWindowThread() -> int"},
+        { (char *)"cvNamedWindow", _wrap_cvNamedWindow, METH_VARARGS, (char *)"cvNamedWindow(char name, int flags = 1) -> int"},
+        { (char *)"cvShowImage", _wrap_cvShowImage, METH_VARARGS, (char *)"cvShowImage(char name, CvArr image)"},
+        { (char *)"cvResizeWindow", _wrap_cvResizeWindow, METH_VARARGS, (char *)"cvResizeWindow(char name, int width, int height)"},
+        { (char *)"cvMoveWindow", _wrap_cvMoveWindow, METH_VARARGS, (char *)"cvMoveWindow(char name, int x, int y)"},
+        { (char *)"cvDestroyWindow", _wrap_cvDestroyWindow, METH_VARARGS, (char *)"cvDestroyWindow(char name)"},
+        { (char *)"cvDestroyAllWindows", _wrap_cvDestroyAllWindows, METH_VARARGS, (char *)"cvDestroyAllWindows()"},
+        { (char *)"cvGetWindowHandle", _wrap_cvGetWindowHandle, METH_VARARGS, (char *)"cvGetWindowHandle(char name) -> void"},
+        { (char *)"cvGetWindowName", _wrap_cvGetWindowName, METH_VARARGS, (char *)"cvGetWindowName(void window_handle) -> char"},
+        { (char *)"cvCreateTrackbar", _wrap_cvCreateTrackbar, METH_VARARGS, (char *)"\n"
+               "cvCreateTrackbar(char trackbar_name, char window_name, int value, int count, \n"
+               "    CvTrackbarCallback on_change) -> int\n"
+               ""},
+        { (char *)"cvCreateTrackbar2", _wrap_cvCreateTrackbar2, METH_VARARGS, (char *)"\n"
+               "cvCreateTrackbar2(char trackbar_name, char window_name, int value, int count, \n"
+               "    CvTrackbarCallback2 on_change, void userdata = None) -> int\n"
+               ""},
+        { (char *)"cvGetTrackbarPos", _wrap_cvGetTrackbarPos, METH_VARARGS, (char *)"cvGetTrackbarPos(char trackbar_name, char window_name) -> int"},
+        { (char *)"cvSetTrackbarPos", _wrap_cvSetTrackbarPos, METH_VARARGS, (char *)"cvSetTrackbarPos(char trackbar_name, char window_name, int pos)"},
+        { (char *)"cvSetMouseCallbackOld", _wrap_cvSetMouseCallbackOld, METH_VARARGS, (char *)"cvSetMouseCallbackOld(char window_name, CvMouseCallback on_mouse, void param = None)"},
+        { (char *)"cvLoadImageM", _wrap_cvLoadImageM, METH_VARARGS, (char *)"cvLoadImageM(char filename, int iscolor = 1) -> CvMat"},
+        { (char *)"cvSaveImage", _wrap_cvSaveImage, METH_VARARGS, (char *)"cvSaveImage(char filename, CvArr image, int params = None) -> int"},
+        { (char *)"cvDecodeImage", _wrap_cvDecodeImage, METH_VARARGS, (char *)"cvDecodeImage(CvMat buf, int iscolor = 1)"},
+        { (char *)"cvDecodeImageM", _wrap_cvDecodeImageM, METH_VARARGS, (char *)"cvDecodeImageM(CvMat buf, int iscolor = 1) -> CvMat"},
+        { (char *)"cvEncodeImage", _wrap_cvEncodeImage, METH_VARARGS, (char *)"cvEncodeImage(char ext, CvArr image, int params = None) -> CvMat"},
+        { (char *)"cvConvertImage", _wrap_cvConvertImage, METH_VARARGS, (char *)"cvConvertImage(CvArr src, CvArr dst, int flags = 0)"},
+        { (char *)"cvWaitKeyC", _wrap_cvWaitKeyC, METH_VARARGS, (char *)"cvWaitKeyC(int delay = 0) -> int"},
+        { (char *)"cvCreateFileCapture", _wrap_cvCreateFileCapture, METH_VARARGS, (char *)"cvCreateFileCapture(char filename) -> CvCapture"},
+        { (char *)"cvCreateCameraCapture", _wrap_cvCreateCameraCapture, METH_VARARGS, (char *)"cvCreateCameraCapture(int index) -> CvCapture"},
+        { (char *)"cvGrabFrame", _wrap_cvGrabFrame, METH_VARARGS, (char *)"cvGrabFrame(CvCapture capture) -> int"},
+        { (char *)"cvRetrieveFrame__Deprecated", _wrap_cvRetrieveFrame__Deprecated, METH_VARARGS, (char *)"cvRetrieveFrame__Deprecated(CvCapture capture, int streamIdx = 0)"},
+        { (char *)"cvQueryFrame__Deprecated", _wrap_cvQueryFrame__Deprecated, METH_VARARGS, (char *)"cvQueryFrame__Deprecated(CvCapture capture)"},
+        { (char *)"cvGetCaptureProperty", _wrap_cvGetCaptureProperty, METH_VARARGS, (char *)"cvGetCaptureProperty(CvCapture capture, int property_id) -> double"},
+        { (char *)"cvSetCaptureProperty", _wrap_cvSetCaptureProperty, METH_VARARGS, (char *)"cvSetCaptureProperty(CvCapture capture, int property_id, double value) -> int"},
+        { (char *)"cvGetCaptureDomain", _wrap_cvGetCaptureDomain, METH_VARARGS, (char *)"cvGetCaptureDomain(CvCapture capture) -> int"},
+        { (char *)"CV_FOURCC", _wrap_CV_FOURCC, METH_VARARGS, (char *)"CV_FOURCC(char c1, char c2, char c3, char c4) -> int"},
+        { (char *)"cvCreateVideoWriter", _wrap_cvCreateVideoWriter, METH_VARARGS, (char *)"\n"
+               "cvCreateVideoWriter(char filename, int fourcc, double fps, CvSize frame_size, \n"
+               "    int is_color = 1) -> CvVideoWriter\n"
+               ""},
+        { (char *)"cvWriteFrame", _wrap_cvWriteFrame, METH_VARARGS, (char *)"cvWriteFrame(CvVideoWriter writer,  image) -> int"},
+        { (char *)"new_CvvImage", _wrap_new_CvvImage, METH_VARARGS, (char *)"new_CvvImage() -> CvvImage"},
+        { (char *)"delete_CvvImage", _wrap_delete_CvvImage, METH_VARARGS, (char *)"delete_CvvImage(CvvImage self)"},
+        { (char *)"CvvImage_Create", _wrap_CvvImage_Create, METH_VARARGS, (char *)"\n"
+               "Create(int width, int height, int bits_per_pixel, int image_origin = 0) -> bool\n"
+               "CvvImage_Create(CvvImage self, int width, int height, int bits_per_pixel) -> bool\n"
+               ""},
+        { (char *)"CvvImage_Load", _wrap_CvvImage_Load, METH_VARARGS, (char *)"\n"
+               "Load(char filename, int desired_color = 1) -> bool\n"
+               "CvvImage_Load(CvvImage self, char filename) -> bool\n"
+               ""},
+        { (char *)"CvvImage_LoadRect", _wrap_CvvImage_LoadRect, METH_VARARGS, (char *)"CvvImage_LoadRect(CvvImage self, char filename, int desired_color, CvRect r) -> bool"},
+        { (char *)"CvvImage_Save", _wrap_CvvImage_Save, METH_VARARGS, (char *)"CvvImage_Save(CvvImage self, char filename) -> bool"},
+        { (char *)"CvvImage_CopyOf", _wrap_CvvImage_CopyOf, METH_VARARGS, (char *)"\n"
+               "CopyOf(CvvImage image, int desired_color = -1)\n"
+               "CopyOf(CvvImage image)\n"
+               "CopyOf( img, int desired_color = -1)\n"
+               "CvvImage_CopyOf(CvvImage self,  img)\n"
+               ""},
+        { (char *)"CvvImage_GetImage", _wrap_CvvImage_GetImage, METH_VARARGS, (char *)"CvvImage_GetImage(CvvImage self)"},
+        { (char *)"CvvImage_Destroy", _wrap_CvvImage_Destroy, METH_VARARGS, (char *)"CvvImage_Destroy(CvvImage self)"},
+        { (char *)"CvvImage_Width", _wrap_CvvImage_Width, METH_VARARGS, (char *)"CvvImage_Width(CvvImage self) -> int"},
+        { (char *)"CvvImage_Height", _wrap_CvvImage_Height, METH_VARARGS, (char *)"CvvImage_Height(CvvImage self) -> int"},
+        { (char *)"CvvImage_Bpp", _wrap_CvvImage_Bpp, METH_VARARGS, (char *)"CvvImage_Bpp(CvvImage self) -> int"},
+        { (char *)"CvvImage_Fill", _wrap_CvvImage_Fill, METH_VARARGS, (char *)"CvvImage_Fill(CvvImage self, int color)"},
+        { (char *)"CvvImage_Show", _wrap_CvvImage_Show, METH_VARARGS, (char *)"CvvImage_Show(CvvImage self, char window)"},
         { (char *)"CvvImage_swigregister", CvvImage_swigregister, METH_VARARGS, NULL},
-        { (char *)"delete_CvCapture", _wrap_delete_CvCapture, METH_VARARGS, NULL},
+        { (char *)"delete_CvCapture", _wrap_delete_CvCapture, METH_VARARGS, (char *)"delete_CvCapture(CvCapture self)"},
         { (char *)"CvCapture_swigregister", CvCapture_swigregister, METH_VARARGS, NULL},
-        { (char *)"delete_CvVideoWriter", _wrap_delete_CvVideoWriter, METH_VARARGS, NULL},
+        { (char *)"delete_CvVideoWriter", _wrap_delete_CvVideoWriter, METH_VARARGS, (char *)"delete_CvVideoWriter(CvVideoWriter self)"},
         { (char *)"CvVideoWriter_swigregister", CvVideoWriter_swigregister, METH_VARARGS, NULL},
         { NULL, NULL, 0, NULL }
 };
@@ -7876,32 +8301,32 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_CvTypedSeqTCvTupleTCvPoint_2_t_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvTuple<CvPoint,2 > > *) x));
+static void *_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvTuple< CvPoint,2 > > *) x));
 }
-static void *_p_CvTypedSeqTCvTupleTfloat_2_t_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvTuple<float,2 > > *) x));
+static void *_p_CvTypedSeqT_CvTupleT_float_2_t_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvTuple< float,2 > > *) x));
 }
-static void *_p_CvTypedSeqTCvConnectedComp_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvConnectedComp > *) x));
+static void *_p_CvTypedSeqT_CvConnectedComp_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvConnectedComp > *) x));
 }
-static void *_p_CvTypedSeqTCvRect_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvRect > *) x));
+static void *_p_CvTypedSeqT_CvRect_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvRect > *) x));
 }
-static void *_p_CvTypedSeqTCvPoint_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvPoint > *) x));
+static void *_p_CvTypedSeqT_CvPoint_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvPoint > *) x));
 }
-static void *_p_CvTypedSeqTCvTupleTfloat_3_t_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvTuple<float,3 > > *) x));
+static void *_p_CvTypedSeqT_CvTupleT_float_3_t_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvTuple< float,3 > > *) x));
 }
-static void *_p_CvTypedSeqTCvSeq_p_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvSeq * > *) x));
+static void *_p_CvTypedSeqT_CvSeq_p_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvSeq * > *) x));
 }
-static void *_p_CvTypedSeqTCvQuadEdge2D_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvQuadEdge2D > *) x));
+static void *_p_CvTypedSeqT_CvQuadEdge2D_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvQuadEdge2D > *) x));
 }
-static void *_p_CvTypedSeqTCvPoint2D32f_tTo_p_CvSeq(void *x) {
-    return (void *)((CvSeq *)  ((CvTypedSeq<CvPoint2D32f > *) x));
+static void *_p_CvTypedSeqT_CvPoint2D32f_tTo_p_CvSeq(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((CvSeq *)  ((CvTypedSeq< CvPoint2D32f > *) x));
 }
 static swig_type_info _swigt__p_Cv32suf = {"_p_Cv32suf", "Cv32suf *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Cv64suf = {"_p_Cv64suf", "Cv64suf *", 0, 0, (void*)0, 0};
@@ -7913,7 +8338,7 @@ static swig_type_info _swigt__p_CvChain = {"_p_CvChain", "CvChain *", 0, 0, (voi
 static swig_type_info _swigt__p_CvChainPtReader = {"_p_CvChainPtReader", "CvChainPtReader *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConDensation = {"_p_CvConDensation", "CvConDensation *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConnectedComp = {"_p_CvConnectedComp", "CvConnectedComp *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvContour = {"_p_CvContour", "CvContour *|CvPoint2DSeq *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvContour = {"_p_CvContour", "CvPoint2DSeq *|CvContour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvContourTree = {"_p_CvContourTree", "CvContourTree *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConvexityDefect = {"_p_CvConvexityDefect", "CvConvexityDefect *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvFileNode = {"_p_CvFileNode", "CvFileNode *", 0, 0, (void*)0, 0};
@@ -7960,15 +8385,15 @@ static swig_type_info _swigt__p_CvSURFParams = {"_p_CvSURFParams", "CvSURFParams
 static swig_type_info _swigt__p_CvSURFPoint = {"_p_CvSURFPoint", "CvSURFPoint *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvScalar = {"_p_CvScalar", "CvScalar *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvSeq = {"_p_CvSeq", "CvSeq *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvTupleTCvPoint_2_t_t = {"_p_CvTypedSeqTCvTupleTCvPoint_2_t_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvTupleTfloat_2_t_t = {"_p_CvTypedSeqTCvTupleTfloat_2_t_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvRect_t = {"_p_CvTypedSeqTCvRect_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvPoint_t = {"_p_CvTypedSeqTCvPoint_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvQuadEdge2D_t = {"_p_CvTypedSeqTCvQuadEdge2D_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvSeq_p_t = {"_p_CvTypedSeqTCvSeq_p_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvPoint2D32f_t = {"_p_CvTypedSeqTCvPoint2D32f_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvTupleTfloat_3_t_t = {"_p_CvTypedSeqTCvTupleTfloat_3_t_t", 0, 0, 0, 0, 0};
-static swig_type_info _swigt__p_CvTypedSeqTCvConnectedComp_t = {"_p_CvTypedSeqTCvConnectedComp_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t = {"_p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t = {"_p_CvTypedSeqT_CvTupleT_float_2_t_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvRect_t = {"_p_CvTypedSeqT_CvRect_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvPoint_t = {"_p_CvTypedSeqT_CvPoint_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvQuadEdge2D_t = {"_p_CvTypedSeqT_CvQuadEdge2D_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvSeq_p_t = {"_p_CvTypedSeqT_CvSeq_p_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvPoint2D32f_t = {"_p_CvTypedSeqT_CvPoint2D32f_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t = {"_p_CvTypedSeqT_CvTupleT_float_3_t_t", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_CvTypedSeqT_CvConnectedComp_t = {"_p_CvTypedSeqT_CvConnectedComp_t", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_CvSeqBlock = {"_p_CvSeqBlock", "CvSeqBlock *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvSeqReader = {"_p_CvSeqReader", "CvSeqReader *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvSeqWriter = {"_p_CvSeqWriter", "CvSeqWriter *", 0, 0, (void*)0, 0};
@@ -8005,18 +8430,19 @@ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_int__void = {"_p_f_int__void", "void (*)(int)|CvTrackbarCallback", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_int_int_int_int_p_void__void = {"_p_f_int_int_int_int_p_void__void", "void (*)(int,int,int,int,void *)|CvMouseCallback", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_int_p_void__void = {"_p_f_int_p_void__void", "CvTrackbarCallback2|void (*)(int,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_float = {"_p_float", "float *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_long_long = {"_p_long_long", "long long *|int64 *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "CvHistType *|int *|CVStatus *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64 *|long long *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|schar *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "schar *|signed char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_t = {"_p_size_t", "size_t *|CvSubdiv2DEdge *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uchar *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "unsigned long long *|CvRNG *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "uchar *|unsigned char *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "uint64 *|unsigned long long *|CvRNG *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|ushort *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_void = {"_p_void", "CvArr *|void *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_Cv32suf,
@@ -8100,15 +8526,15 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_CvTermCriteria,
   &_swigt__p_CvTreeNodeIterator,
   &_swigt__p_CvTypeInfo,
-  &_swigt__p_CvTypedSeqTCvConnectedComp_t,
-  &_swigt__p_CvTypedSeqTCvPoint2D32f_t,
-  &_swigt__p_CvTypedSeqTCvPoint_t,
-  &_swigt__p_CvTypedSeqTCvQuadEdge2D_t,
-  &_swigt__p_CvTypedSeqTCvRect_t,
-  &_swigt__p_CvTypedSeqTCvSeq_p_t,
-  &_swigt__p_CvTypedSeqTCvTupleTCvPoint_2_t_t,
-  &_swigt__p_CvTypedSeqTCvTupleTfloat_2_t_t,
-  &_swigt__p_CvTypedSeqTCvTupleTfloat_3_t_t,
+  &_swigt__p_CvTypedSeqT_CvConnectedComp_t,
+  &_swigt__p_CvTypedSeqT_CvPoint2D32f_t,
+  &_swigt__p_CvTypedSeqT_CvPoint_t,
+  &_swigt__p_CvTypedSeqT_CvQuadEdge2D_t,
+  &_swigt__p_CvTypedSeqT_CvRect_t,
+  &_swigt__p_CvTypedSeqT_CvSeq_p_t,
+  &_swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t,
+  &_swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t,
+  &_swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t,
   &_swigt__p_CvVideoWriter,
   &_swigt__p_CvvImage,
   &_swigt__p__IplConvKernel,
@@ -8121,6 +8547,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_difference_type,
   &_swigt__p_f_int__void,
   &_swigt__p_f_int_int_int_int_p_void__void,
+  &_swigt__p_f_int_p_void__void,
   &_swigt__p_float,
   &_swigt__p_int,
   &_swigt__p_long_long,
@@ -8191,16 +8618,16 @@ static swig_cast_info _swigc__p_CvRect[] = {  {&_swigt__p_CvRect, 0, 0, 0},{0, 0
 static swig_cast_info _swigc__p_CvSURFParams[] = {  {&_swigt__p_CvSURFParams, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSURFPoint[] = {  {&_swigt__p_CvSURFPoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvScalar[] = {  {&_swigt__p_CvScalar, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvTupleTCvPoint_2_t_t[] = {{&_swigt__p_CvTypedSeqTCvTupleTCvPoint_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvTupleTfloat_2_t_t[] = {{&_swigt__p_CvTypedSeqTCvTupleTfloat_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvRect_t[] = {{&_swigt__p_CvTypedSeqTCvRect_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvPoint_t[] = {{&_swigt__p_CvTypedSeqTCvPoint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvQuadEdge2D_t[] = {{&_swigt__p_CvTypedSeqTCvQuadEdge2D_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvSeq_p_t[] = {{&_swigt__p_CvTypedSeqTCvSeq_p_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvPoint2D32f_t[] = {{&_swigt__p_CvTypedSeqTCvPoint2D32f_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvTupleTfloat_3_t_t[] = {{&_swigt__p_CvTypedSeqTCvTupleTfloat_3_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvTypedSeqTCvConnectedComp_t[] = {{&_swigt__p_CvTypedSeqTCvConnectedComp_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_CvSeq[] = {  {&_swigt__p_CvTypedSeqTCvTupleTCvPoint_2_t_t, _p_CvTypedSeqTCvTupleTCvPoint_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvTupleTfloat_2_t_t, _p_CvTypedSeqTCvTupleTfloat_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvRect_t, _p_CvTypedSeqTCvRect_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvPoint_t, _p_CvTypedSeqTCvPoint_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvQuadEdge2D_t, _p_CvTypedSeqTCvQuadEdge2D_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvSeq_p_t, _p_CvTypedSeqTCvSeq_p_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvPoint2D32f_t, _p_CvTypedSeqTCvPoint2D32f_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvSeq, 0, 0, 0},  {&_swigt__p_CvTypedSeqTCvTupleTfloat_3_t_t, _p_CvTypedSeqTCvTupleTfloat_3_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqTCvConnectedComp_t, _p_CvTypedSeqTCvConnectedComp_tTo_p_CvSeq, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t[] = {{&_swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvTupleT_float_2_t_t[] = {{&_swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvRect_t[] = {{&_swigt__p_CvTypedSeqT_CvRect_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvPoint_t[] = {{&_swigt__p_CvTypedSeqT_CvPoint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvQuadEdge2D_t[] = {{&_swigt__p_CvTypedSeqT_CvQuadEdge2D_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvSeq_p_t[] = {{&_swigt__p_CvTypedSeqT_CvSeq_p_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvPoint2D32f_t[] = {{&_swigt__p_CvTypedSeqT_CvPoint2D32f_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvTupleT_float_3_t_t[] = {{&_swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvTypedSeqT_CvConnectedComp_t[] = {{&_swigt__p_CvTypedSeqT_CvConnectedComp_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CvSeq[] = {  {&_swigt__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t, _p_CvTypedSeqT_CvTupleT_CvPoint_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvTupleT_float_2_t_t, _p_CvTypedSeqT_CvTupleT_float_2_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvRect_t, _p_CvTypedSeqT_CvRect_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvPoint_t, _p_CvTypedSeqT_CvPoint_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvQuadEdge2D_t, _p_CvTypedSeqT_CvQuadEdge2D_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvSeq_p_t, _p_CvTypedSeqT_CvSeq_p_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvPoint2D32f_t, _p_CvTypedSeqT_CvPoint2D32f_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvSeq, 0, 0, 0},  {&_swigt__p_CvTypedSeqT_CvTupleT_float_3_t_t, _p_CvTypedSeqT_CvTupleT_float_3_t_tTo_p_CvSeq, 0, 0},  {&_swigt__p_CvTypedSeqT_CvConnectedComp_t, _p_CvTypedSeqT_CvConnectedComp_tTo_p_CvSeq, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeqBlock[] = {  {&_swigt__p_CvSeqBlock, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeqReader[] = {  {&_swigt__p_CvSeqReader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CvSeqWriter[] = {  {&_swigt__p_CvSeqWriter, 0, 0, 0},{0, 0, 0, 0}};
@@ -8237,6 +8664,7 @@ static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0,
 static swig_cast_info _swigc__p_difference_type[] = {  {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_int__void[] = {  {&_swigt__p_f_int__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_int_int_int_int_p_void__void[] = {  {&_swigt__p_f_int_int_int_int_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_int_p_void__void[] = {  {&_swigt__p_f_int_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_float[] = {  {&_swigt__p_float, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}};
@@ -8332,15 +8760,15 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_CvTermCriteria,
   _swigc__p_CvTreeNodeIterator,
   _swigc__p_CvTypeInfo,
-  _swigc__p_CvTypedSeqTCvConnectedComp_t,
-  _swigc__p_CvTypedSeqTCvPoint2D32f_t,
-  _swigc__p_CvTypedSeqTCvPoint_t,
-  _swigc__p_CvTypedSeqTCvQuadEdge2D_t,
-  _swigc__p_CvTypedSeqTCvRect_t,
-  _swigc__p_CvTypedSeqTCvSeq_p_t,
-  _swigc__p_CvTypedSeqTCvTupleTCvPoint_2_t_t,
-  _swigc__p_CvTypedSeqTCvTupleTfloat_2_t_t,
-  _swigc__p_CvTypedSeqTCvTupleTfloat_3_t_t,
+  _swigc__p_CvTypedSeqT_CvConnectedComp_t,
+  _swigc__p_CvTypedSeqT_CvPoint2D32f_t,
+  _swigc__p_CvTypedSeqT_CvPoint_t,
+  _swigc__p_CvTypedSeqT_CvQuadEdge2D_t,
+  _swigc__p_CvTypedSeqT_CvRect_t,
+  _swigc__p_CvTypedSeqT_CvSeq_p_t,
+  _swigc__p_CvTypedSeqT_CvTupleT_CvPoint_2_t_t,
+  _swigc__p_CvTypedSeqT_CvTupleT_float_2_t_t,
+  _swigc__p_CvTypedSeqT_CvTupleT_float_3_t_t,
   _swigc__p_CvVideoWriter,
   _swigc__p_CvvImage,
   _swigc__p__IplConvKernel,
@@ -8353,6 +8781,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_difference_type,
   _swigc__p_f_int__void,
   _swigc__p_f_int_int_int_int_p_void__void,
+  _swigc__p_f_int_p_void__void,
   _swigc__p_float,
   _swigc__p_int,
   _swigc__p_long_long,
@@ -8433,7 +8862,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
   
   clientdata = clientdata;
   
@@ -8443,6 +8872,9 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -8471,6 +8903,12 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -8633,26 +9071,58 @@ extern "C" {
   
   SWIGINTERN PyObject *
   swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
+#if PY_VERSION_HEX >= 0x03000000
+    return PyUnicode_InternFromString("<Swig global variables>");
+#else
     return PyString_FromString("<Swig global variables>");
+#endif
   }
   
   SWIGINTERN PyObject *
   swig_varlink_str(swig_varlinkobject *v) {
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *str = PyUnicode_InternFromString("(");
+    PyObject *tail;
+    PyObject *joined;
+    swig_globalvar *var;
+    for (var = v->vars; var; var=var->next) {
+      tail = PyUnicode_FromString(var->name);
+      joined = PyUnicode_Concat(str, tail);
+      Py_DecRef(str);
+      Py_DecRef(tail);
+      str = joined;
+      if (var->next) {
+        tail = PyUnicode_InternFromString(", ");
+        joined = PyUnicode_Concat(str, tail);
+        Py_DecRef(str);
+        Py_DecRef(tail);
+        str = joined;
+      }
+    }
+    tail = PyUnicode_InternFromString(")");
+    joined = PyUnicode_Concat(str, tail);
+    Py_DecRef(str);
+    Py_DecRef(tail);
+    str = joined;
+#else
     PyObject *str = PyString_FromString("(");
-    swig_globalvar  *var;
+    swig_globalvar *var;
     for (var = v->vars; var; var=var->next) {
       PyString_ConcatAndDel(&str,PyString_FromString(var->name));
       if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
     }
     PyString_ConcatAndDel(&str,PyString_FromString(")"));
+#endif
     return str;
   }
   
   SWIGINTERN int
   swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
+    char *tmp;
     PyObject *str = swig_varlink_str(v);
     fprintf(fp,"Swig global variables ");
-    fprintf(fp,"%s\n", PyString_AsString(str));
+    fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
+    SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(str);
     return 0;
   }
@@ -8710,8 +9180,13 @@ extern "C" {
     if (!type_init) {
       const PyTypeObject tmp
       = {
+        /* PyObject header changed in Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+        PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else
         PyObject_HEAD_INIT(NULL)
         0,                                  /* Number of items in variable part (ob_size) */
+#endif
         (char *)"swigvarlink",              /* Type name (tp_name) */
         sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
         0,                                  /* Itemsize (tp_itemsize) */
@@ -8747,7 +9222,10 @@ extern "C" {
 #endif
       };
       varlink_type = tmp;
+      /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
       varlink_type.ob_type = &PyType_Type;
+#endif
       type_init = 1;
     }
     return &varlink_type;
@@ -8872,13 +9350,37 @@ extern "C" {
 #ifdef __cplusplus
 extern "C"
 #endif
-SWIGEXPORT void SWIG_init(void) {
-  PyObject *m, *d;
+
+SWIGEXPORT 
+#if PY_VERSION_HEX >= 0x03000000
+PyObject*
+#else
+void
+#endif
+SWIG_init(void) {
+  PyObject *m, *d;  
+#if PY_VERSION_HEX >= 0x03000000
+  static struct PyModuleDef SWIG_module = {
+    PyModuleDef_HEAD_INIT,
+    (char *) SWIG_name,
+    NULL,
+    -1,
+    SwigMethods,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  };
+#endif
   
   /* Fix SwigMethods to carry the callback ptrs when needed */
   SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
   
+#if PY_VERSION_HEX >= 0x03000000
+  m = PyModule_Create(&SWIG_module);
+#else
   m = Py_InitModule((char *) SWIG_name, SwigMethods);
+#endif
   d = PyModule_GetDict(m);
   
   SWIG_InitializeModule(0);
@@ -8955,5 +9457,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CV_CAP_PROP_RECTIFICATION",SWIG_From_int(static_cast< int >(18)));
   SWIG_Python_SetConstant(d, "CV_FOURCC_PROMPT",SWIG_From_int(static_cast< int >(-1)));
   SWIG_Python_SetConstant(d, "HG_AUTOSIZE",SWIG_From_int(static_cast< int >(1)));
+#if PY_VERSION_HEX >= 0x03000000
+  return m;
+#else
+  return;
+#endif
 }
 
index fe24f00eb8fb0c398e7989bf5bc82ad48d6e8fb3..a6b41712e5570ccb1bd03259454f269a2d0812a2 100644 (file)
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.39
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
 #define SWIGPYTHON
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
 
+
 #ifdef __cplusplus
-template<class T> class SwigValueWrapper {
-    T *tt;
+/* SwigValueWrapper is described in swig.swg */
+template<typename T> class SwigValueWrapper {
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
-    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -34,14 +42,14 @@ private:
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -69,6 +77,12 @@ private:
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -124,6 +138,12 @@ private:
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 
 /* Python.h has to appear first */
 #include <Python.h>
@@ -131,13 +151,13 @@ private:
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
  * type checking.
  * ----------------------------------------------------------------------------- */
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -150,11 +170,11 @@ private:
 
 /*
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the swig runtime code.
-  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  creating a static or dynamic library from the SWIG runtime code.
+  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
   
-  But only do this if is strictly necessary, ie, if you have problems
-  with your compiler or so.
+  But only do this if strictly necessary, ie, if you have problems
+  with your compiler or suchlike.
 */
 
 #ifndef SWIGRUNTIME
@@ -172,6 +192,7 @@ private:
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -180,14 +201,14 @@ private:
 /* 
    Flags/methods for returning states.
    
-   The swig conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
    Use the following macros/flags to set or process the returning
    states.
    
-   In old swig versions, you usually write code as:
+   In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
        // success code
@@ -195,7 +216,7 @@ private:
        //fail code
      }
 
-   Now you can be more explicit as:
+   Now you can be more explicit:
 
     int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
     if (SWIG_IsOK(res)) {
@@ -204,7 +225,7 @@ private:
       // fail code
     }
 
-   that seems to be the same, but now you can also do
+   which is the same really, but now you can also do
 
     Type *ptr;
     int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -222,7 +243,7 @@ private:
     
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
-   requires also to SWIG_ConvertPtr to return new result values, as
+   also requires SWIG_ConvertPtr to return new result values, such as
 
       int SWIG_ConvertPtr(obj, ptr,...) {         
         if (<obj is ok>) {                            
@@ -240,7 +261,7 @@ private:
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
    more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   swig errors code.
+   SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
    allows to return the 'cast rank', for example, if you have this
@@ -254,9 +275,8 @@ private:
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
+*/
 
-
- */
 #define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
@@ -281,7 +301,6 @@ private:
 #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
 #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
 
-
 /* Cast-Rank Mode */
 #if defined(SWIG_CASTRANK_MODE)
 #  ifndef SWIG_TypeRank
@@ -304,18 +323,16 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
-
-
 #include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;                        /* mangled name of this type */
   const char             *str;                 /* human readable name of this type */
@@ -360,7 +377,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
 /*
@@ -402,48 +419,66 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
 }
 
 
-/* think of this as a c++ template<> or a scheme macro */
-#define SWIG_TypeCheck_Template(comparison, ty)         \
-  if (ty) {                                             \
-    swig_cast_info *iter = ty->cast;                    \
-    while (iter) {                                      \
-      if (comparison) {                                 \
-        if (iter == ty->cast) return iter;              \
-        /* Move iter to the top of the linked list */   \
-        iter->prev->next = iter->next;                  \
-        if (iter->next)                                 \
-          iter->next->prev = iter->prev;                \
-        iter->next = ty->cast;                          \
-        iter->prev = 0;                                 \
-        if (ty->cast) ty->cast->prev = iter;            \
-        ty->cast = iter;                                \
-        return iter;                                    \
-      }                                                 \
-      iter = iter->next;                                \
-    }                                                   \
-  }                                                     \
-  return 0
-
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (strcmp(iter->type->name, c) == 0) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
-/* Same as previous function, except strcmp is replaced with a pointer comparison */
+/* 
+  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
-  SWIG_TypeCheck_Template(iter->type == from, into);
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (iter->type == from) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
 /*
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -714,6 +749,67 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 
 
+/* Compatibility marcos for Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+
+#define PyClass_Check(obj) PyObject_IsInstance(obj, (PyObject *)&PyType_Type)
+#define PyInt_Check(x) PyLong_Check(x)
+#define PyInt_AsLong(x) PyLong_AsLong(x)
+#define PyInt_FromLong(x) PyLong_FromLong(x)
+#define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
+
+#endif
+
+#ifndef Py_TYPE
+#  define Py_TYPE(op) ((op)->ob_type)
+#endif
+
+/* SWIG APIs for compatibility of both Python 2 & 3 */
+
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_Python_str_FromFormat PyUnicode_FromFormat
+#else
+#  define SWIG_Python_str_FromFormat PyString_FromFormat
+#endif
+
+
+/* Warning: This function will allocate a new string in Python 3,
+ * so please call SWIG_Python_str_DelForPy3(x) to free the space.
+ */
+SWIGINTERN char*
+SWIG_Python_str_AsChar(PyObject *str)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  char *cstr;
+  char *newstr;
+  int len;
+  str = PyUnicode_AsUTF8String(str);
+  PyBytes_AsStringAndSize(str, &cstr, &len);
+  newstr = (char *) malloc(len+1);
+  memcpy(newstr, cstr, len+1);
+  Py_XDECREF(str);
+  return newstr;
+#else
+  return PyString_AsString(str);
+#endif
+}
+
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
+#else
+#  define SWIG_Python_str_DelForPy3(x) 
+#endif
+
+
+SWIGINTERN PyObject*
+SWIG_Python_str_FromChar(const char *c)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  return PyUnicode_FromString(c); 
+#else
+  return PyString_FromString(c);
+#endif
+}
 
 /* Add PyOS_snprintf for old Pythons */
 #if PY_VERSION_HEX < 0x02020000
@@ -760,6 +856,7 @@ PyString_FromFormat(const char *fmt, ...) {
 #  define PyObject_GenericGetAttr 0
 # endif
 #endif
+
 /* Py_NotImplemented is defined in 2.1 and up. */
 #if PY_VERSION_HEX < 0x02010000
 # ifndef Py_NotImplemented
@@ -767,7 +864,6 @@ PyString_FromFormat(const char *fmt, ...) {
 # endif
 #endif
 
-
 /* A crude PyString_AsStringAndSize implementation for old Pythons */
 #if PY_VERSION_HEX < 0x02010000
 # ifndef PyString_AsStringAndSize
@@ -782,7 +878,6 @@ PyString_FromFormat(const char *fmt, ...) {
 # endif
 #endif
 
-
 /* PyBool_FromLong for old Pythons */
 #if PY_VERSION_HEX < 0x02030000
 static
@@ -860,19 +955,20 @@ SWIG_Python_AddErrorMsg(const char* mesg)
 
   if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
   if (value) {
+    char *tmp;
     PyObject *old_str = PyObject_Str(value);
     PyErr_Clear();
     Py_XINCREF(type);
-    PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+
+    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+    SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
 
-
-
 #if defined(SWIG_PYTHON_NO_THREADS)
 #  if defined(SWIG_PYTHON_THREADS)
 #    undef SWIG_PYTHON_THREADS
@@ -969,6 +1065,20 @@ typedef struct swig_const_info {
   swig_type_info **ptype;
 } swig_const_info;
 
+
+/* -----------------------------------------------------------------------------
+ * Wrapper of PyInstanceMethod_New() used in Python 3
+ * It is exported to the generated module, used for -fastproxy
+ * ----------------------------------------------------------------------------- */
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  return PyInstanceMethod_New(func);
+#else
+  return NULL;
+#endif
+}
+
 #ifdef __cplusplus
 #if 0
 { /* cc-mode */
@@ -1021,7 +1131,7 @@ typedef struct swig_const_info {
 
 #define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
 #define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
-#define SWIG_NewClientData(obj)                         PySwigClientData_New(obj)
+#define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
 
 #define SWIG_SetErrorObj                                SWIG_Python_SetErrorObj                            
 #define SWIG_SetErrorMsg                               SWIG_Python_SetErrorMsg                            
@@ -1107,14 +1217,14 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
 {
   if (!args) {
     if (!min && !max) {
       return 1;
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-                  name, (min == max ? "" : "at least "), min);
+                  name, (min == max ? "" : "at least "), (int)min);
       return 0;
     }
   }  
@@ -1122,14 +1232,14 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyOb
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register int l = PyTuple_GET_SIZE(args);
+    register Py_ssize_t l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-                  name, (min == max ? "" : "at least "), min, l);
+                  name, (min == max ? "" : "at least "), (int)min, (int)l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-                  name, (min == max ? "" : "at most "), max, l);
+                  name, (min == max ? "" : "at most "), (int)max, (int)l);
       return 0;
     } else {
       register int i;
@@ -1217,7 +1327,7 @@ SWIG_Py_Void(void)
   return none;
 }
 
-/* PySwigClientData */
+/* SwigPyClientData */
 
 typedef struct {
   PyObject *klass;
@@ -1226,30 +1336,30 @@ typedef struct {
   PyObject *destroy;
   int delargs;
   int implicitconv;
-} PySwigClientData;
+} SwigPyClientData;
 
 SWIGRUNTIMEINLINE int 
 SWIG_Python_CheckImplicit(swig_type_info *ty)
 {
-  PySwigClientData *data = (PySwigClientData *)ty->clientdata;
+  SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
   return data ? data->implicitconv : 0;
 }
 
 SWIGRUNTIMEINLINE PyObject *
 SWIG_Python_ExceptionType(swig_type_info *desc) {
-  PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0;
+  SwigPyClientData *data = desc ? (SwigPyClientData *) desc->clientdata : 0;
   PyObject *klass = data ? data->klass : 0;
   return (klass ? klass : PyExc_RuntimeError);
 }
 
 
-SWIGRUNTIME PySwigClientData * 
-PySwigClientData_New(PyObject* obj)
+SWIGRUNTIME SwigPyClientData * 
+SwigPyClientData_New(PyObject* obj)
 {
   if (!obj) {
     return 0;
   } else {
-    PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData));
+    SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData));
     /* the klass element */
     data->klass = obj;
     Py_INCREF(data->klass);
@@ -1297,14 +1407,14 @@ PySwigClientData_New(PyObject* obj)
 }
 
 SWIGRUNTIME void 
-PySwigClientData_Del(PySwigClientData* data)
+SwigPyClientData_Del(SwigPyClientData* data)
 {
   Py_XDECREF(data->newraw);
   Py_XDECREF(data->newargs);
   Py_XDECREF(data->destroy);
 }
 
-/* =============== PySwigObject =====================*/
+/* =============== SwigPyObject =====================*/
 
 typedef struct {
   PyObject_HEAD
@@ -1312,24 +1422,28 @@ typedef struct {
   swig_type_info *ty;
   int own;
   PyObject *next;
-} PySwigObject;
+} SwigPyObject;
 
 SWIGRUNTIME PyObject *
-PySwigObject_long(PySwigObject *v)
+SwigPyObject_long(SwigPyObject *v)
 {
   return PyLong_FromVoidPtr(v->ptr);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_format(const char* fmt, PySwigObject *v)
+SwigPyObject_format(const char* fmt, SwigPyObject *v)
 {
   PyObject *res = NULL;
   PyObject *args = PyTuple_New(1);
   if (args) {
-    if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) {
-      PyObject *ofmt = PyString_FromString(fmt);
+    if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) {
+      PyObject *ofmt = SWIG_Python_str_FromChar(fmt);
       if (ofmt) {
+#if PY_VERSION_HEX >= 0x03000000
+       res = PyUnicode_Format(ofmt,args);
+#else
        res = PyString_Format(ofmt,args);
+#endif
        Py_DECREF(ofmt);
       }
       Py_DECREF(args);
@@ -1339,49 +1453,59 @@ PySwigObject_format(const char* fmt, PySwigObject *v)
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_oct(PySwigObject *v)
+SwigPyObject_oct(SwigPyObject *v)
 {
-  return PySwigObject_format("%o",v);
+  return SwigPyObject_format("%o",v);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_hex(PySwigObject *v)
+SwigPyObject_hex(SwigPyObject *v)
 {
-  return PySwigObject_format("%x",v);
+  return SwigPyObject_format("%x",v);
 }
 
 SWIGRUNTIME PyObject *
 #ifdef METH_NOARGS
-PySwigObject_repr(PySwigObject *v)
+SwigPyObject_repr(SwigPyObject *v)
 #else
-PySwigObject_repr(PySwigObject *v, PyObject *args)
+SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 #endif
 {
   const char *name = SWIG_TypePrettyName(v->ty);
-  PyObject *hex = PySwigObject_hex(v);    
-  PyObject *repr = PyString_FromFormat("<Swig Object of type '%s' at 0x%s>", name, PyString_AsString(hex));
+  PyObject *hex = SwigPyObject_hex(v);    
+  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, hex);
   Py_DECREF(hex);
   if (v->next) {
 #ifdef METH_NOARGS
-    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next);
+    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
 #else
-    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next, args);
+    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
 #endif
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *joined = PyUnicode_Concat(repr, nrep);
+    Py_DecRef(repr);
+    Py_DecRef(nrep);
+    repr = joined;
+#else
     PyString_ConcatAndDel(&repr,nrep);
+#endif
   }
   return repr;  
 }
 
 SWIGRUNTIME int
-PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 {
+  char *str;
 #ifdef METH_NOARGS
-  PyObject *repr = PySwigObject_repr(v);
+  PyObject *repr = SwigPyObject_repr(v);
 #else
-  PyObject *repr = PySwigObject_repr(v, NULL);
+  PyObject *repr = SwigPyObject_repr(v, NULL);
 #endif
   if (repr) {
-    fputs(PyString_AsString(repr), fp);
+    str = SWIG_Python_str_AsChar(repr); 
+    fputs(str, fp);
+    SWIG_Python_str_DelForPy3(str);
     Py_DECREF(repr);
     return 0; 
   } else {
@@ -1390,53 +1514,71 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_str(PySwigObject *v)
+SwigPyObject_str(SwigPyObject *v)
 {
   char result[SWIG_BUFFER_SIZE];
   return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    PyString_FromString(result) : 0;
+    SWIG_Python_str_FromChar(result) : 0;
 }
 
 SWIGRUNTIME int
-PySwigObject_compare(PySwigObject *v, PySwigObject *w)
+SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
   void *j = w->ptr;
   return (i < j) ? -1 : ((i > j) ? 1 : 0);
 }
 
+/* Added for Python 3.x, whould it also useful for Python 2.x? */
+SWIGRUNTIME PyObject*
+SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
+{
+  PyObject* res;
+  if( op != Py_EQ && op != Py_NE ) {
+    Py_INCREF(Py_NotImplemented);
+    return Py_NotImplemented;
+  }
+  if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) )
+    res = Py_True;
+  else
+    res = Py_False;
+  Py_INCREF(res);
+  return res;  
+}
+
+
 SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
 
 SWIGRUNTIME PyTypeObject*
-PySwigObject_type(void) {
+SwigPyObject_type(void) {
   static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
   return type;
 }
 
 SWIGRUNTIMEINLINE int
-PySwigObject_Check(PyObject *op) {
-  return ((op)->ob_type == PySwigObject_type())
-    || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
+SwigPyObject_Check(PyObject *op) {
+  return (Py_TYPE(op) == SwigPyObject_type())
+    || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0);
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_New(void *ptr, swig_type_info *ty, int own);
+SwigPyObject_New(void *ptr, swig_type_info *ty, int own);
 
 SWIGRUNTIME void
-PySwigObject_dealloc(PyObject *v)
+SwigPyObject_dealloc(PyObject *v)
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own) {
+  if (sobj->own == SWIG_POINTER_OWN) {
     swig_type_info *ty = sobj->ty;
-    PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+    SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
     if (destroy) {
       /* destroy is always a VARARGS method */
       PyObject *res;
       if (data->delargs) {
        /* we need to create a temporal object to carry the destroy operation */
-       PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0);
+       PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0);
        res = SWIG_Python_CallFunctor(destroy, tmp);
        Py_DECREF(tmp);
       } else {
@@ -1445,27 +1587,28 @@ PySwigObject_dealloc(PyObject *v)
        res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } else {
-      const char *name = SWIG_TypePrettyName(ty);
+    } 
 #if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
-#endif
+    else {
+      const char *name = SWIG_TypePrettyName(ty);
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
     }
+#endif
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
 }
 
 SWIGRUNTIME PyObject* 
-PySwigObject_append(PyObject* v, PyObject* next)
+SwigPyObject_append(PyObject* v, PyObject* next)
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
 #ifndef METH_O
   PyObject *tmp = 0;
   if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
   next = tmp;
 #endif
-  if (!PySwigObject_Check(next)) {
+  if (!SwigPyObject_Check(next)) {
     return NULL;
   }
   sobj->next = next;
@@ -1475,12 +1618,12 @@ PySwigObject_append(PyObject* v, PyObject* next)
 
 SWIGRUNTIME PyObject* 
 #ifdef METH_NOARGS
-PySwigObject_next(PyObject* v)
+SwigPyObject_next(PyObject* v)
 #else
-PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *) v;
+  SwigPyObject *sobj = (SwigPyObject *) v;
   if (sobj->next) {    
     Py_INCREF(sobj->next);
     return sobj->next;
@@ -1491,30 +1634,30 @@ PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 
 SWIGINTERN PyObject*
 #ifdef METH_NOARGS
-PySwigObject_disown(PyObject *v)
+SwigPyObject_disown(PyObject *v)
 #else
-PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *)v;
+  SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = 0;
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject*
 #ifdef METH_NOARGS
-PySwigObject_acquire(PyObject *v)
+SwigPyObject_acquire(PyObject *v)
 #else
-PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
 #endif
 {
-  PySwigObject *sobj = (PySwigObject *)v;
+  SwigPyObject *sobj = (SwigPyObject *)v;
   sobj->own = SWIG_POINTER_OWN;
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject*
-PySwigObject_own(PyObject *v, PyObject *args)
+SwigPyObject_own(PyObject *v, PyObject *args)
 {
   PyObject *val = 0;
 #if (PY_VERSION_HEX < 0x02020000)
@@ -1527,20 +1670,20 @@ PySwigObject_own(PyObject *v, PyObject *args)
     } 
   else
     {
-      PySwigObject *sobj = (PySwigObject *)v;
+      SwigPyObject *sobj = (SwigPyObject *)v;
       PyObject *obj = PyBool_FromLong(sobj->own);
       if (val) {
 #ifdef METH_NOARGS
        if (PyObject_IsTrue(val)) {
-         PySwigObject_acquire(v);
+         SwigPyObject_acquire(v);
        } else {
-         PySwigObject_disown(v);
+         SwigPyObject_disown(v);
        }
 #else
        if (PyObject_IsTrue(val)) {
-         PySwigObject_acquire(v,args);
+         SwigPyObject_acquire(v,args);
        } else {
-         PySwigObject_disown(v,args);
+         SwigPyObject_disown(v,args);
        }
 #endif
       } 
@@ -1551,30 +1694,30 @@ PySwigObject_own(PyObject *v, PyObject *args)
 #ifdef METH_O
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_O,       (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
+  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
   {0, 0, 0, 0}  
 };
 #else
 static PyMethodDef
 swigobject_methods[] = {
-  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
-  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
-  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
-  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
-  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
+  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
   {0, 0, 0, 0}  
 };
 #endif
 
 #if PY_VERSION_HEX < 0x02020000
 SWIGINTERN PyObject *
-PySwigObject_getattr(PySwigObject *sobj,char *name)
+SwigPyObject_getattr(SwigPyObject *sobj,char *name)
 {
   return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
 }
@@ -1584,11 +1727,14 @@ SWIGRUNTIME PyTypeObject*
 _PySwigObject_type(void) {
   static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
   
-  static PyNumberMethods PySwigObject_as_number = {
+  static PyNumberMethods SwigPyObject_as_number = {
     (binaryfunc)0, /*nb_add*/
     (binaryfunc)0, /*nb_subtract*/
     (binaryfunc)0, /*nb_multiply*/
+    /* nb_divide removed in Python 3 */
+#if PY_VERSION_HEX < 0x03000000
     (binaryfunc)0, /*nb_divide*/
+#endif
     (binaryfunc)0, /*nb_remainder*/
     (binaryfunc)0, /*nb_divmod*/
     (ternaryfunc)0,/*nb_power*/
@@ -1602,45 +1748,66 @@ _PySwigObject_type(void) {
     0,            /*nb_and*/
     0,            /*nb_xor*/
     0,            /*nb_or*/
-    (coercion)0,   /*nb_coerce*/
-    (unaryfunc)PySwigObject_long, /*nb_int*/
-    (unaryfunc)PySwigObject_long, /*nb_long*/
+#if PY_VERSION_HEX < 0x03000000
+    0,   /*nb_coerce*/
+#endif
+    (unaryfunc)SwigPyObject_long, /*nb_int*/
+#if PY_VERSION_HEX < 0x03000000
+    (unaryfunc)SwigPyObject_long, /*nb_long*/
+#else
+    0, /*nb_reserved*/
+#endif
     (unaryfunc)0,                 /*nb_float*/
-    (unaryfunc)PySwigObject_oct,  /*nb_oct*/
-    (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02020000
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
-#elif PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX < 0x03000000
+    (unaryfunc)SwigPyObject_oct,  /*nb_oct*/
+    (unaryfunc)SwigPyObject_hex,  /*nb_hex*/
+#endif
+#if PY_VERSION_HEX >= 0x03000000 /* 3.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
+#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
     0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
 
-  static PyTypeObject pyswigobject_type;  
+  static PyTypeObject swigpyobject_type;  
   static int type_init = 0;
   if (!type_init) {
     const PyTypeObject tmp
       = {
+       /* PyOjbect header changed in Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+       PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else    
        PyObject_HEAD_INIT(NULL)
        0,                                  /* ob_size */
-       (char *)"PySwigObject",             /* tp_name */
-       sizeof(PySwigObject),               /* tp_basicsize */
+#endif
+       (char *)"SwigPyObject",             /* tp_name */
+       sizeof(SwigPyObject),               /* tp_basicsize */
        0,                                  /* tp_itemsize */
-       (destructor)PySwigObject_dealloc,   /* tp_dealloc */
-       (printfunc)PySwigObject_print,      /* tp_print */
+       (destructor)SwigPyObject_dealloc,   /* tp_dealloc */
+       (printfunc)SwigPyObject_print,      /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
-       (getattrfunc)PySwigObject_getattr,  /* tp_getattr */ 
+       (getattrfunc)SwigPyObject_getattr,  /* tp_getattr */ 
 #else
        (getattrfunc)0,                     /* tp_getattr */ 
 #endif
        (setattrfunc)0,                     /* tp_setattr */ 
-       (cmpfunc)PySwigObject_compare,      /* tp_compare */ 
-       (reprfunc)PySwigObject_repr,        /* tp_repr */    
-       &PySwigObject_as_number,            /* tp_as_number */
+#if PY_VERSION_HEX >= 0x03000000
+    0, /* tp_reserved in 3.0.1 */
+#else
+       (cmpfunc)SwigPyObject_compare,      /* tp_compare */
+#endif
+       (reprfunc)SwigPyObject_repr,        /* tp_repr */    
+       &SwigPyObject_as_number,            /* tp_as_number */
        0,                                  /* tp_as_sequence */
        0,                                  /* tp_as_mapping */
        (hashfunc)0,                        /* tp_hash */
        (ternaryfunc)0,                     /* tp_call */
-       (reprfunc)PySwigObject_str,         /* tp_str */
+       (reprfunc)SwigPyObject_str,         /* tp_str */
        PyObject_GenericGetAttr,            /* tp_getattro */
        0,                                  /* tp_setattro */
        0,                                  /* tp_as_buffer */
@@ -1648,7 +1815,7 @@ _PySwigObject_type(void) {
        swigobject_doc,                     /* tp_doc */        
        0,                                  /* tp_traverse */
        0,                                  /* tp_clear */
-       0,                                  /* tp_richcompare */
+       (richcmpfunc)SwigPyObject_richcompare,           /* tp_richcompare */
        0,                                  /* tp_weaklistoffset */
 #if PY_VERSION_HEX >= 0x02020000
        0,                                  /* tp_iter */
@@ -1665,11 +1832,11 @@ _PySwigObject_type(void) {
        0,                                  /* tp_alloc */              
        0,                                  /* tp_new */                
        0,                                  /* tp_free */          
-        0,                                  /* tp_is_gc */  
+       0,                                  /* tp_is_gc */  
        0,                                  /* tp_bases */   
        0,                                  /* tp_mro */
        0,                                  /* tp_cache */   
-       0,                                  /* tp_subclasses */
+       0,                                  /* tp_subclasses */
        0,                                  /* tp_weaklist */
 #endif
 #if PY_VERSION_HEX >= 0x02030000
@@ -1679,17 +1846,20 @@ _PySwigObject_type(void) {
        0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
       };
-    pyswigobject_type = tmp;
-    pyswigobject_type.ob_type = &PyType_Type;
+    swigpyobject_type = tmp;
+    /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
+    swigpyobject_type.ob_type = &PyType_Type;
+#endif
     type_init = 1;
   }
-  return &pyswigobject_type;
+  return &swigpyobject_type;
 }
 
 SWIGRUNTIME PyObject *
-PySwigObject_New(void *ptr, swig_type_info *ty, int own)
+SwigPyObject_New(void *ptr, swig_type_info *ty, int own)
 {
-  PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type());
+  SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type());
   if (sobj) {
     sobj->ptr  = ptr;
     sobj->ty   = ty;
@@ -1708,10 +1878,10 @@ typedef struct {
   void *pack;
   swig_type_info *ty;
   size_t size;
-} PySwigPacked;
+} SwigPyPacked;
 
 SWIGRUNTIME int
-PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 {
   char result[SWIG_BUFFER_SIZE];
   fputs("<Swig Packed ", fp); 
@@ -1725,29 +1895,29 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
 }
   
 SWIGRUNTIME PyObject *
-PySwigPacked_repr(PySwigPacked *v)
+SwigPyPacked_repr(SwigPyPacked *v)
 {
   char result[SWIG_BUFFER_SIZE];
   if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
-    return PyString_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
+    return SWIG_Python_str_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
   } else {
-    return PyString_FromFormat("<Swig Packed %s>", v->ty->name);
+    return SWIG_Python_str_FromFormat("<Swig Packed %s>", v->ty->name);
   }  
 }
 
 SWIGRUNTIME PyObject *
-PySwigPacked_str(PySwigPacked *v)
+SwigPyPacked_str(SwigPyPacked *v)
 {
   char result[SWIG_BUFFER_SIZE];
   if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
-    return PyString_FromFormat("%s%s", result, v->ty->name);
+    return SWIG_Python_str_FromFormat("%s%s", result, v->ty->name);
   } else {
-    return PyString_FromString(v->ty->name);
+    return SWIG_Python_str_FromChar(v->ty->name);
   }  
 }
 
 SWIGRUNTIME int
-PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
+SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
 {
   size_t i = v->size;
   size_t j = w->size;
@@ -1758,22 +1928,22 @@ PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
 SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void);
 
 SWIGRUNTIME PyTypeObject*
-PySwigPacked_type(void) {
+SwigPyPacked_type(void) {
   static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type();
   return type;
 }
 
 SWIGRUNTIMEINLINE int
-PySwigPacked_Check(PyObject *op) {
+SwigPyPacked_Check(PyObject *op) {
   return ((op)->ob_type == _PySwigPacked_type()) 
-    || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0);
+    || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0);
 }
 
 SWIGRUNTIME void
-PySwigPacked_dealloc(PyObject *v)
+SwigPyPacked_dealloc(PyObject *v)
 {
-  if (PySwigPacked_Check(v)) {
-    PySwigPacked *sobj = (PySwigPacked *) v;
+  if (SwigPyPacked_Check(v)) {
+    SwigPyPacked *sobj = (SwigPyPacked *) v;
     free(sobj->pack);
   }
   PyObject_DEL(v);
@@ -1782,28 +1952,37 @@ PySwigPacked_dealloc(PyObject *v)
 SWIGRUNTIME PyTypeObject*
 _PySwigPacked_type(void) {
   static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
-  static PyTypeObject pyswigpacked_type;
+  static PyTypeObject swigpypacked_type;
   static int type_init = 0;  
   if (!type_init) {
     const PyTypeObject tmp
       = {
+    /* PyObject header changed in Python 3 */
+#if PY_VERSION_HEX>=0x03000000
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else
        PyObject_HEAD_INIT(NULL)
-       0,                                  /* ob_size */       
-       (char *)"PySwigPacked",             /* tp_name */       
-       sizeof(PySwigPacked),               /* tp_basicsize */  
+    0,                             /* ob_size */       
+#endif
+       (char *)"SwigPyPacked",             /* tp_name */       
+       sizeof(SwigPyPacked),               /* tp_basicsize */  
        0,                                  /* tp_itemsize */   
-       (destructor)PySwigPacked_dealloc,   /* tp_dealloc */    
-       (printfunc)PySwigPacked_print,      /* tp_print */      
+       (destructor)SwigPyPacked_dealloc,   /* tp_dealloc */    
+       (printfunc)SwigPyPacked_print,      /* tp_print */      
        (getattrfunc)0,                     /* tp_getattr */    
        (setattrfunc)0,                     /* tp_setattr */    
-       (cmpfunc)PySwigPacked_compare,      /* tp_compare */    
-       (reprfunc)PySwigPacked_repr,        /* tp_repr */       
-       0,                                  /* tp_as_number */  
+#if PY_VERSION_HEX>=0x03000000
+    0, /* tp_reserved in 3.0.1 */
+#else
+    (cmpfunc)SwigPyPacked_compare,         /* tp_compare */
+#endif
+       (reprfunc)SwigPyPacked_repr,        /* tp_repr */
+       0,                                  /* tp_as_number */
        0,                                  /* tp_as_sequence */
-       0,                                  /* tp_as_mapping */ 
-       (hashfunc)0,                        /* tp_hash */       
-       (ternaryfunc)0,                     /* tp_call */       
-       (reprfunc)PySwigPacked_str,         /* tp_str */        
+       0,                                  /* tp_as_mapping */
+       (hashfunc)0,                        /* tp_hash */
+       (ternaryfunc)0,                     /* tp_call */
+       (reprfunc)SwigPyPacked_str,         /* tp_str */
        PyObject_GenericGetAttr,            /* tp_getattro */
        0,                                  /* tp_setattro */
        0,                                  /* tp_as_buffer */
@@ -1842,17 +2021,20 @@ _PySwigPacked_type(void) {
        0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
       };
-    pyswigpacked_type = tmp;
-    pyswigpacked_type.ob_type = &PyType_Type;
+    swigpypacked_type = tmp;
+    /* for Python 3 the ob_type already assigned in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
+    swigpypacked_type.ob_type = &PyType_Type;
+#endif
     type_init = 1;
   }
-  return &pyswigpacked_type;
+  return &swigpypacked_type;
 }
 
 SWIGRUNTIME PyObject *
-PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty)
+SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty)
 {
-  PySwigPacked *sobj = PyObject_NEW(PySwigPacked, PySwigPacked_type());
+  SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type());
   if (sobj) {
     void *pack = malloc(size);
     if (pack) {
@@ -1869,10 +2051,10 @@ PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty)
 }
 
 SWIGRUNTIME swig_type_info *
-PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
+SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
 {
-  if (PySwigPacked_Check(obj)) {
-    PySwigPacked *sobj = (PySwigPacked *)obj;
+  if (SwigPyPacked_Check(obj)) {
+    SwigPyPacked *sobj = (SwigPyPacked *)obj;
     if (sobj->size != size) return 0;
     memcpy(ptr, sobj->pack, size);
     return sobj->ty;
@@ -1888,7 +2070,7 @@ PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
 SWIGRUNTIMEINLINE PyObject *
 _SWIG_This(void)
 {
-  return PyString_FromString("this");
+    return SWIG_Python_str_FromChar("this");
 }
 
 SWIGRUNTIME PyObject *
@@ -1900,11 +2082,16 @@ SWIG_This(void)
 
 /* #define SWIG_PYTHON_SLOW_GETSET_THIS */
 
-SWIGRUNTIME PySwigObject *
+/* TODO: I don't know how to implement the fast getset in Python 3 right now */
+#if PY_VERSION_HEX>=0x03000000
+#define SWIG_PYTHON_SLOW_GETSET_THIS 
+#endif
+
+SWIGRUNTIME SwigPyObject *
 SWIG_Python_GetSwigThis(PyObject *pyobj) 
 {
-  if (PySwigObject_Check(pyobj)) {
-    return (PySwigObject *) pyobj;
+  if (SwigPyObject_Check(pyobj)) {
+    return (SwigPyObject *) pyobj;
   } else {
     PyObject *obj = 0;
 #if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
@@ -1940,12 +2127,12 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
       return 0;
     }
 #endif
-    if (obj && !PySwigObject_Check(obj)) {
+    if (obj && !SwigPyObject_Check(obj)) {
       /* a PyObject is called 'this', try to get the 'real this'
-        PySwigObject from it */ 
+        SwigPyObject from it */ 
       return SWIG_Python_GetSwigThis(obj);
     }
-    return (PySwigObject *)obj;
+    return (SwigPyObject *)obj;
   }
 }
 
@@ -1953,8 +2140,8 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own) {
-    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+  if (own == SWIG_POINTER_OWN) {
+    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
       sobj->own = own;
@@ -1973,7 +2160,9 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     if (ptr) *ptr = 0;
     return SWIG_OK;
   } else {
-    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -1985,9 +2174,17 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
        } else {
          swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
          if (!tc) {
-           sobj = (PySwigObject *)sobj->next;
+           sobj = (SwigPyObject *)sobj->next;
          } else {
-           if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+           if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
+              }
+            }
            break;
          }
        }
@@ -1997,7 +2194,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
       }
     }
     if (sobj) {
-      if (own) *own = sobj->own;
+      if (own)
+        *own = *own | sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
        sobj->own = 0;
       }
@@ -2005,7 +2203,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     } else {
       int res = SWIG_ERROR;
       if (flags & SWIG_POINTER_IMPLICIT_CONV) {
-       PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
        if (data && !data->implicitconv) {
          PyObject *klass = data->klass;
          if (klass) {
@@ -2018,7 +2216,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
              impconv = 0;
            }
            if (impconv) {
-             PySwigObject *iobj = SWIG_Python_GetSwigThis(impconv);
+             SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
              if (iobj) {
                void *vptr;
                res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
@@ -2062,8 +2260,13 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (!tc) return SWIG_ERROR;
-      *ptr = SWIG_TypeCast(tc,vptr);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
     } else {
       *ptr = vptr;
     }
@@ -2075,7 +2278,7 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
 
 SWIGRUNTIME int
 SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
-  swig_type_info *to = PySwigPacked_UnpackData(obj, ptr, sz);
+  swig_type_info *to = SwigPyPacked_UnpackData(obj, ptr, sz);
   if (!to) return SWIG_ERROR;
   if (ty) {
     if (to != ty) {
@@ -2097,7 +2300,7 @@ SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *t
 */
 
 SWIGRUNTIME PyObject* 
-SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this)
+SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
 {
 #if (PY_VERSION_HEX >= 0x02020000)
   PyObject *inst = 0;
@@ -2121,10 +2324,16 @@ SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this)
 #endif
     }
   } else {
+#if PY_VERSION_HEX >= 0x03000000
+    inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
+    PyObject_SetAttr(inst, SWIG_This(), swig_this);
+    Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+#else
     PyObject *dict = PyDict_New();
     PyDict_SetItem(dict, SWIG_This(), swig_this);
     inst = PyInstance_NewRaw(data->newargs, dict);
     Py_DECREF(dict);
+#endif
   }
   return inst;
 #else
@@ -2187,9 +2396,9 @@ SWIG_Python_InitShadowInstance(PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) {
     return NULL;
   } else {
-    PySwigObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
+    SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
     if (sthis) {
-      PySwigObject_append((PyObject*) sthis, obj[1]);
+      SwigPyObject_append((PyObject*) sthis, obj[1]);
     } else {
       SWIG_Python_SetSwigThis(obj[0], obj[1]);
     }
@@ -2205,8 +2414,8 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
     return SWIG_Py_Void();
   } else {
     int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
-    PyObject *robj = PySwigObject_New(ptr, type, own);
-    PySwigClientData *clientdata = type ? (PySwigClientData *)(type->clientdata) : 0;
+    PyObject *robj = SwigPyObject_New(ptr, type, own);
+    SwigPyClientData *clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
     if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
       PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
       if (inst) {
@@ -2222,7 +2431,7 @@ SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
 
 SWIGRUNTIMEINLINE PyObject *
 SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
-  return ptr ? PySwigPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
+  return ptr ? SwigPyPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
 }
 
 /* -----------------------------------------------------------------------------*
@@ -2293,8 +2502,8 @@ SWIG_Python_DestroyModule(void *vptr)
   for (i =0; i < swig_module->size; ++i) {
     swig_type_info *ty = types[i];
     if (ty->owndata) {
-      PySwigClientData *data = (PySwigClientData *) ty->clientdata;
-      if (data) PySwigClientData_Del(data);
+      SwigPyClientData *data = (SwigPyClientData *) ty->clientdata;
+      if (data) SwigPyClientData_Del(data);
     }
   }
   Py_DECREF(SWIG_This());
@@ -2304,8 +2513,13 @@ SWIGRUNTIME void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
   static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
 
+#if PY_VERSION_HEX >= 0x03000000
+ /* Add a dummy module object into sys.modules */
+  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
+#else
   PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
                                   swig_empty_runtime_method_table);
+#endif
   PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
   if (pointer && module) {
     PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
@@ -2325,7 +2539,7 @@ SWIGRUNTIME swig_type_info *
 SWIG_Python_TypeQuery(const char *type)
 {
   PyObject *cache = SWIG_Python_TypeCache();
-  PyObject *key = PyString_FromString(type); 
+  PyObject *key = SWIG_Python_str_FromChar(type); 
   PyObject *obj = PyDict_GetItem(cache, key);
   swig_type_info *descriptor;
   if (obj) {
@@ -2352,21 +2566,23 @@ SWIG_Python_TypeQuery(const char *type)
 
 SWIGRUNTIME int
 SWIG_Python_AddErrMesg(const char* mesg, int infront)
-{
+{  
   if (PyErr_Occurred()) {
     PyObject *type = 0;
     PyObject *value = 0;
     PyObject *traceback = 0;
     PyErr_Fetch(&type, &value, &traceback);
     if (value) {
+      char *tmp;
       PyObject *old_str = PyObject_Str(value);
       Py_XINCREF(type);
       PyErr_Clear();
       if (infront) {
-       PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str));
+       PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
       } else {
-       PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+       PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
       }
+      SWIG_Python_str_DelForPy3(tmp);
       Py_DECREF(old_str);
     }
     return 1;
@@ -2389,9 +2605,9 @@ SWIG_Python_ArgFail(int argnum)
 }
 
 SWIGRUNTIMEINLINE const char *
-PySwigObject_GetDesc(PyObject *self)
+SwigPyObject_GetDesc(PyObject *self)
 {
-  PySwigObject *v = (PySwigObject *)self;
+  SwigPyObject *v = (SwigPyObject *)self;
   swig_type_info *ty = v ? v->ty : 0;
   return ty ? ty->str : (char*)"";
 }
@@ -2401,10 +2617,10 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
 {
   if (type) {
 #if defined(SWIG_COBJECT_TYPES)
-    if (obj && PySwigObject_Check(obj)) {
-      const char *otype = (const char *) PySwigObject_GetDesc(obj);
+    if (obj && SwigPyObject_Check(obj)) {
+      const char *otype = (const char *) SwigPyObject_GetDesc(obj);
       if (otype) {
-       PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received",
+       PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'SwigPyObject(%s)' is received",
                     type, otype);
        return;
       }
@@ -2414,10 +2630,11 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
       const char *otype = (obj ? obj->ob_type->tp_name : 0); 
       if (otype) {
        PyObject *str = PyObject_Str(obj);
-       const char *cstr = str ? PyString_AsString(str) : 0;
+       const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0;
        if (cstr) {
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
                       type, otype, cstr);
+          SWIG_Python_str_DelForPy3(cstr);
        } else {
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
@@ -2439,10 +2656,12 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
   void *result;
   if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
     PyErr_Clear();
-    if (flags & SWIG_POINTER_EXCEPTION) {
+#if SWIG_POINTER_EXCEPTION
+    if (flags) {
       SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
       SWIG_Python_ArgFail(argnum);
     }
+#endif
   }
   return result;
 }
@@ -2658,11 +2877,16 @@ static swig_module_info swig_module = {swig_types, 146, 0, 0, 0, 0};
 /*-----------------------------------------------
               @(target):= _ml.so
   ------------------------------------------------*/
-#define SWIG_init    init_ml
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_init    PyInit__ml
 
+#else
+#  define SWIG_init    init_ml
+
+#endif
 #define SWIG_name    "_ml"
 
-#define SWIGVERSION 0x010331 
+#define SWIGVERSION 0x010339 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2674,26 +2898,28 @@ static swig_module_info swig_module = {swig_types, 146, 0, 0, 0, 0};
 
 
 namespace swig {
-  class PyObject_ptr {
+  class SwigPtr_PyObject {
   protected:
     PyObject *_obj;
 
   public:
-    PyObject_ptr() :_obj(0)
+    SwigPtr_PyObject() :_obj(0)
     {
     }
 
-    PyObject_ptr(const PyObject_ptr& item) : _obj(item._obj)
+    SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj)
     {
       Py_XINCREF(_obj);      
     }
     
-    PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj)
+    SwigPtr_PyObject(PyObject *obj, bool initial_ref = true) :_obj(obj)
     {
-      if (initial_ref) Py_XINCREF(_obj);
+      if (initial_ref) {
+        Py_XINCREF(_obj);
+      }
     }
     
-    PyObject_ptr & operator=(const PyObject_ptr& item) 
+    SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) 
     {
       Py_XINCREF(item._obj);
       Py_XDECREF(_obj);
@@ -2701,7 +2927,7 @@ namespace swig {
       return *this;      
     }
     
-    ~PyObject_ptr() 
+    ~SwigPtr_PyObject() 
     {
       Py_XDECREF(_obj);
     }
@@ -2720,10 +2946,10 @@ namespace swig {
 
 
 namespace swig {
-  struct PyObject_var : PyObject_ptr {
-    PyObject_var(PyObject* obj = 0) : PyObject_ptr(obj, false) { }
+  struct SwigVar_PyObject : SwigPtr_PyObject {
+    SwigVar_PyObject(PyObject* obj = 0) : SwigPtr_PyObject(obj, false) { }
     
-    PyObject_var & operator = (PyObject* obj)
+    SwigVar_PyObject & operator = (PyObject* obj)
     {
       Py_XDECREF(_obj);
       _obj = obj;
@@ -3124,14 +3350,12 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
 
 
 #include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN     LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX     LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX    ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
 #endif
 
 
@@ -3306,7 +3530,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
       return pchar_descriptor ? 
        SWIG_NewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
     } else {
+#if PY_VERSION_HEX >= 0x03000000
+      return PyUnicode_FromStringAndSize(carray, static_cast< int >(size));
+#else
       return PyString_FromStringAndSize(carray, static_cast< int >(size));
+#endif
     }
   } else {
     return SWIG_Py_Void();
@@ -3324,10 +3552,28 @@ SWIG_FromCharPtr(const char *cptr)
 SWIGINTERN int
 SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 {
-  if (PyString_Check(obj)) {
+#if PY_VERSION_HEX>=0x03000000
+  if (PyUnicode_Check(obj))
+#else  
+  if (PyString_Check(obj))
+#endif
+  {
     char *cstr; Py_ssize_t len;
+#if PY_VERSION_HEX>=0x03000000
+    if (!alloc && cptr) {
+        /* We can't allow converting without allocation, since the internal
+           representation of string in Python 3 is UCS-2/UCS-4 but we require
+           a UTF-8 representation.
+           TODO(bhy) More detailed explanation */
+        return SWIG_RuntimeError;
+    }
+    obj = PyUnicode_AsUTF8String(obj);
+    PyBytes_AsStringAndSize(obj, &cstr, &len);
+    if(alloc) *alloc = SWIG_NEWOBJ;
+#else
     PyString_AsStringAndSize(obj, &cstr, &len);
-    if (cptr)  {
+#endif
+    if (cptr) {
       if (alloc) {
        /* 
           In python the user should not be able to modify the inner
@@ -3352,10 +3598,16 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
          *alloc = SWIG_OLDOBJ;
        }
       } else {
-       *cptr = PyString_AsString(obj);
+        #if PY_VERSION_HEX>=0x03000000
+        assert(0); /* Should never reach here in Python 3 */
+        #endif
+       *cptr = SWIG_Python_str_AsChar(obj);
       }
     }
     if (psize) *psize = len + 1;
+#if PY_VERSION_HEX>=0x03000000
+    Py_XDECREF(obj);
+#endif
     return SWIG_OK;
   } else {
     swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
@@ -3379,18 +3631,11 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 SWIGINTERN int
 SWIG_AsVal_bool (PyObject *obj, bool *val)
 {
-  if (obj == Py_True) {
-    if (val) *val = true;
-    return SWIG_OK;
-  } else if (obj == Py_False) {
-    if (val) *val = false;
-    return SWIG_OK;
-  } else {
-    long v = 0;
-    int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
-    if (SWIG_IsOK(res) && val) *val = v ? true : false;
-    return res;
-  }
+  int r = PyObject_IsTrue(obj);
+  if (r == -1)
+    return SWIG_ERROR;
+  if (val) *val = r ? true : false;
+  return SWIG_OK;
 }
 
 
@@ -3500,11 +3745,11 @@ extern "C" {
 SWIGINTERN PyObject *_wrap_new_CvRNG_Wrapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG *arg1 = 0 ;
-  CvRNG_Wrapper *result = 0 ;
   CvRNG temp1 ;
   unsigned long long val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG_Wrapper *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvRNG_Wrapper",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_long_SS_long(obj0, &val1);
@@ -3524,10 +3769,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
-  CvRNG *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRNG_Wrapper_ptr",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -3546,10 +3791,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
-  CvRNG *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRNG_Wrapper_ref",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -3557,10 +3802,7 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvRNG_Wrapper_ref" "', argument " "1"" of type '" "CvRNG_Wrapper *""'"); 
   }
   arg1 = reinterpret_cast< CvRNG_Wrapper * >(argp1);
-  {
-    CvRNG &_result_ref = (arg1)->ref();
-    result = (CvRNG *) &_result_ref;
-  }
+  result = (CvRNG *) &(arg1)->ref();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_long_long, 0 |  0 );
   return resultobj;
 fail:
@@ -3572,13 +3814,13 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper___eq__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRNG_Wrapper___eq__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -3606,13 +3848,13 @@ SWIGINTERN PyObject *_wrap_CvRNG_Wrapper___ne__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvRNG_Wrapper *arg1 = (CvRNG_Wrapper *) 0 ;
   CvRNG_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRNG_Wrapper___ne__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRNG_Wrapper, 0 |  0 );
@@ -3651,7 +3893,7 @@ SWIGINTERN PyObject *_wrap_delete_CvRNG_Wrapper(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvRNG_Wrapper * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -3667,7 +3909,7 @@ fail:
 
 SWIGINTERN PyObject *CvRNG_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvRNG_Wrapper, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -3675,11 +3917,11 @@ SWIGINTERN PyObject *CvRNG_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self),
 SWIGINTERN PyObject *_wrap_new_CvSubdiv2DEdge_Wrapper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge *arg1 = 0 ;
-  CvSubdiv2DEdge_Wrapper *result = 0 ;
   CvSubdiv2DEdge temp1 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge_Wrapper *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvSubdiv2DEdge_Wrapper",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
@@ -3699,10 +3941,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ptr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
-  CvSubdiv2DEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DEdge_Wrapper_ptr",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -3721,10 +3963,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ref(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
-  CvSubdiv2DEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSubdiv2DEdge *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSubdiv2DEdge_Wrapper_ref",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -3732,10 +3974,7 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper_ref(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvSubdiv2DEdge_Wrapper_ref" "', argument " "1"" of type '" "CvSubdiv2DEdge_Wrapper *""'"); 
   }
   arg1 = reinterpret_cast< CvSubdiv2DEdge_Wrapper * >(argp1);
-  {
-    CvSubdiv2DEdge &_result_ref = (arg1)->ref();
-    result = (CvSubdiv2DEdge *) &_result_ref;
-  }
+  result = (CvSubdiv2DEdge *) &(arg1)->ref();
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_size_t, 0 |  0 );
   return resultobj;
 fail:
@@ -3747,13 +3986,13 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper___eq__(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSubdiv2DEdge_Wrapper___eq__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -3781,13 +4020,13 @@ SWIGINTERN PyObject *_wrap_CvSubdiv2DEdge_Wrapper___ne__(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   CvSubdiv2DEdge_Wrapper *arg1 = (CvSubdiv2DEdge_Wrapper *) 0 ;
   CvSubdiv2DEdge_Wrapper *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSubdiv2DEdge_Wrapper___ne__",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, 0 |  0 );
@@ -3826,7 +4065,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSubdiv2DEdge_Wrapper(PyObject *SWIGUNUSEDPAR
   arg1 = reinterpret_cast< CvSubdiv2DEdge_Wrapper * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -3842,7 +4081,7 @@ fail:
 
 SWIGINTERN PyObject *CvSubdiv2DEdge_Wrapper_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSubdiv2DEdge_Wrapper, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -3870,7 +4109,6 @@ SWIGINTERN PyObject *_wrap_CvVectors_type_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -3881,10 +4119,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvVectors_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvVectors *arg1 = (CvVectors *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvVectors_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVectors, 0 |  0 );
@@ -3923,7 +4161,6 @@ SWIGINTERN PyObject *_wrap_CvVectors_dims_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->dims = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -3934,10 +4171,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvVectors_dims_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvVectors *arg1 = (CvVectors *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvVectors_dims_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVectors, 0 |  0 );
@@ -3976,7 +4213,6 @@ SWIGINTERN PyObject *_wrap_CvVectors_count_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -3987,10 +4223,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvVectors_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvVectors *arg1 = (CvVectors *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvVectors_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVectors, 0 |  0 );
@@ -4029,7 +4265,6 @@ SWIGINTERN PyObject *_wrap_CvVectors_next_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< CvVectors * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -4040,10 +4275,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvVectors_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvVectors *arg1 = (CvVectors *) 0 ;
-  CvVectors *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvVectors *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvVectors_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVectors, 0 |  0 );
@@ -4062,10 +4297,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvVectors_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvVectors *arg1 = (CvVectors *) 0 ;
-  CvVectors_data *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvVectors_data *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvVectors_data_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVectors, 0 |  0 );
@@ -4117,7 +4352,7 @@ SWIGINTERN PyObject *_wrap_delete_CvVectors(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< CvVectors * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -4133,7 +4368,7 @@ fail:
 
 SWIGINTERN PyObject *CvVectors_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvVectors, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4161,7 +4396,6 @@ SWIGINTERN PyObject *_wrap_CvVectors_data_ptr_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< uchar ** >(argp2);
   if (arg1) (arg1)->ptr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -4172,10 +4406,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvVectors_data_ptr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvVectors_data *arg1 = (CvVectors_data *) 0 ;
-  uchar **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  uchar **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvVectors_data_ptr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVectors_data, 0 |  0 );
@@ -4216,7 +4450,6 @@ SWIGINTERN PyObject *_wrap_CvVectors_data_fl_set(PyObject *SWIGUNUSEDPARM(self),
     arg2=&buffer2;
   }
   if (arg1) (arg1)->fl = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -4227,10 +4460,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvVectors_data_fl_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvVectors_data *arg1 = (CvVectors_data *) 0 ;
-  float **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvVectors_data_fl_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVectors_data, 0 |  0 );
@@ -4269,7 +4502,6 @@ SWIGINTERN PyObject *_wrap_CvVectors_data_db_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< double ** >(argp2);
   if (arg1) (arg1)->db = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -4280,10 +4512,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvVectors_data_db_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvVectors_data *arg1 = (CvVectors_data *) 0 ;
-  double **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvVectors_data_db_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvVectors_data, 0 |  0 );
@@ -4335,7 +4567,7 @@ SWIGINTERN PyObject *_wrap_delete_CvVectors_data(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvVectors_data * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -4351,7 +4583,7 @@ fail:
 
 SWIGINTERN PyObject *CvVectors_data_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvVectors_data, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4392,7 +4624,7 @@ SWIGINTERN PyObject *_wrap_delete_CvStatModel(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvStatModel * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -4535,7 +4767,7 @@ SWIGINTERN PyObject *_wrap_CvStatModel_save(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -4571,7 +4803,10 @@ SWIGINTERN PyObject *_wrap_CvStatModel_save(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvStatModel_save'.\n  Possible C/C++ prototypes are:\n    save(char const *,char const *)\n    save(char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvStatModel_save'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    save(CvStatModel *,char const *,char const *)\n"
+    "    save(CvStatModel *,char const *)\n");
   return NULL;
 }
 
@@ -4676,7 +4911,7 @@ SWIGINTERN PyObject *_wrap_CvStatModel_load(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -4712,7 +4947,10 @@ SWIGINTERN PyObject *_wrap_CvStatModel_load(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvStatModel_load'.\n  Possible C/C++ prototypes are:\n    load(char const *,char const *)\n    load(char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvStatModel_load'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    load(CvStatModel *,char const *,char const *)\n"
+    "    load(CvStatModel *,char const *)\n");
   return NULL;
 }
 
@@ -4816,7 +5054,7 @@ fail:
 
 SWIGINTERN PyObject *CvStatModel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvStatModel, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -4847,7 +5085,6 @@ SWIGINTERN PyObject *_wrap_new_CvParamGrid__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   double arg1 ;
   double arg2 ;
   double arg3 ;
-  CvParamGrid *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -4857,6 +5094,7 @@ SWIGINTERN PyObject *_wrap_new_CvParamGrid__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvParamGrid *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvParamGrid",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
@@ -4896,7 +5134,7 @@ SWIGINTERN PyObject *_wrap_new_CvParamGrid(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -4927,7 +5165,10 @@ SWIGINTERN PyObject *_wrap_new_CvParamGrid(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvParamGrid'.\n  Possible C/C++ prototypes are:\n    CvParamGrid()\n    CvParamGrid(double,double,double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvParamGrid'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvParamGrid()\n"
+    "    CvParamGrid(double,double,double)\n");
   return NULL;
 }
 
@@ -4935,10 +5176,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvParamGrid_check(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvParamGrid *arg1 = (CvParamGrid *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvParamGrid_check",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvParamGrid, 0 |  0 );
@@ -4985,7 +5226,6 @@ SWIGINTERN PyObject *_wrap_CvParamGrid_min_val_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->min_val = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -4996,10 +5236,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvParamGrid_min_val_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvParamGrid *arg1 = (CvParamGrid *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvParamGrid_min_val_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvParamGrid, 0 |  0 );
@@ -5038,7 +5278,6 @@ SWIGINTERN PyObject *_wrap_CvParamGrid_max_val_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->max_val = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -5049,10 +5288,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvParamGrid_max_val_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvParamGrid *arg1 = (CvParamGrid *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvParamGrid_max_val_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvParamGrid, 0 |  0 );
@@ -5091,7 +5330,6 @@ SWIGINTERN PyObject *_wrap_CvParamGrid_step_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->step = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -5102,10 +5340,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvParamGrid_step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvParamGrid *arg1 = (CvParamGrid *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvParamGrid_step_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvParamGrid, 0 |  0 );
@@ -5136,7 +5374,7 @@ SWIGINTERN PyObject *_wrap_delete_CvParamGrid(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvParamGrid * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -5152,7 +5390,7 @@ fail:
 
 SWIGINTERN PyObject *CvParamGrid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvParamGrid, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -5193,7 +5431,7 @@ SWIGINTERN PyObject *_wrap_delete_CvNormalBayesClassifier(PyObject *SWIGUNUSEDPA
   arg1 = reinterpret_cast< CvNormalBayesClassifier * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -5213,7 +5451,6 @@ SWIGINTERN PyObject *_wrap_new_CvNormalBayesClassifier__SWIG_1(PyObject *SWIGUNU
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvNormalBayesClassifier *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -5222,6 +5459,7 @@ SWIGINTERN PyObject *_wrap_new_CvNormalBayesClassifier__SWIG_1(PyObject *SWIGUNU
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvNormalBayesClassifier *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvNormalBayesClassifier",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -5305,13 +5543,13 @@ SWIGINTERN PyObject *_wrap_new_CvNormalBayesClassifier__SWIG_2(PyObject *SWIGUNU
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvNormalBayesClassifier *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvNormalBayesClassifier *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvNormalBayesClassifier",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -5379,11 +5617,11 @@ SWIGINTERN PyObject *_wrap_new_CvNormalBayesClassifier__SWIG_3(PyObject *SWIGUNU
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  CvNormalBayesClassifier *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvNormalBayesClassifier *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvNormalBayesClassifier",&obj0,&obj1)) SWIG_fail;
   {
@@ -5438,7 +5676,7 @@ SWIGINTERN PyObject *_wrap_new_CvNormalBayesClassifier(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -5504,7 +5742,12 @@ SWIGINTERN PyObject *_wrap_new_CvNormalBayesClassifier(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvNormalBayesClassifier'.\n  Possible C/C++ prototypes are:\n    CvNormalBayesClassifier()\n    CvNormalBayesClassifier(CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    CvNormalBayesClassifier(CvMat const *,CvMat const *,CvMat const *)\n    CvNormalBayesClassifier(CvMat const *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvNormalBayesClassifier'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvNormalBayesClassifier()\n"
+    "    CvNormalBayesClassifier(CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvNormalBayesClassifier(CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvNormalBayesClassifier(CvMat const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -5517,7 +5760,6 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train__SWIG_0(PyObject *SWIGU
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   bool arg6 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -5532,6 +5774,7 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train__SWIG_0(PyObject *SWIGU
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvNormalBayesClassifier_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNormalBayesClassifier, 0 |  0 );
@@ -5627,7 +5870,6 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train__SWIG_1(PyObject *SWIGU
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -5639,6 +5881,7 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train__SWIG_1(PyObject *SWIGU
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvNormalBayesClassifier_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNormalBayesClassifier, 0 |  0 );
@@ -5728,7 +5971,6 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train__SWIG_2(PyObject *SWIGU
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -5738,6 +5980,7 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train__SWIG_2(PyObject *SWIGU
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvNormalBayesClassifier_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNormalBayesClassifier, 0 |  0 );
@@ -5811,7 +6054,6 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train__SWIG_3(PyObject *SWIGU
   CvNormalBayesClassifier *arg1 = (CvNormalBayesClassifier *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -5819,6 +6061,7 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train__SWIG_3(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvNormalBayesClassifier_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNormalBayesClassifier, 0 |  0 );
@@ -5878,7 +6121,7 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -5991,7 +6234,12 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_train(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvNormalBayesClassifier_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,CvMat const *,CvMat const *,CvMat const *,bool)\n    train(CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvNormalBayesClassifier_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvNormalBayesClassifier *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,bool)\n"
+    "    train(CvNormalBayesClassifier *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvNormalBayesClassifier *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvNormalBayesClassifier *,CvMat const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -6001,7 +6249,6 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_predict__SWIG_0(PyObject *SWI
   CvNormalBayesClassifier *arg1 = (CvNormalBayesClassifier *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -6009,6 +6256,7 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_predict__SWIG_0(PyObject *SWI
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvNormalBayesClassifier_predict",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNormalBayesClassifier, 0 |  0 );
@@ -6066,12 +6314,12 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_predict__SWIG_1(PyObject *SWI
   PyObject *resultobj = 0;
   CvNormalBayesClassifier *arg1 = (CvNormalBayesClassifier *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvNormalBayesClassifier_predict",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvNormalBayesClassifier, 0 |  0 );
@@ -6116,7 +6364,7 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_predict(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -6155,7 +6403,10 @@ SWIGINTERN PyObject *_wrap_CvNormalBayesClassifier_predict(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvNormalBayesClassifier_predict'.\n  Possible C/C++ prototypes are:\n    predict(CvMat const *,CvMat *)\n    predict(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvNormalBayesClassifier_predict'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    predict(CvNormalBayesClassifier const *,CvMat const *,CvMat *)\n"
+    "    predict(CvNormalBayesClassifier const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -6288,7 +6539,7 @@ fail:
 
 SWIGINTERN PyObject *CvNormalBayesClassifier_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvNormalBayesClassifier, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -6329,7 +6580,7 @@ SWIGINTERN PyObject *_wrap_delete_CvKNearest(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvKNearest * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -6350,7 +6601,6 @@ SWIGINTERN PyObject *_wrap_new_CvKNearest__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg3 = (CvMat *) 0 ;
   bool arg4 ;
   int arg5 ;
-  CvKNearest *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -6363,6 +6613,7 @@ SWIGINTERN PyObject *_wrap_new_CvKNearest__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvKNearest *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvKNearest",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -6442,7 +6693,6 @@ SWIGINTERN PyObject *_wrap_new_CvKNearest__SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   bool arg4 ;
-  CvKNearest *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -6452,6 +6702,7 @@ SWIGINTERN PyObject *_wrap_new_CvKNearest__SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvKNearest *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvKNearest",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -6525,13 +6776,13 @@ SWIGINTERN PyObject *_wrap_new_CvKNearest__SWIG_3(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvKNearest *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvKNearest *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvKNearest",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -6599,11 +6850,11 @@ SWIGINTERN PyObject *_wrap_new_CvKNearest__SWIG_4(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  CvKNearest *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvKNearest *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvKNearest",&obj0,&obj1)) SWIG_fail;
   {
@@ -6658,7 +6909,7 @@ SWIGINTERN PyObject *_wrap_new_CvKNearest(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -6756,7 +7007,13 @@ SWIGINTERN PyObject *_wrap_new_CvKNearest(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvKNearest'.\n  Possible C/C++ prototypes are:\n    CvKNearest()\n    CvKNearest(CvMat const *,CvMat const *,CvMat const *,bool,int)\n    CvKNearest(CvMat const *,CvMat const *,CvMat const *,bool)\n    CvKNearest(CvMat const *,CvMat const *,CvMat const *)\n    CvKNearest(CvMat const *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvKNearest'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvKNearest()\n"
+    "    CvKNearest(CvMat const *,CvMat const *,CvMat const *,bool,int)\n"
+    "    CvKNearest(CvMat const *,CvMat const *,CvMat const *,bool)\n"
+    "    CvKNearest(CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvKNearest(CvMat const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -6770,7 +7027,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   bool arg5 ;
   int arg6 ;
   bool arg7 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -6789,6 +7045,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvKNearest_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -6880,7 +7137,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   CvMat *arg4 = (CvMat *) 0 ;
   bool arg5 ;
   int arg6 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -6896,6 +7152,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvKNearest_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -6981,7 +7238,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_2(PyObject *SWIGUNUSEDPARM(sel
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   bool arg5 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -6994,6 +7250,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_2(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvKNearest_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -7073,7 +7330,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_3(PyObject *SWIGUNUSEDPARM(sel
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -7083,6 +7339,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_3(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvKNearest_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -7156,7 +7413,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_4(PyObject *SWIGUNUSEDPARM(sel
   CvKNearest *arg1 = (CvKNearest *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -7164,6 +7420,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train__SWIG_4(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvKNearest_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -7223,7 +7480,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 7); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -7380,7 +7637,13 @@ SWIGINTERN PyObject *_wrap_CvKNearest_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvKNearest_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,CvMat const *,CvMat const *,bool,int,bool)\n    train(CvMat const *,CvMat const *,CvMat const *,bool,int)\n    train(CvMat const *,CvMat const *,CvMat const *,bool)\n    train(CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvKNearest_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvKNearest *,CvMat const *,CvMat const *,CvMat const *,bool,int,bool)\n"
+    "    train(CvKNearest *,CvMat const *,CvMat const *,CvMat const *,bool,int)\n"
+    "    train(CvKNearest *,CvMat const *,CvMat const *,CvMat const *,bool)\n"
+    "    train(CvKNearest *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvKNearest *,CvMat const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -7394,7 +7657,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_0(PyObject *SWIGUNUSEDP
   float **arg5 = (float **) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -7412,6 +7674,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_0(PyObject *SWIGUNUSEDP
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvKNearest_find_nearest",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -7515,7 +7778,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_1(PyObject *SWIGUNUSEDP
   CvMat *arg4 = (CvMat *) 0 ;
   float **arg5 = (float **) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -7531,6 +7793,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvKNearest_find_nearest",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -7618,7 +7881,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_2(PyObject *SWIGUNUSEDP
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   float **arg5 = (float **) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -7632,6 +7894,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_2(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvKNearest_find_nearest",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -7703,7 +7966,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_3(PyObject *SWIGUNUSEDP
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -7714,6 +7976,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_3(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvKNearest_find_nearest",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -7777,7 +8040,6 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_4(PyObject *SWIGUNUSEDP
   CvKNearest *arg1 = (CvKNearest *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -7786,6 +8048,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest__SWIG_4(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvKNearest_find_nearest",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -7835,7 +8098,7 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 7); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -7991,7 +8254,13 @@ SWIGINTERN PyObject *_wrap_CvKNearest_find_nearest(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvKNearest_find_nearest'.\n  Possible C/C++ prototypes are:\n    find_nearest(CvMat const *,int,CvMat *,float const **,CvMat *,CvMat *)\n    find_nearest(CvMat const *,int,CvMat *,float const **,CvMat *)\n    find_nearest(CvMat const *,int,CvMat *,float const **)\n    find_nearest(CvMat const *,int,CvMat *)\n    find_nearest(CvMat const *,int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvKNearest_find_nearest'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    find_nearest(CvKNearest const *,CvMat const *,int,CvMat *,float const **,CvMat *,CvMat *)\n"
+    "    find_nearest(CvKNearest const *,CvMat const *,int,CvMat *,float const **,CvMat *)\n"
+    "    find_nearest(CvKNearest const *,CvMat const *,int,CvMat *,float const **)\n"
+    "    find_nearest(CvKNearest const *,CvMat const *,int,CvMat *)\n"
+    "    find_nearest(CvKNearest const *,CvMat const *,int)\n");
   return NULL;
 }
 
@@ -8028,10 +8297,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKNearest_get_max_k(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKNearest *arg1 = (CvKNearest *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKNearest_get_max_k",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -8058,10 +8327,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKNearest_get_var_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKNearest *arg1 = (CvKNearest *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKNearest_get_var_count",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -8088,10 +8357,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKNearest_get_sample_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKNearest *arg1 = (CvKNearest *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKNearest_get_sample_count",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -8118,10 +8387,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvKNearest_is_regression(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvKNearest *arg1 = (CvKNearest *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvKNearest_is_regression",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvKNearest, 0 |  0 );
@@ -8147,7 +8416,7 @@ fail:
 
 SWIGINTERN PyObject *CvKNearest_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvKNearest, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8185,7 +8454,6 @@ SWIGINTERN PyObject *_wrap_new_CvSVMParams__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   double arg8 ;
   CvMat *arg9 = (CvMat *) 0 ;
   CvTermCriteria arg10 ;
-  CvSVMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -8214,6 +8482,7 @@ SWIGINTERN PyObject *_wrap_new_CvSVMParams__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
+  CvSVMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO:new_CvSVMParams",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -8314,7 +8583,7 @@ SWIGINTERN PyObject *_wrap_new_CvSVMParams(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 10); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8384,7 +8653,10 @@ SWIGINTERN PyObject *_wrap_new_CvSVMParams(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvSVMParams'.\n  Possible C/C++ prototypes are:\n    CvSVMParams()\n    CvSVMParams(int,int,double,double,double,double,double,double,CvMat *,CvTermCriteria)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvSVMParams'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvSVMParams()\n"
+    "    CvSVMParams(int,int,double,double,double,double,double,double,CvMat *,CvTermCriteria)\n");
   return NULL;
 }
 
@@ -8412,7 +8684,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_svm_type_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->svm_type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8423,10 +8694,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_svm_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_svm_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8465,7 +8736,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_kernel_type_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->kernel_type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8476,10 +8746,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_kernel_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_kernel_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8518,7 +8788,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_degree_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->degree = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8529,10 +8798,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_degree_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_degree_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8571,7 +8840,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_gamma_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->gamma = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8582,10 +8850,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_gamma_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_gamma_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8624,7 +8892,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_coef0_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->coef0 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8635,10 +8902,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_coef0_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_coef0_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8677,7 +8944,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_C_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->C = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8688,10 +8954,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_C_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_C_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8730,7 +8996,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_nu_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->nu = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8741,10 +9006,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_nu_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_nu_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8783,7 +9048,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_p_set(PyObject *SWIGUNUSEDPARM(self), PyO
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->p = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8794,10 +9058,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_p_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_p_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8833,7 +9097,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_class_weights_set(PyObject *SWIGUNUSEDPAR
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->class_weights = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -8856,10 +9119,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_class_weights_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_class_weights_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8898,7 +9161,6 @@ SWIGINTERN PyObject *_wrap_CvSVMParams_term_crit_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< CvTermCriteria * >(argp2);
   if (arg1) (arg1)->term_crit = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8909,10 +9171,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMParams_term_crit_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
-  CvTermCriteria *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTermCriteria *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMParams_term_crit_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -8943,7 +9205,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSVMParams(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvSVMParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -8959,7 +9221,7 @@ fail:
 
 SWIGINTERN PyObject *CvSVMParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSVMParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -8989,11 +9251,11 @@ SWIGINTERN PyObject *_wrap_new_CvSVMKernel__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   CvSVMParams *arg1 = (CvSVMParams *) 0 ;
   CvSVMKernel::Calc arg2 ;
-  CvSVMKernel *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSVMKernel *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvSVMKernel",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMParams, 0 |  0 );
@@ -9029,7 +9291,7 @@ SWIGINTERN PyObject *_wrap_new_CvSVMKernel(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -9052,7 +9314,10 @@ SWIGINTERN PyObject *_wrap_new_CvSVMKernel(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvSVMKernel'.\n  Possible C/C++ prototypes are:\n    CvSVMKernel()\n    CvSVMKernel(CvSVMParams const *,CvSVMKernel::Calc)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvSVMKernel'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvSVMKernel()\n"
+    "    CvSVMKernel(CvSVMParams const *,CvSVMKernel::Calc)\n");
   return NULL;
 }
 
@@ -9062,7 +9327,6 @@ SWIGINTERN PyObject *_wrap_CvSVMKernel_create(PyObject *SWIGUNUSEDPARM(self), Py
   CvSVMKernel *arg1 = (CvSVMKernel *) 0 ;
   CvSVMParams *arg2 = (CvSVMParams *) 0 ;
   CvSVMKernel::Calc arg3 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9070,6 +9334,7 @@ SWIGINTERN PyObject *_wrap_CvSVMKernel_create(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSVMKernel_create",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMKernel, 0 |  0 );
@@ -9119,7 +9384,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSVMKernel(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvSVMKernel * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -9261,7 +9526,6 @@ SWIGINTERN PyObject *_wrap_CvSVMKernel_params_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvSVMParams * >(argp2);
   if (arg1) (arg1)->params = (CvSVMParams const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9272,10 +9536,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMKernel_params_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMKernel *arg1 = (CvSVMKernel *) 0 ;
-  CvSVMParams *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMKernel_params_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMKernel, 0 |  0 );
@@ -9313,7 +9577,6 @@ SWIGINTERN PyObject *_wrap_CvSVMKernel_calc_func_set(PyObject *SWIGUNUSEDPARM(se
     }
   }
   if (arg1) (arg1)->calc_func = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9324,10 +9587,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMKernel_calc_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMKernel *arg1 = (CvSVMKernel *) 0 ;
-  CvSVMKernel::Calc result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMKernel::Calc result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMKernel_calc_func_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMKernel, 0 |  0 );
@@ -9743,7 +10006,7 @@ fail:
 
 SWIGINTERN PyObject *CvSVMKernel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSVMKernel, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9771,7 +10034,6 @@ SWIGINTERN PyObject *_wrap_CvSVMKernelRow_prev_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvSVMKernelRow * >(argp2);
   if (arg1) (arg1)->prev = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9782,10 +10044,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMKernelRow_prev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMKernelRow *arg1 = (CvSVMKernelRow *) 0 ;
-  CvSVMKernelRow *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMKernelRow *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMKernelRow_prev_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMKernelRow, 0 |  0 );
@@ -9824,7 +10086,6 @@ SWIGINTERN PyObject *_wrap_CvSVMKernelRow_next_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvSVMKernelRow * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9835,10 +10096,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMKernelRow_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMKernelRow *arg1 = (CvSVMKernelRow *) 0 ;
-  CvSVMKernelRow *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMKernelRow *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMKernelRow_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMKernelRow, 0 |  0 );
@@ -9877,7 +10138,6 @@ SWIGINTERN PyObject *_wrap_CvSVMKernelRow_data_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->data = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9888,10 +10148,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMKernelRow_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMKernelRow *arg1 = (CvSVMKernelRow *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMKernelRow_data_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMKernelRow, 0 |  0 );
@@ -9943,7 +10203,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSVMKernelRow(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvSVMKernelRow * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -9959,7 +10219,7 @@ fail:
 
 SWIGINTERN PyObject *CvSVMKernelRow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSVMKernelRow, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -9987,7 +10247,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_obj_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->obj = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9998,10 +10257,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_obj_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolutionInfo *arg1 = (CvSVMSolutionInfo *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolutionInfo_obj_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolutionInfo, 0 |  0 );
@@ -10040,7 +10299,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_rho_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->rho = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10051,10 +10309,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_rho_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolutionInfo *arg1 = (CvSVMSolutionInfo *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolutionInfo_rho_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolutionInfo, 0 |  0 );
@@ -10093,7 +10351,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_upper_bound_p_set(PyObject *SWIGUNU
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->upper_bound_p = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10104,10 +10361,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_upper_bound_p_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolutionInfo *arg1 = (CvSVMSolutionInfo *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolutionInfo_upper_bound_p_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolutionInfo, 0 |  0 );
@@ -10146,7 +10403,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_upper_bound_n_set(PyObject *SWIGUNU
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->upper_bound_n = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10157,10 +10413,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_upper_bound_n_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolutionInfo *arg1 = (CvSVMSolutionInfo *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolutionInfo_upper_bound_n_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolutionInfo, 0 |  0 );
@@ -10199,7 +10455,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_r_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->r = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10210,10 +10465,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolutionInfo_r_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolutionInfo *arg1 = (CvSVMSolutionInfo *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolutionInfo_r_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolutionInfo, 0 |  0 );
@@ -10265,7 +10520,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSVMSolutionInfo(PyObject *SWIGUNUSEDPARM(sel
   arg1 = reinterpret_cast< CvSVMSolutionInfo * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -10281,7 +10536,7 @@ fail:
 
 SWIGINTERN PyObject *CvSVMSolutionInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSVMSolutionInfo, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -10322,7 +10577,6 @@ SWIGINTERN PyObject *_wrap_new_CvSVMSolver__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   CvSVMSolver::GetRow arg11 ;
   CvSVMSolver::SelectWorkingSet arg12 ;
   CvSVMSolver::CalcRho arg13 ;
-  CvSVMSolver *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -10356,6 +10610,7 @@ SWIGINTERN PyObject *_wrap_new_CvSVMSolver__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj10 = 0 ;
   PyObject * obj11 = 0 ;
   PyObject * obj12 = 0 ;
+  CvSVMSolver *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOO:new_CvSVMSolver",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -10450,7 +10705,7 @@ SWIGINTERN PyObject *_wrap_new_CvSVMSolver(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 13); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -10533,7 +10788,10 @@ SWIGINTERN PyObject *_wrap_new_CvSVMSolver(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvSVMSolver'.\n  Possible C/C++ prototypes are:\n    CvSVMSolver()\n    CvSVMSolver(int,int,float const **,schar *,int,double *,double,double,CvMemStorage *,CvSVMKernel *,CvSVMSolver::GetRow,CvSVMSolver::SelectWorkingSet,CvSVMSolver::CalcRho)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvSVMSolver'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvSVMSolver()\n"
+    "    CvSVMSolver(int,int,float const **,schar *,int,double *,double,double,CvMemStorage *,CvSVMKernel *,CvSVMSolver::GetRow,CvSVMSolver::SelectWorkingSet,CvSVMSolver::CalcRho)\n");
   return NULL;
 }
 
@@ -10554,7 +10812,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_create(PyObject *SWIGUNUSEDPARM(self), Py
   CvSVMSolver::GetRow arg12 ;
   CvSVMSolver::SelectWorkingSet arg13 ;
   CvSVMSolver::CalcRho arg14 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10591,6 +10848,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_create(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj11 = 0 ;
   PyObject * obj12 = 0 ;
   PyObject * obj13 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOOO:CvSVMSolver_create",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -10699,7 +10957,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSVMSolver(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvSVMSolver * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -10746,13 +11004,13 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_generic(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
   CvSVMSolutionInfo *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSVMSolver_solve_generic",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -10797,7 +11055,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_c_svc(PyObject *SWIGUNUSEDPARM(self
   CvSVMKernel *arg9 = (CvSVMKernel *) 0 ;
   double *arg10 = (double *) 0 ;
   CvSVMSolutionInfo *arg11 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10831,6 +11088,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_c_svc(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
   PyObject * obj10 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOO:CvSVMSolver_solve_c_svc",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -10920,7 +11178,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_nu_svc(PyObject *SWIGUNUSEDPARM(sel
   CvSVMKernel *arg7 = (CvSVMKernel *) 0 ;
   double *arg8 = (double *) 0 ;
   CvSVMSolutionInfo *arg9 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10948,6 +11205,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_nu_svc(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvSVMSolver_solve_nu_svc",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11026,7 +11284,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_one_class(PyObject *SWIGUNUSEDPARM(
   CvSVMKernel *arg6 = (CvSVMKernel *) 0 ;
   double *arg7 = (double *) 0 ;
   CvSVMSolutionInfo *arg8 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11051,6 +11308,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_one_class(PyObject *SWIGUNUSEDPARM(
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:CvSVMSolver_solve_one_class",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11125,7 +11383,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_eps_svr(PyObject *SWIGUNUSEDPARM(se
   CvSVMKernel *arg7 = (CvSVMKernel *) 0 ;
   double *arg8 = (double *) 0 ;
   CvSVMSolutionInfo *arg9 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11153,6 +11410,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_eps_svr(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvSVMSolver_solve_eps_svr",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11232,7 +11490,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_nu_svr(PyObject *SWIGUNUSEDPARM(sel
   CvSVMKernel *arg7 = (CvSVMKernel *) 0 ;
   double *arg8 = (double *) 0 ;
   CvSVMSolutionInfo *arg9 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11260,6 +11517,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_solve_nu_svr(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvSVMSolver_solve_nu_svr",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11333,7 +11591,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_base(PyObject *SWIGUNUSEDPARM(sel
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
   int arg2 ;
   bool *arg3 = (bool *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11343,6 +11600,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_base(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSVMSolver_get_row_base",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11381,7 +11639,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row(PyObject *SWIGUNUSEDPARM(self), P
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
   int arg2 ;
   float *arg3 = (float *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11391,6 +11648,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSVMSolver_get_row",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11447,7 +11705,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_sample_count_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->sample_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11458,10 +11715,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_sample_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_sample_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11500,7 +11757,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_var_count_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->var_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11511,10 +11767,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_var_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_var_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11553,7 +11809,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_cache_size_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->cache_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11564,10 +11819,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_cache_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_cache_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11606,7 +11861,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_cache_line_size_set(PyObject *SWIGUNUSEDP
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->cache_line_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11617,10 +11871,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_cache_line_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_cache_line_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11661,7 +11915,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_samples_set(PyObject *SWIGUNUSEDPARM(self
     arg2=&buffer2;
   }
   if (arg1) (arg1)->samples = (float const **)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11672,10 +11925,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_samples_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  float **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_samples_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11714,7 +11967,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_params_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvSVMParams * >(argp2);
   if (arg1) (arg1)->params = (CvSVMParams const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11725,10 +11977,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_params_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  CvSVMParams *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_params_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11767,7 +12019,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_storage_set(PyObject *SWIGUNUSEDPARM(self
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11778,10 +12029,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_storage_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11820,7 +12071,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_lru_list_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< CvSVMKernelRow * >(argp2);
   if (arg1) (arg1)->lru_list = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11831,10 +12081,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_lru_list_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  CvSVMKernelRow *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMKernelRow *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_lru_list_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11873,7 +12123,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_rows_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvSVMKernelRow * >(argp2);
   if (arg1) (arg1)->rows = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11884,10 +12133,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_rows_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  CvSVMKernelRow *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMKernelRow *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_rows_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11926,7 +12175,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_alpha_count_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->alpha_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11937,10 +12185,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_alpha_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_alpha_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -11979,7 +12227,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_G_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< double * >(argp2);
   if (arg1) (arg1)->G = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -11990,10 +12237,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_G_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_G_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12032,7 +12279,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_alpha_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< double * >(argp2);
   if (arg1) (arg1)->alpha = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12043,10 +12289,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_alpha_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_alpha_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12085,7 +12331,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_alpha_status_set(PyObject *SWIGUNUSEDPARM
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->alpha_status = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12096,10 +12341,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_alpha_status_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_alpha_status_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12138,7 +12383,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_y_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< schar * >(argp2);
   if (arg1) (arg1)->y = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12149,10 +12393,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_y_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  schar *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  schar *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_y_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12191,7 +12435,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_b_set(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   arg2 = reinterpret_cast< double * >(argp2);
   if (arg1) (arg1)->b = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12202,10 +12445,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_b_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_b_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12261,10 +12504,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  float **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12303,7 +12546,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_eps_set(PyObject *SWIGUNUSEDPARM(self), P
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->eps = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12314,10 +12556,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_eps_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_eps_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12356,7 +12598,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_max_iter_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->max_iter = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12367,10 +12608,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_max_iter_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_max_iter_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12426,10 +12667,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_C_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_C_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12468,7 +12709,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_kernel_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvSVMKernel * >(argp2);
   if (arg1) (arg1)->kernel = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12479,10 +12719,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_kernel_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  CvSVMKernel *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMKernel *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_kernel_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12520,7 +12760,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_select_working_set_func_set(PyObject *SWI
     }
   }
   if (arg1) (arg1)->select_working_set_func = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12531,10 +12770,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_select_working_set_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  CvSVMSolver::SelectWorkingSet result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMSolver::SelectWorkingSet result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_select_working_set_func_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12572,7 +12811,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_calc_rho_func_set(PyObject *SWIGUNUSEDPAR
     }
   }
   if (arg1) (arg1)->calc_rho_func = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12583,10 +12821,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_calc_rho_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  CvSVMSolver::CalcRho result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMSolver::CalcRho result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_calc_rho_func_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12624,7 +12862,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_func_set(PyObject *SWIGUNUSEDPARM
     }
   }
   if (arg1) (arg1)->get_row_func = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -12635,10 +12872,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
-  CvSVMSolver::GetRow result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMSolver::GetRow result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMSolver_get_row_func_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12659,7 +12896,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_select_working_set(PyObject *SWIGUNUSEDPA
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
   int *arg2 = 0 ;
   int *arg3 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12669,6 +12905,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_select_working_set(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSVMSolver_select_working_set",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12713,7 +12950,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_select_working_set_nu_svm(PyObject *SWIGU
   CvSVMSolver *arg1 = (CvSVMSolver *) 0 ;
   int *arg2 = 0 ;
   int *arg3 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12723,6 +12959,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_select_working_set_nu_svm(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSVMSolver_select_working_set_nu_svm",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12875,7 +13112,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_svc(PyObject *SWIGUNUSEDPARM(self
   float *arg3 = (float *) 0 ;
   float *arg4 = (float *) 0 ;
   bool arg5 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -12891,6 +13127,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_svc(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvSVMSolver_get_row_svc",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -12941,7 +13178,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_one_class(PyObject *SWIGUNUSEDPAR
   float *arg3 = (float *) 0 ;
   float *arg4 = (float *) 0 ;
   bool arg5 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -12957,6 +13193,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_one_class(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvSVMSolver_get_row_one_class",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -13007,7 +13244,6 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_svr(PyObject *SWIGUNUSEDPARM(self
   float *arg3 = (float *) 0 ;
   float *arg4 = (float *) 0 ;
   bool arg5 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -13023,6 +13259,7 @@ SWIGINTERN PyObject *_wrap_CvSVMSolver_get_row_svr(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvSVMSolver_get_row_svr",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMSolver, 0 |  0 );
@@ -13068,7 +13305,7 @@ fail:
 
 SWIGINTERN PyObject *CvSVMSolver_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSVMSolver, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -13096,7 +13333,6 @@ SWIGINTERN PyObject *_wrap_CvSVMDecisionFunc_rho_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->rho = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13107,10 +13343,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMDecisionFunc_rho_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMDecisionFunc *arg1 = (CvSVMDecisionFunc *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMDecisionFunc_rho_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMDecisionFunc, 0 |  0 );
@@ -13149,7 +13385,6 @@ SWIGINTERN PyObject *_wrap_CvSVMDecisionFunc_sv_count_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->sv_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13160,10 +13395,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMDecisionFunc_sv_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMDecisionFunc *arg1 = (CvSVMDecisionFunc *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMDecisionFunc_sv_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMDecisionFunc, 0 |  0 );
@@ -13202,7 +13437,6 @@ SWIGINTERN PyObject *_wrap_CvSVMDecisionFunc_alpha_set(PyObject *SWIGUNUSEDPARM(
   }
   arg2 = reinterpret_cast< double * >(argp2);
   if (arg1) (arg1)->alpha = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13213,10 +13447,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMDecisionFunc_alpha_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMDecisionFunc *arg1 = (CvSVMDecisionFunc *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMDecisionFunc_alpha_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMDecisionFunc, 0 |  0 );
@@ -13255,7 +13489,6 @@ SWIGINTERN PyObject *_wrap_CvSVMDecisionFunc_sv_index_set(PyObject *SWIGUNUSEDPA
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->sv_index = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -13266,10 +13499,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVMDecisionFunc_sv_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVMDecisionFunc *arg1 = (CvSVMDecisionFunc *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVMDecisionFunc_sv_index_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVMDecisionFunc, 0 |  0 );
@@ -13321,7 +13554,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSVMDecisionFunc(PyObject *SWIGUNUSEDPARM(sel
   arg1 = reinterpret_cast< CvSVMDecisionFunc * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -13337,7 +13570,7 @@ fail:
 
 SWIGINTERN PyObject *CvSVMDecisionFunc_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSVMDecisionFunc, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -13378,7 +13611,7 @@ SWIGINTERN PyObject *_wrap_delete_CvSVM(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< CvSVM * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -13399,7 +13632,6 @@ SWIGINTERN PyObject *_wrap_new_CvSVM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvSVMParams arg5 ;
-  CvSVM *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -13411,6 +13643,7 @@ SWIGINTERN PyObject *_wrap_new_CvSVM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvSVM *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvSVM",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -13508,7 +13741,6 @@ SWIGINTERN PyObject *_wrap_new_CvSVM__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvSVM *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
@@ -13517,6 +13749,7 @@ SWIGINTERN PyObject *_wrap_new_CvSVM__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvSVM *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvSVM",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -13600,13 +13833,13 @@ SWIGINTERN PyObject *_wrap_new_CvSVM__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvSVM *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   bool freearg3 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvSVM *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvSVM",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -13674,11 +13907,11 @@ SWIGINTERN PyObject *_wrap_new_CvSVM__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  CvSVM *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvSVM *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvSVM",&obj0,&obj1)) SWIG_fail;
   {
@@ -13733,7 +13966,7 @@ SWIGINTERN PyObject *_wrap_new_CvSVM(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -13827,7 +14060,13 @@ SWIGINTERN PyObject *_wrap_new_CvSVM(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvSVM'.\n  Possible C/C++ prototypes are:\n    CvSVM()\n    CvSVM(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams)\n    CvSVM(CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    CvSVM(CvMat const *,CvMat const *,CvMat const *)\n    CvSVM(CvMat const *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvSVM'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvSVM()\n"
+    "    CvSVM(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams)\n"
+    "    CvSVM(CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvSVM(CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvSVM(CvMat const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -13840,7 +14079,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvSVMParams arg6 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -13855,6 +14093,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvSVM_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -13958,7 +14197,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -13970,6 +14208,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvSVM_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -14059,7 +14298,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -14069,6 +14307,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvSVM_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -14142,7 +14381,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self), P
   CvSVM *arg1 = (CvSVM *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -14150,6 +14388,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvSVM_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -14209,7 +14448,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -14320,7 +14559,12 @@ SWIGINTERN PyObject *_wrap_CvSVM_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvSVM_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams)\n    train(CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvSVM_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams)\n"
+    "    train(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvSVM *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvSVM *,CvMat const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -14340,7 +14584,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   CvParamGrid arg11 ;
   CvParamGrid arg12 ;
   CvParamGrid arg13 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -14376,6 +14619,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj10 = 0 ;
   PyObject * obj11 = 0 ;
   PyObject * obj12 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOO:CvSVM_train_auto",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -14569,7 +14813,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   CvParamGrid arg10 ;
   CvParamGrid arg11 ;
   CvParamGrid arg12 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -14602,6 +14845,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj9 = 0 ;
   PyObject * obj10 = 0 ;
   PyObject * obj11 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOO:CvSVM_train_auto",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -14781,7 +15025,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_2(PyObject *SWIGUNUSEDPARM(sel
   CvParamGrid arg9 ;
   CvParamGrid arg10 ;
   CvParamGrid arg11 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -14811,6 +15054,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_2(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
   PyObject * obj10 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOO:CvSVM_train_auto",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -14976,7 +15220,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_3(PyObject *SWIGUNUSEDPARM(sel
   CvParamGrid arg8 ;
   CvParamGrid arg9 ;
   CvParamGrid arg10 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -15003,6 +15246,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_3(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO:CvSVM_train_auto",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -15154,7 +15398,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_4(PyObject *SWIGUNUSEDPARM(sel
   int arg7 ;
   CvParamGrid arg8 ;
   CvParamGrid arg9 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -15178,6 +15421,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_4(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvSVM_train_auto",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -15315,7 +15559,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_5(PyObject *SWIGUNUSEDPARM(sel
   CvSVMParams arg6 ;
   int arg7 ;
   CvParamGrid arg8 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -15336,6 +15579,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_5(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:CvSVM_train_auto",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -15459,7 +15703,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_6(PyObject *SWIGUNUSEDPARM(sel
   CvMat *arg5 = (CvMat *) 0 ;
   CvSVMParams arg6 ;
   int arg7 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -15477,6 +15720,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_6(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvSVM_train_auto",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -15586,7 +15830,6 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_7(PyObject *SWIGUNUSEDPARM(sel
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvSVMParams arg6 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -15601,6 +15844,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto__SWIG_7(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvSVM_train_auto",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -15703,7 +15947,7 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 13); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -16099,7 +16343,16 @@ SWIGINTERN PyObject *_wrap_CvSVM_train_auto(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvSVM_train_auto'.\n  Possible C/C++ prototypes are:\n    train_auto(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid)\n    train_auto(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid)\n    train_auto(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid)\n    train_auto(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid,CvParamGrid)\n    train_auto(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid)\n    train_auto(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid)\n    train_auto(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int)\n    train_auto(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvSVM_train_auto'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train_auto(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid)\n"
+    "    train_auto(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid)\n"
+    "    train_auto(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid,CvParamGrid,CvParamGrid)\n"
+    "    train_auto(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid,CvParamGrid)\n"
+    "    train_auto(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid,CvParamGrid)\n"
+    "    train_auto(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int,CvParamGrid)\n"
+    "    train_auto(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams,int)\n"
+    "    train_auto(CvSVM *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvSVMParams)\n");
   return NULL;
 }
 
@@ -16108,12 +16361,12 @@ SWIGINTERN PyObject *_wrap_CvSVM_predict(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   CvSVM *arg1 = (CvSVM *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSVM_predict",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -16155,10 +16408,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVM_get_support_vector_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVM *arg1 = (CvSVM *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVM_get_support_vector_count",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -16186,13 +16439,13 @@ SWIGINTERN PyObject *_wrap_CvSVM_get_support_vector(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   CvSVM *arg1 = (CvSVM *) 0 ;
   int arg2 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvSVM_get_support_vector",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -16224,10 +16477,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVM_get_params(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVM *arg1 = (CvSVM *) 0 ;
-  CvSVMParams result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSVMParams result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVM_get_params",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -16283,10 +16536,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVM_get_default_grid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  CvParamGrid result;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvParamGrid result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVM_get_default_grid",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -16410,10 +16663,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvSVM_get_var_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvSVM *arg1 = (CvSVM *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvSVM_get_var_count",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvSVM, 0 |  0 );
@@ -16439,7 +16692,7 @@ fail:
 
 SWIGINTERN PyObject *CvSVM_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvSVM, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -16475,7 +16728,6 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat **arg8 = (CvMat **) 0 ;
-  CvEMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -16496,6 +16748,7 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  CvEMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:new_CvEMParams",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -16609,7 +16862,6 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  CvEMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -16627,6 +16879,7 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvEMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:new_CvEMParams",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -16734,7 +16987,6 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_3(PyObject *SWIGUNUSEDPARM(self)
   CvTermCriteria arg4 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  CvEMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -16750,6 +17002,7 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_3(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvEMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_CvEMParams",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -16841,7 +17094,6 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_4(PyObject *SWIGUNUSEDPARM(self)
   int arg3 ;
   CvTermCriteria arg4 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  CvEMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -16855,6 +17107,7 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_4(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvEMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvEMParams",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -16930,7 +17183,6 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_5(PyObject *SWIGUNUSEDPARM(self)
   int arg2 ;
   int arg3 ;
   CvTermCriteria arg4 ;
-  CvEMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -16942,6 +17194,7 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_5(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvEMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvEMParams",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -17001,7 +17254,6 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_6(PyObject *SWIGUNUSEDPARM(self)
   int arg1 ;
   int arg2 ;
   int arg3 ;
-  CvEMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -17011,6 +17263,7 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_6(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvEMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvEMParams",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -17048,13 +17301,13 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_7(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
-  CvEMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvEMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvEMParams",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -17086,10 +17339,10 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvEMParams__SWIG_8(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  CvEMParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvEMParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvEMParams",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -17119,7 +17372,7 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 8); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -17356,7 +17609,17 @@ SWIGINTERN PyObject *_wrap_new_CvEMParams(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvEMParams'.\n  Possible C/C++ prototypes are:\n    CvEMParams()\n    CvEMParams(int,int,int,CvTermCriteria,CvMat const *,CvMat const *,CvMat const *,CvMat const **)\n    CvEMParams(int,int,int,CvTermCriteria,CvMat const *,CvMat const *,CvMat const *)\n    CvEMParams(int,int,int,CvTermCriteria,CvMat const *,CvMat const *)\n    CvEMParams(int,int,int,CvTermCriteria,CvMat const *)\n    CvEMParams(int,int,int,CvTermCriteria)\n    CvEMParams(int,int,int)\n    CvEMParams(int,int)\n    CvEMParams(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvEMParams'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvEMParams()\n"
+    "    CvEMParams(int,int,int,CvTermCriteria,CvMat const *,CvMat const *,CvMat const *,CvMat const **)\n"
+    "    CvEMParams(int,int,int,CvTermCriteria,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvEMParams(int,int,int,CvTermCriteria,CvMat const *,CvMat const *)\n"
+    "    CvEMParams(int,int,int,CvTermCriteria,CvMat const *)\n"
+    "    CvEMParams(int,int,int,CvTermCriteria)\n"
+    "    CvEMParams(int,int,int)\n"
+    "    CvEMParams(int,int)\n"
+    "    CvEMParams(int)\n");
   return NULL;
 }
 
@@ -17384,7 +17647,6 @@ SWIGINTERN PyObject *_wrap_CvEMParams_nclusters_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nclusters = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17395,10 +17657,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEMParams_nclusters_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEMParams *arg1 = (CvEMParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEMParams_nclusters_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEMParams, 0 |  0 );
@@ -17437,7 +17699,6 @@ SWIGINTERN PyObject *_wrap_CvEMParams_cov_mat_type_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->cov_mat_type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17448,10 +17709,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEMParams_cov_mat_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEMParams *arg1 = (CvEMParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEMParams_cov_mat_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEMParams, 0 |  0 );
@@ -17490,7 +17751,6 @@ SWIGINTERN PyObject *_wrap_CvEMParams_start_step_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->start_step = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17501,10 +17761,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEMParams_start_step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEMParams *arg1 = (CvEMParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEMParams_start_step_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEMParams, 0 |  0 );
@@ -17540,7 +17800,6 @@ SWIGINTERN PyObject *_wrap_CvEMParams_probs_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->probs = (CvMat const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -17563,10 +17822,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEMParams_probs_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEMParams *arg1 = (CvEMParams *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEMParams_probs_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEMParams, 0 |  0 );
@@ -17602,7 +17861,6 @@ SWIGINTERN PyObject *_wrap_CvEMParams_weights_set(PyObject *SWIGUNUSEDPARM(self)
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->weights = (CvMat const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -17625,10 +17883,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEMParams_weights_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEMParams *arg1 = (CvEMParams *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEMParams_weights_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEMParams, 0 |  0 );
@@ -17664,7 +17922,6 @@ SWIGINTERN PyObject *_wrap_CvEMParams_means_set(PyObject *SWIGUNUSEDPARM(self),
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->means = (CvMat const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -17687,10 +17944,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEMParams_means_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEMParams *arg1 = (CvEMParams *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEMParams_means_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEMParams, 0 |  0 );
@@ -17729,7 +17986,6 @@ SWIGINTERN PyObject *_wrap_CvEMParams_covs_set(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg2 = reinterpret_cast< CvMat ** >(argp2);
   if (arg1) (arg1)->covs = (CvMat const **)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17740,10 +17996,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEMParams_covs_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEMParams *arg1 = (CvEMParams *) 0 ;
-  CvMat **result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat **result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEMParams_covs_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEMParams, 0 |  0 );
@@ -17782,7 +18038,6 @@ SWIGINTERN PyObject *_wrap_CvEMParams_term_crit_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< CvTermCriteria * >(argp2);
   if (arg1) (arg1)->term_crit = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -17793,10 +18048,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEMParams_term_crit_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEMParams *arg1 = (CvEMParams *) 0 ;
-  CvTermCriteria *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTermCriteria *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEMParams_term_crit_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEMParams, 0 |  0 );
@@ -17827,7 +18082,7 @@ SWIGINTERN PyObject *_wrap_delete_CvEMParams(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvEMParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -17843,7 +18098,7 @@ fail:
 
 SWIGINTERN PyObject *CvEMParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvEMParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -17875,7 +18130,6 @@ SWIGINTERN PyObject *_wrap_new_CvEM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyOb
   CvMat *arg2 = (CvMat *) 0 ;
   CvEMParams arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvEM *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   void *argp3 ;
@@ -17885,6 +18139,7 @@ SWIGINTERN PyObject *_wrap_new_CvEM__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvEM *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvEM",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -17966,7 +18221,6 @@ SWIGINTERN PyObject *_wrap_new_CvEM__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyOb
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvEMParams arg3 ;
-  CvEM *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   void *argp3 ;
@@ -17974,6 +18228,7 @@ SWIGINTERN PyObject *_wrap_new_CvEM__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvEM *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvEM",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -18039,11 +18294,11 @@ SWIGINTERN PyObject *_wrap_new_CvEM__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  CvEM *result = 0 ;
   bool freearg1 = false ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvEM *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvEM",&obj0,&obj1)) SWIG_fail;
   {
@@ -18095,9 +18350,9 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvEM__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  CvEM *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvEM *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvEM",&obj0)) SWIG_fail;
   {
@@ -18137,7 +18392,7 @@ SWIGINTERN PyObject *_wrap_new_CvEM(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18210,7 +18465,13 @@ SWIGINTERN PyObject *_wrap_new_CvEM(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvEM'.\n  Possible C/C++ prototypes are:\n    CvEM()\n    CvEM(CvMat const *,CvMat const *,CvEMParams,CvMat *)\n    CvEM(CvMat const *,CvMat const *,CvEMParams)\n    CvEM(CvMat const *,CvMat const *)\n    CvEM(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvEM'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvEM()\n"
+    "    CvEM(CvMat const *,CvMat const *,CvEMParams,CvMat *)\n"
+    "    CvEM(CvMat const *,CvMat const *,CvEMParams)\n"
+    "    CvEM(CvMat const *,CvMat const *)\n"
+    "    CvEM(CvMat const *)\n");
   return NULL;
 }
 
@@ -18230,7 +18491,7 @@ SWIGINTERN PyObject *_wrap_delete_CvEM(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< CvEM * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -18251,7 +18512,6 @@ SWIGINTERN PyObject *_wrap_CvEM_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py
   CvMat *arg3 = (CvMat *) 0 ;
   CvEMParams arg4 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -18264,6 +18524,7 @@ SWIGINTERN PyObject *_wrap_CvEM_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvEM_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18351,7 +18612,6 @@ SWIGINTERN PyObject *_wrap_CvEM_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvEMParams arg4 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -18362,6 +18622,7 @@ SWIGINTERN PyObject *_wrap_CvEM_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvEM_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18433,7 +18694,6 @@ SWIGINTERN PyObject *_wrap_CvEM_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py
   CvEM *arg1 = (CvEM *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -18441,6 +18701,7 @@ SWIGINTERN PyObject *_wrap_CvEM_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvEM_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18498,12 +18759,12 @@ SWIGINTERN PyObject *_wrap_CvEM_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject *resultobj = 0;
   CvEM *arg1 = (CvEM *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvEM_train",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18548,7 +18809,7 @@ SWIGINTERN PyObject *_wrap_CvEM_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -18638,7 +18899,12 @@ SWIGINTERN PyObject *_wrap_CvEM_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvEM_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,CvMat const *,CvEMParams,CvMat *)\n    train(CvMat const *,CvMat const *,CvEMParams)\n    train(CvMat const *,CvMat const *)\n    train(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvEM_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvEM *,CvMat const *,CvMat const *,CvEMParams,CvMat *)\n"
+    "    train(CvEM *,CvMat const *,CvMat const *,CvEMParams)\n"
+    "    train(CvEM *,CvMat const *,CvMat const *)\n"
+    "    train(CvEM *,CvMat const *)\n");
   return NULL;
 }
 
@@ -18648,7 +18914,6 @@ SWIGINTERN PyObject *_wrap_CvEM_predict(PyObject *SWIGUNUSEDPARM(self), PyObject
   CvEM *arg1 = (CvEM *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -18656,6 +18921,7 @@ SWIGINTERN PyObject *_wrap_CvEM_predict(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvEM_predict",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18741,10 +19007,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEM_get_nclusters(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEM *arg1 = (CvEM *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEM_get_nclusters",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18771,10 +19037,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEM_get_means(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEM *arg1 = (CvEM *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEM_get_means",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18801,10 +19067,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEM_get_weights(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEM *arg1 = (CvEM *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEM_get_weights",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18831,10 +19097,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEM_get_probs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEM *arg1 = (CvEM *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEM_get_probs",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18861,10 +19127,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEM_get_log_likelihood(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEM *arg1 = (CvEM *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEM_get_log_likelihood",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18891,10 +19157,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvEM_get_covs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvEM *arg1 = (CvEM *) 0 ;
-  PyObject *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvEM_get_covs",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvEM, 0 |  0 );
@@ -18920,7 +19186,7 @@ fail:
 
 SWIGINTERN PyObject *CvEM_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvEM, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -18948,7 +19214,6 @@ SWIGINTERN PyObject *_wrap_CvPair16u32s_u_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< unsigned short * >(argp2);
   if (arg1) (arg1)->u = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -18959,10 +19224,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPair16u32s_u_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPair16u32s *arg1 = (CvPair16u32s *) 0 ;
-  unsigned short *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  unsigned short *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPair16u32s_u_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPair16u32s, 0 |  0 );
@@ -19001,7 +19266,6 @@ SWIGINTERN PyObject *_wrap_CvPair16u32s_i_set(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->i = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19012,10 +19276,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvPair16u32s_i_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvPair16u32s *arg1 = (CvPair16u32s *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvPair16u32s_i_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvPair16u32s, 0 |  0 );
@@ -19067,7 +19331,7 @@ SWIGINTERN PyObject *_wrap_delete_CvPair16u32s(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvPair16u32s * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -19083,7 +19347,7 @@ fail:
 
 SWIGINTERN PyObject *CvPair16u32s_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvPair16u32s, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -19111,7 +19375,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeSplit_var_idx_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->var_idx = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19122,10 +19385,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeSplit_var_idx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeSplit_var_idx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeSplit, 0 |  0 );
@@ -19164,7 +19427,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeSplit_condensed_idx_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->condensed_idx = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19175,10 +19437,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeSplit_condensed_idx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeSplit_condensed_idx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeSplit, 0 |  0 );
@@ -19217,7 +19479,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeSplit_inversed_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->inversed = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19228,10 +19489,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeSplit_inversed_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeSplit_inversed_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeSplit, 0 |  0 );
@@ -19270,7 +19531,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeSplit_quality_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->quality = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19281,10 +19541,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeSplit_quality_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeSplit_quality_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeSplit, 0 |  0 );
@@ -19323,7 +19583,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeSplit_next_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvDTreeSplit * >(argp2);
   if (arg1) (arg1)->next = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19334,10 +19593,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeSplit_next_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeSplit *arg1 = (CvDTreeSplit *) 0 ;
-  CvDTreeSplit *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeSplit *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeSplit_next_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeSplit, 0 |  0 );
@@ -19389,7 +19648,7 @@ SWIGINTERN PyObject *_wrap_delete_CvDTreeSplit(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvDTreeSplit * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -19405,7 +19664,7 @@ fail:
 
 SWIGINTERN PyObject *CvDTreeSplit_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvDTreeSplit, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -19433,7 +19692,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_class_idx_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->class_idx = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19444,10 +19702,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_class_idx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_class_idx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19486,7 +19744,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_Tn_set(PyObject *SWIGUNUSEDPARM(self), Py
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->Tn = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19497,10 +19754,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_Tn_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_Tn_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19539,7 +19796,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_value_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->value = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19550,10 +19806,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_value_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_value_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19592,7 +19848,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_parent_set(PyObject *SWIGUNUSEDPARM(self)
   }
   arg2 = reinterpret_cast< CvDTreeNode * >(argp2);
   if (arg1) (arg1)->parent = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19603,10 +19858,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_parent_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_parent_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19645,7 +19900,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_left_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvDTreeNode * >(argp2);
   if (arg1) (arg1)->left = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19656,10 +19910,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_left_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_left_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19698,7 +19952,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_right_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvDTreeNode * >(argp2);
   if (arg1) (arg1)->right = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19709,10 +19962,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_right_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_right_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19751,7 +20004,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_split_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< CvDTreeSplit * >(argp2);
   if (arg1) (arg1)->split = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19762,10 +20014,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_split_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  CvDTreeSplit *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeSplit *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_split_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19804,7 +20056,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_sample_count_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->sample_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19815,10 +20066,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_sample_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_sample_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19857,7 +20108,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_depth_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->depth = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19868,10 +20118,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_depth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_depth_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19910,7 +20160,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_num_valid_set(PyObject *SWIGUNUSEDPARM(se
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->num_valid = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19921,10 +20170,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_num_valid_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_num_valid_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -19963,7 +20212,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_offset_set(PyObject *SWIGUNUSEDPARM(self)
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->offset = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -19974,10 +20222,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_offset_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_offset_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20016,7 +20264,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_buf_idx_set(PyObject *SWIGUNUSEDPARM(self
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->buf_idx = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20027,10 +20274,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_buf_idx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_buf_idx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20069,7 +20316,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_maxlr_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->maxlr = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20080,10 +20326,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_maxlr_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_maxlr_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20122,7 +20368,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_complexity_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->complexity = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20133,10 +20378,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_complexity_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_complexity_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20175,7 +20420,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_alpha_set(PyObject *SWIGUNUSEDPARM(self),
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->alpha = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20186,10 +20430,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_alpha_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_alpha_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20228,7 +20472,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_node_risk_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->node_risk = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20239,10 +20482,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_node_risk_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_node_risk_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20281,7 +20524,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_tree_risk_set(PyObject *SWIGUNUSEDPARM(se
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->tree_risk = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20292,10 +20534,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_tree_risk_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_tree_risk_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20334,7 +20576,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_tree_error_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->tree_error = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20345,10 +20586,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_tree_error_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_tree_error_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20387,7 +20628,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_cv_Tn_set(PyObject *SWIGUNUSEDPARM(self),
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->cv_Tn = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20398,10 +20638,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_cv_Tn_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_cv_Tn_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20440,7 +20680,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_cv_node_risk_set(PyObject *SWIGUNUSEDPARM
   }
   arg2 = reinterpret_cast< double * >(argp2);
   if (arg1) (arg1)->cv_node_risk = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20451,10 +20690,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_cv_node_risk_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_cv_node_risk_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20493,7 +20732,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_cv_node_error_set(PyObject *SWIGUNUSEDPAR
   }
   arg2 = reinterpret_cast< double * >(argp2);
   if (arg1) (arg1)->cv_node_error = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20504,10 +20742,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeNode_cv_node_error_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeNode_cv_node_error_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20527,13 +20765,13 @@ SWIGINTERN PyObject *_wrap_CvDTreeNode_get_num_valid(PyObject *SWIGUNUSEDPARM(se
   PyObject *resultobj = 0;
   CvDTreeNode *arg1 = (CvDTreeNode *) 0 ;
   int arg2 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvDTreeNode_get_num_valid",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeNode, 0 |  0 );
@@ -20645,7 +20883,7 @@ SWIGINTERN PyObject *_wrap_delete_CvDTreeNode(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvDTreeNode * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -20661,7 +20899,7 @@ fail:
 
 SWIGINTERN PyObject *CvDTreeNode_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvDTreeNode, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -20689,7 +20927,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_max_categories_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->max_categories = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20700,10 +20937,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_max_categories_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_max_categories_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -20742,7 +20979,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_max_depth_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->max_depth = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20753,10 +20989,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_max_depth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_max_depth_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -20795,7 +21031,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_min_sample_count_set(PyObject *SWIGUNUS
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->min_sample_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20806,10 +21041,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_min_sample_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_min_sample_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -20848,7 +21083,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_cv_folds_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->cv_folds = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20859,10 +21093,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_cv_folds_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_cv_folds_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -20901,7 +21135,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_use_surrogates_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->use_surrogates = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20912,10 +21145,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_use_surrogates_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_use_surrogates_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -20954,7 +21187,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_use_1se_rule_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->use_1se_rule = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -20965,10 +21197,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_use_1se_rule_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_use_1se_rule_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -21007,7 +21239,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_truncate_pruned_tree_set(PyObject *SWIG
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->truncate_pruned_tree = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21018,10 +21249,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_truncate_pruned_tree_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_truncate_pruned_tree_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -21060,7 +21291,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_regression_accuracy_set(PyObject *SWIGU
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->regression_accuracy = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21071,10 +21301,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_regression_accuracy_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_regression_accuracy_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -21113,7 +21343,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeParams_priors_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->priors = (float const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -21124,10 +21353,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeParams_priors_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeParams *arg1 = (CvDTreeParams *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeParams_priors_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeParams, 0 |  0 );
@@ -21175,7 +21404,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeParams__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   bool arg7 ;
   bool arg8 ;
   float *arg9 = (float *) 0 ;
-  CvDTreeParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -21203,6 +21431,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeParams__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  CvDTreeParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:new_CvDTreeParams",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -21272,7 +21501,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeParams(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 9); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -21338,7 +21567,10 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeParams(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvDTreeParams'.\n  Possible C/C++ prototypes are:\n    CvDTreeParams()\n    CvDTreeParams(int,int,float,bool,int,int,bool,bool,float const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvDTreeParams'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvDTreeParams()\n"
+    "    CvDTreeParams(int,int,float,bool,int,int,bool,bool,float const *)\n");
   return NULL;
 }
 
@@ -21358,7 +21590,7 @@ SWIGINTERN PyObject *_wrap_delete_CvDTreeParams(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvDTreeParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -21374,7 +21606,7 @@ fail:
 
 SWIGINTERN PyObject *CvDTreeParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvDTreeParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -21412,7 +21644,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_1(PyObject *SWIGUNUSEDPARM
   CvDTreeParams *arg8 = 0 ;
   bool arg9 ;
   bool arg10 ;
-  CvDTreeTrainData *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -21437,6 +21668,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_1(PyObject *SWIGUNUSEDPARM
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO:new_CvDTreeTrainData",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
@@ -21579,7 +21811,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_2(PyObject *SWIGUNUSEDPARM
   CvMat *arg7 = (CvMat *) 0 ;
   CvDTreeParams *arg8 = 0 ;
   bool arg9 ;
-  CvDTreeTrainData *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -21601,6 +21832,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_2(PyObject *SWIGUNUSEDPARM
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:new_CvDTreeTrainData",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
@@ -21737,7 +21969,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_3(PyObject *SWIGUNUSEDPARM
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvDTreeParams *arg8 = 0 ;
-  CvDTreeTrainData *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -21756,6 +21987,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_3(PyObject *SWIGUNUSEDPARM
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:new_CvDTreeTrainData",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
@@ -21886,7 +22118,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_4(PyObject *SWIGUNUSEDPARM
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  CvDTreeTrainData *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -21902,6 +22133,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_4(PyObject *SWIGUNUSEDPARM
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:new_CvDTreeTrainData",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
@@ -22023,7 +22255,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_5(PyObject *SWIGUNUSEDPARM
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  CvDTreeTrainData *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -22037,6 +22268,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_5(PyObject *SWIGUNUSEDPARM
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_CvDTreeTrainData",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -22142,7 +22374,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_6(PyObject *SWIGUNUSEDPARM
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  CvDTreeTrainData *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -22154,6 +22385,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_6(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvDTreeTrainData",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -22243,7 +22475,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_7(PyObject *SWIGUNUSEDPARM
   int arg2 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvDTreeTrainData *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -22253,6 +22484,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_7(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvDTreeTrainData",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -22326,7 +22558,6 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_8(PyObject *SWIGUNUSEDPARM
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvDTreeTrainData *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -22334,6 +22565,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData__SWIG_8(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvDTreeTrainData",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -22393,7 +22625,7 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 10); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -22702,7 +22934,17 @@ SWIGINTERN PyObject *_wrap_new_CvDTreeTrainData(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvDTreeTrainData'.\n  Possible C/C++ prototypes are:\n    CvDTreeTrainData()\n    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool)\n    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool)\n    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &)\n    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *)\n    CvDTreeTrainData(CvMat const *,int,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvDTreeTrainData'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvDTreeTrainData()\n"
+    "    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool)\n"
+    "    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool)\n"
+    "    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &)\n"
+    "    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvDTreeTrainData(CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    CvDTreeTrainData(CvMat const *,int,CvMat const *)\n");
   return NULL;
 }
 
@@ -22722,7 +22964,7 @@ SWIGINTERN PyObject *_wrap_delete_CvDTreeTrainData(PyObject *SWIGUNUSEDPARM(self
   arg1 = reinterpret_cast< CvDTreeTrainData * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -23978,7 +24220,7 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_set_data(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 12); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -24391,7 +24633,17 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_set_data(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTreeTrainData_set_data'.\n  Possible C/C++ prototypes are:\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool,bool)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *)\n    set_data(CvMat const *,int,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTreeTrainData_set_data'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool,bool)\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool)\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool)\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &)\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    set_data(CvDTreeTrainData *,CvMat const *,int,CvMat const *)\n");
   return NULL;
 }
 
@@ -24588,7 +24840,7 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_vectors(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -24658,7 +24910,10 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_vectors(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTreeTrainData_get_vectors'.\n  Possible C/C++ prototypes are:\n    get_vectors(CvMat const *,float *,uchar *,float *,bool)\n    get_vectors(CvMat const *,float *,uchar *,float *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTreeTrainData_get_vectors'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    get_vectors(CvDTreeTrainData *,CvMat const *,float *,uchar *,float *,bool)\n"
+    "    get_vectors(CvDTreeTrainData *,CvMat const *,float *,uchar *,float *)\n");
   return NULL;
 }
 
@@ -24667,12 +24922,12 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_subsample_data(PyObject *SWIGUNUSEDP
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvDTreeTrainData_subsample_data",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -24828,10 +25083,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_num_classes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_get_num_classes",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -24859,13 +25114,13 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_var_type(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   int arg2 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvDTreeTrainData_get_var_type",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -24897,10 +25152,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_work_var_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_get_work_var_count",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25157,7 +25412,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_cat_var_data(PyObject *SWIGUNUSE
   int arg3 ;
   int *arg4 = (int *) 0 ;
   int **arg5 = (int **) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -25173,6 +25427,7 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_cat_var_data(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvDTreeTrainData_get_cat_var_data",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25225,7 +25480,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_ord_var_data(PyObject *SWIGUNUSE
   int *arg5 = (int *) 0 ;
   float **arg6 = (float **) 0 ;
   int **arg7 = (int **) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -25247,6 +25501,7 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_ord_var_data(PyObject *SWIGUNUSE
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvDTreeTrainData_get_ord_var_data",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25306,13 +25561,13 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_get_child_buf_idx(PyObject *SWIGUNUS
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvDTreeTrainData_get_child_buf_idx",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25345,13 +25600,13 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_set_params(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   CvDTreeParams *arg2 = 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvDTreeTrainData_set_params",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25390,7 +25645,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_new_node(PyObject *SWIGUNUSEDPARM(se
   int arg3 ;
   int arg4 ;
   int arg5 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -25406,6 +25660,7 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_new_node(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvDTreeTrainData_new_node",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25457,7 +25712,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_new_split_ord(PyObject *SWIGUNUSEDPA
   int arg4 ;
   int arg5 ;
   float arg6 ;
-  CvDTreeSplit *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -25476,6 +25730,7 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_new_split_ord(PyObject *SWIGUNUSEDPA
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvDTreeSplit *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvDTreeTrainData_new_split_ord",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25529,7 +25784,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_new_split_cat(PyObject *SWIGUNUSEDPA
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
   int arg2 ;
   float arg3 ;
-  CvDTreeSplit *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -25539,6 +25793,7 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_new_split_cat(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvDTreeSplit *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvDTreeTrainData_new_split_cat",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25700,7 +25955,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_pred_float_buf_set(PyObject *SWIGUNU
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->pred_float_buf = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -25711,10 +25965,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_pred_float_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_pred_float_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25753,7 +26007,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_pred_int_buf_set(PyObject *SWIGUNUSE
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->pred_int_buf = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -25764,10 +26017,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_pred_int_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_pred_int_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25806,7 +26059,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_resp_float_buf_set(PyObject *SWIGUNU
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->resp_float_buf = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -25817,10 +26069,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_resp_float_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_resp_float_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25859,7 +26111,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_resp_int_buf_set(PyObject *SWIGUNUSE
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->resp_int_buf = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -25870,10 +26121,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_resp_int_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_resp_int_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25912,7 +26163,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cv_lables_buf_set(PyObject *SWIGUNUS
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->cv_lables_buf = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -25923,10 +26173,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cv_lables_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_cv_lables_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -25965,7 +26215,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_sample_idx_buf_set(PyObject *SWIGUNU
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->sample_idx_buf = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -25976,10 +26225,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_sample_idx_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_sample_idx_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26018,7 +26267,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_sample_count_set(PyObject *SWIGUNUSE
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->sample_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26029,10 +26277,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_sample_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_sample_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26071,7 +26319,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_var_all_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->var_all = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26082,10 +26329,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_var_all_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_var_all_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26124,7 +26371,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_var_count_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->var_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26135,10 +26381,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_var_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_var_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26177,7 +26423,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_max_c_count_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->max_c_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26188,10 +26433,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_max_c_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_max_c_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26230,7 +26475,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_ord_var_count_set(PyObject *SWIGUNUS
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->ord_var_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26241,10 +26485,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_ord_var_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_ord_var_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26283,7 +26527,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cat_var_count_set(PyObject *SWIGUNUS
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->cat_var_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26294,10 +26537,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cat_var_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_cat_var_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26336,7 +26579,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_work_var_count_set(PyObject *SWIGUNU
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->work_var_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26347,10 +26589,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_work_var_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_work_var_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26389,7 +26631,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_have_labels_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->have_labels = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26400,10 +26641,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_have_labels_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_have_labels_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26442,7 +26683,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_have_priors_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->have_priors = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26453,10 +26693,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_have_priors_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_have_priors_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26495,7 +26735,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_is_classifier_set(PyObject *SWIGUNUS
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->is_classifier = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26506,10 +26745,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_is_classifier_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_is_classifier_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26548,7 +26787,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_tflag_set(PyObject *SWIGUNUSEDPARM(s
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->tflag = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26559,10 +26797,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_tflag_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_tflag_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26598,7 +26836,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_train_data_set(PyObject *SWIGUNUSEDP
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->train_data = (CvMat const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -26621,10 +26858,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_train_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_train_data_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26660,7 +26897,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_responses_set(PyObject *SWIGUNUSEDPA
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->responses = (CvMat const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -26683,10 +26919,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_responses_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_responses_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26722,7 +26958,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_responses_copy_set(PyObject *SWIGUNU
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->responses_copy = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -26745,10 +26980,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_responses_copy_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_responses_copy_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26787,7 +27022,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_buf_count_set(PyObject *SWIGUNUSEDPA
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->buf_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26798,10 +27032,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_buf_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_buf_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26840,7 +27074,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_buf_size_set(PyObject *SWIGUNUSEDPAR
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->buf_size = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26851,10 +27084,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_buf_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_buf_size_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26893,7 +27126,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_shared_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->shared = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26904,10 +27136,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_shared_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_shared_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26946,7 +27178,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_is_buf_16u_set(PyObject *SWIGUNUSEDP
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->is_buf_16u = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -26957,10 +27188,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_is_buf_16u_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_is_buf_16u_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -26996,7 +27227,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cat_count_set(PyObject *SWIGUNUSEDPA
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->cat_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27019,10 +27249,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cat_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_cat_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27058,7 +27288,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cat_ofs_set(PyObject *SWIGUNUSEDPARM
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->cat_ofs = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27081,10 +27310,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cat_ofs_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_cat_ofs_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27120,7 +27349,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cat_map_set(PyObject *SWIGUNUSEDPARM
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->cat_map = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27143,10 +27371,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cat_map_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_cat_map_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27182,7 +27410,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_counts_set(PyObject *SWIGUNUSEDPARM(
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->counts = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27205,10 +27432,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_counts_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_counts_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27244,7 +27471,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_buf_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->buf = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27267,10 +27493,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27306,7 +27532,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_direction_set(PyObject *SWIGUNUSEDPA
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->direction = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27329,10 +27554,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_direction_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_direction_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27368,7 +27593,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_split_buf_set(PyObject *SWIGUNUSEDPA
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->split_buf = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27391,10 +27615,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_split_buf_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_split_buf_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27430,7 +27654,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_var_idx_set(PyObject *SWIGUNUSEDPARM
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->var_idx = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27453,10 +27676,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_var_idx_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_var_idx_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27492,7 +27715,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_var_type_set(PyObject *SWIGUNUSEDPAR
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->var_type = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27515,10 +27737,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_var_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_var_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27554,7 +27776,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_priors_set(PyObject *SWIGUNUSEDPARM(
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->priors = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27577,10 +27798,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_priors_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_priors_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27616,7 +27837,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_priors_mult_set(PyObject *SWIGUNUSED
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->priors_mult = arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -27639,10 +27859,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_priors_mult_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_priors_mult_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27681,7 +27901,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_params_set(PyObject *SWIGUNUSEDPARM(
   }
   arg2 = reinterpret_cast< CvDTreeParams * >(argp2);
   if (arg1) (arg1)->params = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27692,10 +27911,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_params_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvDTreeParams *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_params_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27734,7 +27953,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_tree_storage_set(PyObject *SWIGUNUSE
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->tree_storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27745,10 +27963,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_tree_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_tree_storage_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27787,7 +28005,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_temp_storage_set(PyObject *SWIGUNUSE
   }
   arg2 = reinterpret_cast< CvMemStorage * >(argp2);
   if (arg1) (arg1)->temp_storage = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27798,10 +28015,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_temp_storage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvMemStorage *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMemStorage *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_temp_storage_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27840,7 +28057,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_data_root_set(PyObject *SWIGUNUSEDPA
   }
   arg2 = reinterpret_cast< CvDTreeNode * >(argp2);
   if (arg1) (arg1)->data_root = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27851,10 +28067,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_data_root_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_data_root_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27897,7 +28113,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_node_heap_set(PyObject *SWIGUNUSEDPA
     arg2 = (CvSet *)ptr2;
   }
   if (arg1) (arg1)->node_heap = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27908,10 +28123,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_node_heap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvSet *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSet *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_node_heap_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -27954,7 +28169,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_split_heap_set(PyObject *SWIGUNUSEDP
     arg2 = (CvSet *)ptr2;
   }
   if (arg1) (arg1)->split_heap = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -27965,10 +28179,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_split_heap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvSet *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSet *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_split_heap_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -28011,7 +28225,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cv_heap_set(PyObject *SWIGUNUSEDPARM
     arg2 = (CvSet *)ptr2;
   }
   if (arg1) (arg1)->cv_heap = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -28022,10 +28235,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_cv_heap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvSet *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSet *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_cv_heap_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -28068,7 +28281,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_nv_heap_set(PyObject *SWIGUNUSEDPARM
     arg2 = (CvSet *)ptr2;
   }
   if (arg1) (arg1)->nv_heap = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -28079,10 +28291,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_nv_heap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvSet *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSet *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_nv_heap_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -28124,7 +28336,6 @@ SWIGINTERN PyObject *_wrap_CvDTreeTrainData_rng_set(PyObject *SWIGUNUSEDPARM(sel
     arg2 = wrapper2->ref();
   }
   if (arg1) (arg1)->rng = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -28135,10 +28346,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTreeTrainData_rng_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTreeTrainData *arg1 = (CvDTreeTrainData *) 0 ;
-  CvRNG result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTreeTrainData_rng_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTreeTrainData, 0 |  0 );
@@ -28159,7 +28370,7 @@ fail:
 
 SWIGINTERN PyObject *CvDTreeTrainData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvDTreeTrainData, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -28200,7 +28411,7 @@ SWIGINTERN PyObject *_wrap_delete_CvDTree(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< CvDTree * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -28225,7 +28436,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
   CvDTreeParams arg9 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -28247,6 +28457,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvDTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -28388,7 +28599,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -28407,6 +28617,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:CvDTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -28534,7 +28745,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -28551,6 +28761,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvDTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -28662,7 +28873,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -28677,6 +28887,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvDTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -28772,7 +28983,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_4(PyObject *SWIGUNUSEDPARM(self),
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -28785,6 +28995,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_4(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvDTree_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -28864,7 +29075,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_5(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -28875,6 +29085,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_5(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvDTree_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -28938,7 +29149,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_6(PyObject *SWIGUNUSEDPARM(self),
   CvDTree *arg1 = (CvDTree *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
   CvDTreeParams arg3 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -28948,6 +29158,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_6(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvDTree_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -28993,13 +29204,13 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_7(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvDTree *arg1 = (CvDTree *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvDTree_train",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -29033,7 +29244,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_calc_error__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   CvDTree *arg1 = (CvDTree *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
   int arg3 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -29043,6 +29253,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_calc_error__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvDTree_calc_error",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -29080,13 +29291,13 @@ SWIGINTERN PyObject *_wrap_CvDTree_calc_error__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   CvDTree *arg1 = (CvDTree *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvDTree_calc_error",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -29121,7 +29332,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_calc_error(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -29161,7 +29372,10 @@ SWIGINTERN PyObject *_wrap_CvDTree_calc_error(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_calc_error'.\n  Possible C/C++ prototypes are:\n    calc_error(CvMLData *,int)\n    calc_error(CvMLData *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_calc_error'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    calc_error(CvDTree *,CvMLData *,int)\n"
+    "    calc_error(CvDTree *,CvMLData *)\n");
   return NULL;
 }
 
@@ -29171,7 +29385,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_8(PyObject *SWIGUNUSEDPARM(self),
   CvDTree *arg1 = (CvDTree *) 0 ;
   CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -29180,6 +29393,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train__SWIG_8(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvDTree_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -29229,7 +29443,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 9); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -29510,7 +29724,17 @@ SWIGINTERN PyObject *_wrap_CvDTree_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *)\n    train(CvMLData *,CvDTreeParams)\n    train(CvMLData *)\n    train(CvDTreeTrainData *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvDTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams)\n"
+    "    train(CvDTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvDTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvDTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvDTree *,CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    train(CvDTree *,CvMat const *,int,CvMat const *)\n"
+    "    train(CvDTree *,CvMLData *,CvDTreeParams)\n"
+    "    train(CvDTree *,CvMLData *)\n"
+    "    train(CvDTree *,CvDTreeTrainData *,CvMat const *)\n");
   return NULL;
 }
 
@@ -29521,7 +29745,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_predict__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   bool arg4 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -29532,6 +29755,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_predict__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvDTree_predict",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -29595,7 +29819,6 @@ SWIGINTERN PyObject *_wrap_CvDTree_predict__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   CvDTree *arg1 = (CvDTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -29603,6 +29826,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_predict__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvDTree_predict",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -29660,12 +29884,12 @@ SWIGINTERN PyObject *_wrap_CvDTree_predict__SWIG_2(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   CvDTree *arg1 = (CvDTree *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvDTree_predict",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -29710,7 +29934,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_predict(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -29774,7 +29998,11 @@ SWIGINTERN PyObject *_wrap_CvDTree_predict(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_predict'.\n  Possible C/C++ prototypes are:\n    predict(CvMat const *,CvMat const *,bool)\n    predict(CvMat const *,CvMat const *)\n    predict(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_predict'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    predict(CvDTree const *,CvMat const *,CvMat const *,bool)\n"
+    "    predict(CvDTree const *,CvMat const *,CvMat const *)\n"
+    "    predict(CvDTree const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -29782,10 +30010,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTree_get_var_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTree *arg1 = (CvDTree *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTree_get_var_importance",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -29997,7 +30225,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_read(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -30046,7 +30274,10 @@ SWIGINTERN PyObject *_wrap_CvDTree_read(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_read'.\n  Possible C/C++ prototypes are:\n    read(CvFileStorage *,CvFileNode *)\n    read(CvFileStorage *,CvFileNode *,CvDTreeTrainData *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_read'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    read(CvDTree *,CvFileStorage *,CvFileNode *)\n"
+    "    read(CvDTree *,CvFileStorage *,CvFileNode *,CvDTreeTrainData *)\n");
   return NULL;
 }
 
@@ -30095,7 +30326,7 @@ SWIGINTERN PyObject *_wrap_CvDTree_write(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -30133,7 +30364,10 @@ SWIGINTERN PyObject *_wrap_CvDTree_write(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_write'.\n  Possible C/C++ prototypes are:\n    write(CvFileStorage *,char const *)\n    write(CvFileStorage *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvDTree_write'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    write(CvDTree *,CvFileStorage *,char const *)\n"
+    "    write(CvDTree *,CvFileStorage *)\n");
   return NULL;
 }
 
@@ -30141,10 +30375,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTree_get_root(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTree *arg1 = (CvDTree *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTree_get_root",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -30171,10 +30405,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTree_get_pruned_tree_idx(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTree *arg1 = (CvDTree *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTree_get_pruned_tree_idx",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -30201,10 +30435,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvDTree_get_data(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvDTree *arg1 = (CvDTree *) 0 ;
-  CvDTreeTrainData *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvDTree_get_data",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvDTree, 0 |  0 );
@@ -30230,7 +30464,7 @@ fail:
 
 SWIGINTERN PyObject *CvDTree_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvDTree, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -30271,7 +30505,7 @@ SWIGINTERN PyObject *_wrap_delete_CvForestTree(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = reinterpret_cast< CvForestTree * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -30291,7 +30525,6 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvRTrees *arg4 = (CvRTrees *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -30303,6 +30536,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvForestTree_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -30354,10 +30588,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvForestTree_get_var_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvForestTree *arg1 = (CvForestTree *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvForestTree_get_var_count",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -30457,7 +30691,6 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
   CvDTreeParams arg9 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -30479,6 +30712,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvForestTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -30620,7 +30854,6 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_2(PyObject *SWIGUNUSEDPARM(s
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -30639,6 +30872,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_2(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:CvForestTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -30766,7 +31000,6 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_3(PyObject *SWIGUNUSEDPARM(s
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -30783,6 +31016,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_3(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvForestTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -30894,7 +31128,6 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_4(PyObject *SWIGUNUSEDPARM(s
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -30909,6 +31142,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_4(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvForestTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -31004,7 +31238,6 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_5(PyObject *SWIGUNUSEDPARM(s
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -31017,6 +31250,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_5(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvForestTree_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -31096,7 +31330,6 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_6(PyObject *SWIGUNUSEDPARM(s
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -31107,6 +31340,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_6(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvForestTree_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -31170,7 +31404,6 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_7(PyObject *SWIGUNUSEDPARM(s
   CvForestTree *arg1 = (CvForestTree *) 0 ;
   CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -31179,6 +31412,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train__SWIG_7(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvForestTree_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvForestTree, 0 |  0 );
@@ -31228,7 +31462,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 9); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -31501,7 +31735,16 @@ SWIGINTERN PyObject *_wrap_CvForestTree_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvForestTree_train'.\n  Possible C/C++ prototypes are:\n    train(CvDTreeTrainData *,CvMat const *,CvRTrees *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *)\n    train(CvDTreeTrainData *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvForestTree_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvForestTree *,CvDTreeTrainData *,CvMat const *,CvRTrees *)\n"
+    "    train(CvForestTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams)\n"
+    "    train(CvForestTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvForestTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvForestTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvForestTree *,CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    train(CvForestTree *,CvMat const *,int,CvMat const *)\n"
+    "    train(CvForestTree *,CvDTreeTrainData *,CvMat const *)\n");
   return NULL;
 }
 
@@ -31615,7 +31858,7 @@ SWIGINTERN PyObject *_wrap_CvForestTree_read(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -31693,14 +31936,18 @@ SWIGINTERN PyObject *_wrap_CvForestTree_read(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvForestTree_read'.\n  Possible C/C++ prototypes are:\n    read(CvFileStorage *,CvFileNode *,CvRTrees *,CvDTreeTrainData *)\n    read(CvFileStorage *,CvFileNode *)\n    read(CvFileStorage *,CvFileNode *,CvDTreeTrainData *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvForestTree_read'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    read(CvForestTree *,CvFileStorage *,CvFileNode *,CvRTrees *,CvDTreeTrainData *)\n"
+    "    read(CvForestTree *,CvFileStorage *,CvFileNode *)\n"
+    "    read(CvForestTree *,CvFileStorage *,CvFileNode *,CvDTreeTrainData *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *CvForestTree_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvForestTree, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -31728,7 +31975,6 @@ SWIGINTERN PyObject *_wrap_CvRTParams_calc_var_importance_set(PyObject *SWIGUNUS
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->calc_var_importance = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31739,10 +31985,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRTParams_calc_var_importance_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRTParams *arg1 = (CvRTParams *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRTParams_calc_var_importance_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
@@ -31781,7 +32027,6 @@ SWIGINTERN PyObject *_wrap_CvRTParams_nactive_vars_set(PyObject *SWIGUNUSEDPARM(
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->nactive_vars = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31792,10 +32037,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRTParams_nactive_vars_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRTParams *arg1 = (CvRTParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRTParams_nactive_vars_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
@@ -31834,7 +32079,6 @@ SWIGINTERN PyObject *_wrap_CvRTParams_term_crit_set(PyObject *SWIGUNUSEDPARM(sel
   }
   arg2 = reinterpret_cast< CvTermCriteria * >(argp2);
   if (arg1) (arg1)->term_crit = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -31845,10 +32089,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRTParams_term_crit_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRTParams *arg1 = (CvRTParams *) 0 ;
-  CvTermCriteria *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTermCriteria *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRTParams_term_crit_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTParams, 0 |  0 );
@@ -31898,7 +32142,6 @@ SWIGINTERN PyObject *_wrap_new_CvRTParams__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   int arg9 ;
   float arg10 ;
   int arg11 ;
-  CvRTParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -31932,6 +32175,7 @@ SWIGINTERN PyObject *_wrap_new_CvRTParams__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
   PyObject * obj10 = 0 ;
+  CvRTParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOO:new_CvRTParams",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -32011,7 +32255,7 @@ SWIGINTERN PyObject *_wrap_new_CvRTParams(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 11); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -32089,7 +32333,10 @@ SWIGINTERN PyObject *_wrap_new_CvRTParams(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvRTParams'.\n  Possible C/C++ prototypes are:\n    CvRTParams()\n    CvRTParams(int,int,float,bool,int,float const *,bool,int,int,float,int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvRTParams'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvRTParams()\n"
+    "    CvRTParams(int,int,float,bool,int,float const *,bool,int,int,float,int)\n");
   return NULL;
 }
 
@@ -32109,7 +32356,7 @@ SWIGINTERN PyObject *_wrap_delete_CvRTParams(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< CvRTParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -32125,7 +32372,7 @@ fail:
 
 SWIGINTERN PyObject *CvRTParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvRTParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -32166,7 +32413,7 @@ SWIGINTERN PyObject *_wrap_delete_CvRTrees(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = reinterpret_cast< CvRTrees * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -32191,7 +32438,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
   CvRTParams arg9 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -32213,6 +32459,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvRTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -32354,7 +32601,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -32373,6 +32619,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:CvRTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -32500,7 +32747,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -32517,6 +32763,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvRTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -32628,7 +32875,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -32643,6 +32889,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvRTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -32738,7 +32985,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_4(PyObject *SWIGUNUSEDPARM(self)
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -32751,6 +32997,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_4(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvRTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -32830,7 +33077,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_5(PyObject *SWIGUNUSEDPARM(self)
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -32841,6 +33087,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_5(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvRTrees_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -32904,7 +33151,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_6(PyObject *SWIGUNUSEDPARM(self)
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
   CvRTParams arg3 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -32914,6 +33160,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_6(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvRTrees_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -32959,13 +33206,13 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train__SWIG_7(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRTrees_train",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33000,7 +33247,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 9); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33262,7 +33509,16 @@ SWIGINTERN PyObject *_wrap_CvRTrees_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvRTParams)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *)\n    train(CvMLData *,CvRTParams)\n    train(CvMLData *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvRTrees *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvRTParams)\n"
+    "    train(CvRTrees *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvRTrees *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvRTrees *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvRTrees *,CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    train(CvRTrees *,CvMat const *,int,CvMat const *)\n"
+    "    train(CvRTrees *,CvMLData *,CvRTParams)\n"
+    "    train(CvRTrees *,CvMLData *)\n");
   return NULL;
 }
 
@@ -33272,7 +33528,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -33280,6 +33535,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvRTrees_predict",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33337,12 +33593,12 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRTrees_predict",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33387,7 +33643,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33426,7 +33682,10 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_predict'.\n  Possible C/C++ prototypes are:\n    predict(CvMat const *,CvMat const *)\n    predict(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_predict'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    predict(CvRTrees const *,CvMat const *,CvMat const *)\n"
+    "    predict(CvRTrees const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -33436,7 +33695,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict_prob__SWIG_0(PyObject *SWIGUNUSEDPAR
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -33444,6 +33702,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict_prob__SWIG_0(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvRTrees_predict_prob",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33501,12 +33760,12 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict_prob__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRTrees_predict_prob",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33551,7 +33810,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict_prob(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33590,7 +33849,10 @@ SWIGINTERN PyObject *_wrap_CvRTrees_predict_prob(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_predict_prob'.\n  Possible C/C++ prototypes are:\n    predict_prob(CvMat const *,CvMat const *)\n    predict_prob(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_predict_prob'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    predict_prob(CvRTrees const *,CvMat const *,CvMat const *)\n"
+    "    predict_prob(CvRTrees const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -33627,10 +33889,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRTrees_get_var_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRTrees_get_var_importance",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33661,7 +33923,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_proximity__SWIG_0(PyObject *SWIGUNUSEDPA
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -33673,6 +33934,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_proximity__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvRTrees_get_proximity",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33762,7 +34024,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_proximity__SWIG_1(PyObject *SWIGUNUSEDPA
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -33772,6 +34033,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_proximity__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvRTrees_get_proximity",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33845,7 +34107,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_proximity__SWIG_2(PyObject *SWIGUNUSEDPA
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -33853,6 +34114,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_proximity__SWIG_2(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvRTrees_get_proximity",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -33912,7 +34174,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_proximity(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33990,7 +34252,11 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_proximity(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_get_proximity'.\n  Possible C/C++ prototypes are:\n    get_proximity(CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    get_proximity(CvMat const *,CvMat const *,CvMat const *)\n    get_proximity(CvMat const *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_get_proximity'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    get_proximity(CvRTrees const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    get_proximity(CvRTrees const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    get_proximity(CvRTrees const *,CvMat const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -34000,7 +34266,6 @@ SWIGINTERN PyObject *_wrap_CvRTrees_calc_error__SWIG_0(PyObject *SWIGUNUSEDPARM(
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
   int arg3 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -34010,6 +34275,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_calc_error__SWIG_0(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvRTrees_calc_error",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -34047,13 +34313,13 @@ SWIGINTERN PyObject *_wrap_CvRTrees_calc_error__SWIG_1(PyObject *SWIGUNUSEDPARM(
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRTrees_calc_error",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -34088,7 +34354,7 @@ SWIGINTERN PyObject *_wrap_CvRTrees_calc_error(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -34128,7 +34394,10 @@ SWIGINTERN PyObject *_wrap_CvRTrees_calc_error(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_calc_error'.\n  Possible C/C++ prototypes are:\n    calc_error(CvMLData *,int)\n    calc_error(CvMLData *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvRTrees_calc_error'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    calc_error(CvRTrees *,CvMLData *,int)\n"
+    "    calc_error(CvRTrees *,CvMLData *)\n");
   return NULL;
 }
 
@@ -34136,10 +34405,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRTrees_get_train_error(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRTrees_get_train_error",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -34263,10 +34532,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRTrees_get_active_var_mask(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRTrees_get_active_var_mask",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -34293,10 +34562,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRTrees_get_rng(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
-  CvRNG *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvRNG *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRTrees_get_rng",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -34326,10 +34595,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvRTrees_get_tree_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvRTrees_get_tree_count",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -34357,13 +34626,13 @@ SWIGINTERN PyObject *_wrap_CvRTrees_get_tree(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   CvRTrees *arg1 = (CvRTrees *) 0 ;
   int arg2 ;
-  CvForestTree *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvForestTree *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvRTrees_get_tree",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvRTrees, 0 |  0 );
@@ -34394,7 +34663,7 @@ fail:
 
 SWIGINTERN PyObject *CvRTrees_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvRTrees, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -35641,7 +35910,7 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_set_data(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 12); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -36054,7 +36323,17 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_set_data(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvERTreeTrainData_set_data'.\n  Possible C/C++ prototypes are:\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool,bool)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    set_data(CvMat const *,int,CvMat const *,CvMat const *)\n    set_data(CvMat const *,int,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvERTreeTrainData_set_data'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool,bool)\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool,bool)\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &,bool)\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams const &)\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    set_data(CvERTreeTrainData *,CvMat const *,int,CvMat const *)\n");
   return NULL;
 }
 
@@ -36065,10 +36344,9 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_get_ord_var_data(PyObject *SWIGUNUS
   CvDTreeNode *arg2 = (CvDTreeNode *) 0 ;
   int arg3 ;
   float *arg4 = (float *) 0 ;
-  uchar *arg5 = (uchar *) 0 ;
+  int *arg5 = (int *) 0 ;
   float **arg6 = (float **) 0 ;
-  uchar **arg7 = (uchar **) 0 ;
-  int result;
+  int **arg7 = (int **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -36090,6 +36368,7 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_get_ord_var_data(PyObject *SWIGUNUS
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvERTreeTrainData_get_ord_var_data",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
@@ -36112,11 +36391,11 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_get_ord_var_data(PyObject *SWIGUNUS
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "4"" of type '" "float *""'"); 
   }
   arg4 = reinterpret_cast< float * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_unsigned_char, 0 |  0 );
+  res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_int, 0 |  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "5"" of type '" "uchar *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "5"" of type '" "int *""'"); 
   }
-  arg5 = reinterpret_cast< uchar * >(argp5);
+  arg5 = reinterpret_cast< int * >(argp5);
   {
     if ((SWIG_ConvertPtr(obj5, &vptr6, SWIGTYPE_p_float, 1)) == -1){
       SWIG_fail;
@@ -36124,14 +36403,14 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_get_ord_var_data(PyObject *SWIGUNUS
     buffer6 = (float *) vptr6;
     arg6=&buffer6;
   }
-  res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_p_unsigned_char, 0 |  0 );
+  res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_p_int, 0 |  0 );
   if (!SWIG_IsOK(res7)) {
-    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "7"" of type '" "uchar const **""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CvERTreeTrainData_get_ord_var_data" "', argument " "7"" of type '" "int const **""'"); 
   }
-  arg7 = reinterpret_cast< uchar ** >(argp7);
+  arg7 = reinterpret_cast< int ** >(argp7);
   {
     try {
-      result = (int)(arg1)->get_ord_var_data(arg2,arg3,arg4,arg5,(float const **)arg6,(uchar const **)arg7); 
+      result = (int)(arg1)->get_ord_var_data(arg2,arg3,arg4,arg5,(float const **)arg6,(int const **)arg7); 
     } 
     catch (...) 
     {
@@ -36264,7 +36543,6 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_get_cat_var_data(PyObject *SWIGUNUS
   int arg3 ;
   int *arg4 = (int *) 0 ;
   int **arg5 = (int **) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -36280,6 +36558,7 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_get_cat_var_data(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvERTreeTrainData_get_cat_var_data",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
@@ -36486,7 +36765,7 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_get_vectors(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -36556,7 +36835,10 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_get_vectors(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvERTreeTrainData_get_vectors'.\n  Possible C/C++ prototypes are:\n    get_vectors(CvMat const *,float *,uchar *,float *,bool)\n    get_vectors(CvMat const *,float *,uchar *,float *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvERTreeTrainData_get_vectors'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    get_vectors(CvERTreeTrainData *,CvMat const *,float *,uchar *,float *,bool)\n"
+    "    get_vectors(CvERTreeTrainData *,CvMat const *,float *,uchar *,float *)\n");
   return NULL;
 }
 
@@ -36565,12 +36847,12 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_subsample_data(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  CvDTreeNode *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvDTreeNode *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvERTreeTrainData_subsample_data",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
@@ -36629,7 +36911,6 @@ SWIGINTERN PyObject *_wrap_CvERTreeTrainData_missing_mask_set(PyObject *SWIGUNUS
     arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
   }
   if (arg1) (arg1)->missing_mask = (CvMat const *)arg2;
-  
   resultobj = SWIG_Py_Void();
   {
     if(arg2!=NULL && freearg2){
@@ -36652,10 +36933,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvERTreeTrainData_missing_mask_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvERTreeTrainData *arg1 = (CvERTreeTrainData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvERTreeTrainData_missing_mask_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTreeTrainData, 0 |  0 );
@@ -36707,7 +36988,7 @@ SWIGINTERN PyObject *_wrap_delete_CvERTreeTrainData(PyObject *SWIGUNUSEDPARM(sel
   arg1 = reinterpret_cast< CvERTreeTrainData * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -36723,7 +37004,7 @@ fail:
 
 SWIGINTERN PyObject *CvERTreeTrainData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvERTreeTrainData, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36764,7 +37045,7 @@ SWIGINTERN PyObject *_wrap_delete_CvForestERTree(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvForestERTree * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -36780,11 +37061,61 @@ fail:
 
 SWIGINTERN PyObject *CvForestERTree_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvForestERTree, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_new_CvERTrees(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CvERTrees *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_CvERTrees")) SWIG_fail;
+  {
+    try {
+      result = (CvERTrees *)new CvERTrees(); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvERTrees, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CvERTrees(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_CvERTrees",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvERTrees" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = reinterpret_cast< CvERTrees * >(argp1);
+  {
+    try {
+      delete arg1; 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvERTrees *arg1 = (CvERTrees *) 0 ;
@@ -36796,7 +37127,6 @@ SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
   CvRTParams arg9 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -36818,6 +37148,7 @@ SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvERTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
@@ -36950,11 +37281,565 @@ fail:
 
 
 SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  CvMat *arg8 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool freearg2 = false ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool freearg4 = false ;
+  bool freearg5 = false ;
+  bool freearg6 = false ;
+  bool freearg7 = false ;
+  bool freearg8 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:CvERTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = reinterpret_cast< CvERTrees * >(argp1);
+  {
+    arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
+  }
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  {
+    arg4 = (CvMat*)PyObject_to_CvArr(obj3, &freearg4);
+  }
+  {
+    arg5 = (CvMat*)PyObject_to_CvArr(obj4, &freearg5);
+  }
+  {
+    arg6 = (CvMat*)PyObject_to_CvArr(obj5, &freearg6);
+  }
+  {
+    arg7 = (CvMat*)PyObject_to_CvArr(obj6, &freearg7);
+  }
+  {
+    arg8 = (CvMat*)PyObject_to_CvArr(obj7, &freearg8);
+  }
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7,(CvMat const *)arg8); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  {
+    if(arg6!=NULL && freearg6){
+      cvReleaseData( arg6 );
+      cvFree(&(arg6));
+    }
+  }
+  {
+    if(arg7!=NULL && freearg7){
+      cvReleaseData( arg7 );
+      cvFree(&(arg7));
+    }
+  }
+  {
+    if(arg8!=NULL && freearg8){
+      cvReleaseData( arg8 );
+      cvFree(&(arg8));
+    }
+  }
+  return resultobj;
+fail:
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  {
+    if(arg6!=NULL && freearg6){
+      cvReleaseData( arg6 );
+      cvFree(&(arg6));
+    }
+  }
+  {
+    if(arg7!=NULL && freearg7){
+      cvReleaseData( arg7 );
+      cvFree(&(arg7));
+    }
+  }
+  {
+    if(arg8!=NULL && freearg8){
+      cvReleaseData( arg8 );
+      cvFree(&(arg8));
+    }
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  CvMat *arg7 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool freearg2 = false ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool freearg4 = false ;
+  bool freearg5 = false ;
+  bool freearg6 = false ;
+  bool freearg7 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvERTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = reinterpret_cast< CvERTrees * >(argp1);
+  {
+    arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
+  }
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  {
+    arg4 = (CvMat*)PyObject_to_CvArr(obj3, &freearg4);
+  }
+  {
+    arg5 = (CvMat*)PyObject_to_CvArr(obj4, &freearg5);
+  }
+  {
+    arg6 = (CvMat*)PyObject_to_CvArr(obj5, &freearg6);
+  }
+  {
+    arg7 = (CvMat*)PyObject_to_CvArr(obj6, &freearg7);
+  }
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6,(CvMat const *)arg7); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  {
+    if(arg6!=NULL && freearg6){
+      cvReleaseData( arg6 );
+      cvFree(&(arg6));
+    }
+  }
+  {
+    if(arg7!=NULL && freearg7){
+      cvReleaseData( arg7 );
+      cvFree(&(arg7));
+    }
+  }
+  return resultobj;
+fail:
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  {
+    if(arg6!=NULL && freearg6){
+      cvReleaseData( arg6 );
+      cvFree(&(arg6));
+    }
+  }
+  {
+    if(arg7!=NULL && freearg7){
+      cvReleaseData( arg7 );
+      cvFree(&(arg7));
+    }
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  CvMat *arg6 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool freearg2 = false ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool freearg4 = false ;
+  bool freearg5 = false ;
+  bool freearg6 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvERTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = reinterpret_cast< CvERTrees * >(argp1);
+  {
+    arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
+  }
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  {
+    arg4 = (CvMat*)PyObject_to_CvArr(obj3, &freearg4);
+  }
+  {
+    arg5 = (CvMat*)PyObject_to_CvArr(obj4, &freearg5);
+  }
+  {
+    arg6 = (CvMat*)PyObject_to_CvArr(obj5, &freearg6);
+  }
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5,(CvMat const *)arg6); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  {
+    if(arg6!=NULL && freearg6){
+      cvReleaseData( arg6 );
+      cvFree(&(arg6));
+    }
+  }
+  return resultobj;
+fail:
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  {
+    if(arg6!=NULL && freearg6){
+      cvReleaseData( arg6 );
+      cvFree(&(arg6));
+    }
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  CvMat *arg5 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool freearg2 = false ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool freearg4 = false ;
+  bool freearg5 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvERTrees_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = reinterpret_cast< CvERTrees * >(argp1);
+  {
+    arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
+  }
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  {
+    arg4 = (CvMat*)PyObject_to_CvArr(obj3, &freearg4);
+  }
+  {
+    arg5 = (CvMat*)PyObject_to_CvArr(obj4, &freearg5);
+  }
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4,(CvMat const *)arg5); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  return resultobj;
+fail:
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  {
+    if(arg5!=NULL && freearg5){
+      cvReleaseData( arg5 );
+      cvFree(&(arg5));
+    }
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CvERTrees *arg1 = (CvERTrees *) 0 ;
+  CvMat *arg2 = (CvMat *) 0 ;
+  int arg3 ;
+  CvMat *arg4 = (CvMat *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool freearg2 = false ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool freearg4 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:CvERTrees_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_train" "', argument " "1"" of type '" "CvERTrees *""'"); 
+  }
+  arg1 = reinterpret_cast< CvERTrees * >(argp1);
+  {
+    arg2 = (CvMat*)PyObject_to_CvArr(obj1, &freearg2);
+  }
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CvERTrees_train" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  {
+    arg4 = (CvMat*)PyObject_to_CvArr(obj3, &freearg4);
+  }
+  {
+    try {
+      result = (bool)(arg1)->train((CvMat const *)arg2,arg3,(CvMat const *)arg4); 
+    } 
+    catch (...) 
+    {
+      SWIG_fail;
+    } 
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  return resultobj;
+fail:
+  {
+    if(arg2!=NULL && freearg2){
+      cvReleaseData( arg2 );
+      cvFree(&(arg2));
+    }
+  }
+  {
+    if(arg4!=NULL && freearg4){
+      cvReleaseData( arg4 );
+      cvFree(&(arg4));
+    }
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvERTrees *arg1 = (CvERTrees *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
   CvRTParams arg3 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -36964,6 +37849,7 @@ SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvERTrees_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
@@ -37005,17 +37891,17 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CvERTrees_train__SWIG_7(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvERTrees *arg1 = (CvERTrees *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvERTrees_train",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
@@ -37050,7 +37936,7 @@ SWIGINTERN PyObject *_wrap_CvERTrees_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 9); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -37064,7 +37950,7 @@ SWIGINTERN PyObject *_wrap_CvERTrees_train(PyObject *self, PyObject *args) {
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMLData, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_CvERTrees_train__SWIG_2(self, args);
+        return _wrap_CvERTrees_train__SWIG_7(self, args);
       }
     }
   }
@@ -37081,7 +37967,182 @@ SWIGINTERN PyObject *_wrap_CvERTrees_train(PyObject *self, PyObject *args) {
         int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_CvRTParams, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_CvERTrees_train__SWIG_1(self, args);
+          return _wrap_CvERTrees_train__SWIG_6(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_CvERTrees_train__SWIG_5(self, args);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_CvERTrees_train__SWIG_4(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_CvERTrees_train__SWIG_3(self, args);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 7) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  return _wrap_CvERTrees_train__SWIG_2(self, args);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 8) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CvERTrees, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CvMat, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_CvMat, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_CvMat, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_CvMat, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                void *vptr = 0;
+                int res = SWIG_ConvertPtr(argv[6], &vptr, SWIGTYPE_p_CvMat, 0);
+                _v = SWIG_CheckState(res);
+                if (_v) {
+                  void *vptr = 0;
+                  int res = SWIG_ConvertPtr(argv[7], &vptr, SWIGTYPE_p_CvMat, 0);
+                  _v = SWIG_CheckState(res);
+                  if (_v) {
+                    return _wrap_CvERTrees_train__SWIG_1(self, args);
+                  }
+                }
+              }
+            }
+          }
         }
       }
     }
@@ -37137,93 +38198,23 @@ SWIGINTERN PyObject *_wrap_CvERTrees_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvERTrees_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvRTParams)\n    train(CvMLData *,CvRTParams)\n    train(CvMLData *)\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_CvERTrees_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  CvERTrees *arg1 = (CvERTrees *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:CvERTrees_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CvERTrees_clear" "', argument " "1"" of type '" "CvERTrees *""'"); 
-  }
-  arg1 = reinterpret_cast< CvERTrees * >(argp1);
-  {
-    try {
-      (arg1)->clear(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_CvERTrees(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  CvERTrees *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_CvERTrees")) SWIG_fail;
-  {
-    try {
-      result = (CvERTrees *)new CvERTrees(); 
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CvERTrees, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_CvERTrees(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  CvERTrees *arg1 = (CvERTrees *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_CvERTrees",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvERTrees, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CvERTrees" "', argument " "1"" of type '" "CvERTrees *""'"); 
-  }
-  arg1 = reinterpret_cast< CvERTrees * >(argp1);
-  {
-    try {
-      delete arg1;
-    } 
-    catch (...) 
-    {
-      SWIG_fail;
-    } 
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvERTrees_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvERTrees *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvRTParams)\n"
+    "    train(CvERTrees *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvERTrees *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvERTrees *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvERTrees *,CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    train(CvERTrees *,CvMat const *,int,CvMat const *)\n"
+    "    train(CvERTrees *,CvMLData *,CvRTParams)\n"
+    "    train(CvERTrees *,CvMLData *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *CvERTrees_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvERTrees, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -37251,7 +38242,6 @@ SWIGINTERN PyObject *_wrap_CvBoostParams_boost_type_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->boost_type = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37262,10 +38252,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoostParams_boost_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoostParams_boost_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
@@ -37304,7 +38294,6 @@ SWIGINTERN PyObject *_wrap_CvBoostParams_weak_count_set(PyObject *SWIGUNUSEDPARM
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->weak_count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37315,10 +38304,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoostParams_weak_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoostParams_weak_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
@@ -37357,7 +38346,6 @@ SWIGINTERN PyObject *_wrap_CvBoostParams_split_criteria_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->split_criteria = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37368,10 +38356,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoostParams_split_criteria_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoostParams_split_criteria_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
@@ -37410,7 +38398,6 @@ SWIGINTERN PyObject *_wrap_CvBoostParams_weight_trim_rate_set(PyObject *SWIGUNUS
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->weight_trim_rate = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -37421,10 +38408,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoostParams_weight_trim_rate_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoostParams *arg1 = (CvBoostParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoostParams_weight_trim_rate_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostParams, 0 |  0 );
@@ -37469,7 +38456,6 @@ SWIGINTERN PyObject *_wrap_new_CvBoostParams__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   int arg4 ;
   bool arg5 ;
   float *arg6 = (float *) 0 ;
-  CvBoostParams *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -37488,6 +38474,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoostParams__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvBoostParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_CvBoostParams",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -37542,7 +38529,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoostParams(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -37590,7 +38577,10 @@ SWIGINTERN PyObject *_wrap_new_CvBoostParams(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvBoostParams'.\n  Possible C/C++ prototypes are:\n    CvBoostParams()\n    CvBoostParams(int,int,double,int,bool,float const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvBoostParams'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvBoostParams()\n"
+    "    CvBoostParams(int,int,double,int,bool,float const *)\n");
   return NULL;
 }
 
@@ -37610,7 +38600,7 @@ SWIGINTERN PyObject *_wrap_delete_CvBoostParams(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< CvBoostParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -37626,7 +38616,7 @@ fail:
 
 SWIGINTERN PyObject *CvBoostParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvBoostParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -37667,7 +38657,7 @@ SWIGINTERN PyObject *_wrap_delete_CvBoostTree(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvBoostTree * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -37687,7 +38677,6 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvBoost *arg4 = (CvBoost *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -37699,6 +38688,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvBoostTree_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
@@ -37890,7 +38880,6 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
   CvDTreeParams arg9 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -37912,6 +38901,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvBoostTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
@@ -38053,7 +39043,6 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_2(PyObject *SWIGUNUSEDPARM(se
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -38072,6 +39061,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_2(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:CvBoostTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
@@ -38199,7 +39189,6 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_3(PyObject *SWIGUNUSEDPARM(se
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -38216,6 +39205,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_3(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvBoostTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
@@ -38327,7 +39317,6 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_4(PyObject *SWIGUNUSEDPARM(se
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -38342,6 +39331,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_4(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvBoostTree_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
@@ -38437,7 +39427,6 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_5(PyObject *SWIGUNUSEDPARM(se
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -38450,6 +39439,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_5(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvBoostTree_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
@@ -38529,7 +39519,6 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_6(PyObject *SWIGUNUSEDPARM(se
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -38540,6 +39529,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_6(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvBoostTree_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
@@ -38603,7 +39593,6 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_7(PyObject *SWIGUNUSEDPARM(se
   CvBoostTree *arg1 = (CvBoostTree *) 0 ;
   CvDTreeTrainData *arg2 = (CvDTreeTrainData *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38612,6 +39601,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train__SWIG_7(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvBoostTree_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoostTree, 0 |  0 );
@@ -38661,7 +39651,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 9); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -38934,7 +39924,16 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoostTree_train'.\n  Possible C/C++ prototypes are:\n    train(CvDTreeTrainData *,CvMat const *,CvBoost *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *)\n    train(CvDTreeTrainData *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoostTree_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvBoostTree *,CvDTreeTrainData *,CvMat const *,CvBoost *)\n"
+    "    train(CvBoostTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvDTreeParams)\n"
+    "    train(CvBoostTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvBoostTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvBoostTree *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvBoostTree *,CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    train(CvBoostTree *,CvMat const *,int,CvMat const *)\n"
+    "    train(CvBoostTree *,CvDTreeTrainData *,CvMat const *)\n");
   return NULL;
 }
 
@@ -39048,7 +40047,7 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_read(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -39126,14 +40125,18 @@ SWIGINTERN PyObject *_wrap_CvBoostTree_read(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoostTree_read'.\n  Possible C/C++ prototypes are:\n    read(CvFileStorage *,CvFileNode *,CvBoost *,CvDTreeTrainData *)\n    read(CvFileStorage *,CvFileNode *)\n    read(CvFileStorage *,CvFileNode *,CvDTreeTrainData *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoostTree_read'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    read(CvBoostTree *,CvFileStorage *,CvFileNode *,CvBoost *,CvDTreeTrainData *)\n"
+    "    read(CvBoostTree *,CvFileStorage *,CvFileNode *)\n"
+    "    read(CvBoostTree *,CvFileStorage *,CvFileNode *,CvDTreeTrainData *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *CvBoostTree_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvBoostTree, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -39174,7 +40177,7 @@ SWIGINTERN PyObject *_wrap_delete_CvBoost(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< CvBoost * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -39198,7 +40201,6 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvBoostParams arg8 ;
-  CvBoost *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -39217,6 +40219,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  CvBoost *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:new_CvBoost",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
@@ -39352,7 +40355,6 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_2(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  CvBoost *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -39368,6 +40370,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_2(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  CvBoost *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:new_CvBoost",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
@@ -39489,7 +40492,6 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_3(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  CvBoost *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -39503,6 +40505,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_3(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  CvBoost *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_CvBoost",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
@@ -39608,7 +40611,6 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_4(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  CvBoost *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -39620,6 +40622,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_4(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  CvBoost *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_CvBoost",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
@@ -39709,7 +40712,6 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_5(PyObject *SWIGUNUSEDPARM(self), P
   int arg2 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  CvBoost *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -39719,6 +40721,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_5(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvBoost *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvBoost",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -39792,7 +40795,6 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_6(PyObject *SWIGUNUSEDPARM(self), P
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  CvBoost *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -39800,6 +40802,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoost__SWIG_6(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvBoost *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvBoost",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -39859,7 +40862,7 @@ SWIGINTERN PyObject *_wrap_new_CvBoost(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 8); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -40062,7 +41065,15 @@ SWIGINTERN PyObject *_wrap_new_CvBoost(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvBoost'.\n  Possible C/C++ prototypes are:\n    CvBoost()\n    CvBoost(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvBoostParams)\n    CvBoost(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    CvBoost(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    CvBoost(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    CvBoost(CvMat const *,int,CvMat const *,CvMat const *)\n    CvBoost(CvMat const *,int,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvBoost'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvBoost()\n"
+    "    CvBoost(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvBoostParams)\n"
+    "    CvBoost(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvBoost(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvBoost(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    CvBoost(CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    CvBoost(CvMat const *,int,CvMat const *)\n");
   return NULL;
 }
 
@@ -40079,7 +41090,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg8 = (CvMat *) 0 ;
   CvBoostParams arg9 ;
   bool arg10 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -40104,6 +41114,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
   PyObject * obj9 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO:CvBoost_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -40251,7 +41262,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
   CvBoostParams arg9 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -40273,6 +41283,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
   PyObject * obj8 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:CvBoost_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -40414,7 +41425,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
   CvMat *arg8 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -40433,6 +41443,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
   PyObject * obj7 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:CvBoost_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -40560,7 +41571,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
   CvMat *arg7 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -40577,6 +41587,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvBoost_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -40688,7 +41699,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_4(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvMat *arg6 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -40703,6 +41713,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_4(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvBoost_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -40798,7 +41809,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_5(PyObject *SWIGUNUSEDPARM(self),
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -40811,6 +41821,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_5(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvBoost_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -40890,7 +41901,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_6(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg2 = (CvMat *) 0 ;
   int arg3 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -40901,6 +41911,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_6(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvBoost_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -40965,7 +41976,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_7(PyObject *SWIGUNUSEDPARM(self),
   CvMLData *arg2 = (CvMLData *) 0 ;
   CvBoostParams arg3 ;
   bool arg4 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -40978,6 +41988,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_7(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvBoost_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -41029,7 +42040,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_8(PyObject *SWIGUNUSEDPARM(self),
   CvBoost *arg1 = (CvBoost *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
   CvBoostParams arg3 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -41039,6 +42049,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_8(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvBoost_train",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -41084,13 +42095,13 @@ SWIGINTERN PyObject *_wrap_CvBoost_train__SWIG_9(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvBoost_train",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -41125,7 +42136,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 10); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -41466,7 +42477,18 @@ SWIGINTERN PyObject *_wrap_CvBoost_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoost_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvBoostParams,bool)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvBoostParams)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *,CvMat const *)\n    train(CvMat const *,int,CvMat const *)\n    train(CvMLData *,CvBoostParams,bool)\n    train(CvMLData *,CvBoostParams)\n    train(CvMLData *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoost_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvBoost *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvBoostParams,bool)\n"
+    "    train(CvBoost *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvBoostParams)\n"
+    "    train(CvBoost *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvBoost *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvBoost *,CvMat const *,int,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvBoost *,CvMat const *,int,CvMat const *,CvMat const *)\n"
+    "    train(CvBoost *,CvMat const *,int,CvMat const *)\n"
+    "    train(CvBoost *,CvMLData *,CvBoostParams,bool)\n"
+    "    train(CvBoost *,CvMLData *,CvBoostParams)\n"
+    "    train(CvBoost *,CvMLData *)\n");
   return NULL;
 }
 
@@ -41480,7 +42502,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   CvSlice arg5 ;
   bool arg6 ;
   bool arg7 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -41498,6 +42519,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvBoost_predict",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -41605,7 +42627,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg4 = (CvMat *) 0 ;
   CvSlice arg5 ;
   bool arg6 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -41620,6 +42641,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvBoost_predict",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -41721,7 +42743,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_2(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvSlice arg5 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -41733,6 +42754,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_2(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvBoost_predict",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -41828,7 +42850,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_3(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -41838,6 +42859,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_3(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvBoost_predict",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -41911,7 +42933,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_4(PyObject *SWIGUNUSEDPARM(self
   CvBoost *arg1 = (CvBoost *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -41919,6 +42940,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_4(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvBoost_predict",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -41976,12 +42998,12 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict__SWIG_5(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvBoost_predict",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42026,7 +43048,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 7); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -42191,7 +43213,14 @@ SWIGINTERN PyObject *_wrap_CvBoost_predict(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoost_predict'.\n  Possible C/C++ prototypes are:\n    predict(CvMat const *,CvMat const *,CvMat *,CvSlice,bool,bool)\n    predict(CvMat const *,CvMat const *,CvMat *,CvSlice,bool)\n    predict(CvMat const *,CvMat const *,CvMat *,CvSlice)\n    predict(CvMat const *,CvMat const *,CvMat *)\n    predict(CvMat const *,CvMat const *)\n    predict(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoost_predict'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    predict(CvBoost const *,CvMat const *,CvMat const *,CvMat *,CvSlice,bool,bool)\n"
+    "    predict(CvBoost const *,CvMat const *,CvMat const *,CvMat *,CvSlice,bool)\n"
+    "    predict(CvBoost const *,CvMat const *,CvMat const *,CvMat *,CvSlice)\n"
+    "    predict(CvBoost const *,CvMat const *,CvMat const *,CvMat *)\n"
+    "    predict(CvBoost const *,CvMat const *,CvMat const *)\n"
+    "    predict(CvBoost const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -42201,7 +43230,6 @@ SWIGINTERN PyObject *_wrap_CvBoost_calc_error__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   CvBoost *arg1 = (CvBoost *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
   int arg3 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -42211,6 +43239,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_calc_error__SWIG_0(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvBoost_calc_error",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42248,13 +43277,13 @@ SWIGINTERN PyObject *_wrap_CvBoost_calc_error__SWIG_1(PyObject *SWIGUNUSEDPARM(s
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
   CvMLData *arg2 = (CvMLData *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvBoost_calc_error",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42289,7 +43318,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_calc_error(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -42329,7 +43358,10 @@ SWIGINTERN PyObject *_wrap_CvBoost_calc_error(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoost_calc_error'.\n  Possible C/C++ prototypes are:\n    calc_error(CvMLData *,int)\n    calc_error(CvMLData *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoost_calc_error'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    calc_error(CvBoost *,CvMLData *,int)\n"
+    "    calc_error(CvBoost *,CvMLData *)\n");
   return NULL;
 }
 
@@ -42517,13 +43549,13 @@ SWIGINTERN PyObject *_wrap_CvBoost_get_active_vars__SWIG_0(PyObject *SWIGUNUSEDP
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
   bool arg2 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvBoost_get_active_vars",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42555,10 +43587,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoost_get_active_vars__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoost_get_active_vars",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42588,7 +43620,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_get_active_vars(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -42618,7 +43650,10 @@ SWIGINTERN PyObject *_wrap_CvBoost_get_active_vars(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoost_get_active_vars'.\n  Possible C/C++ prototypes are:\n    get_active_vars(bool)\n    get_active_vars()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvBoost_get_active_vars'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    get_active_vars(CvBoost *,bool)\n"
+    "    get_active_vars(CvBoost *)\n");
   return NULL;
 }
 
@@ -42626,10 +43661,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoost_get_weak_predictors(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
-  CvSeq *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvSeq *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoost_get_weak_predictors",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42656,10 +43691,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoost_get_weights(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoost_get_weights",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42686,10 +43721,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoost_get_subtree_weights(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoost_get_subtree_weights",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42716,10 +43751,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoost_get_weak_response(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoost_get_weak_response",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42746,10 +43781,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoost_get_params(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
-  CvBoostParams *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvBoostParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoost_get_params",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42759,10 +43794,7 @@ SWIGINTERN PyObject *_wrap_CvBoost_get_params(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< CvBoost * >(argp1);
   {
     try {
-      {
-        CvBoostParams const &_result_ref = ((CvBoost const *)arg1)->get_params();
-        result = (CvBoostParams *) &_result_ref;
-      } 
+      result = (CvBoostParams *) &((CvBoost const *)arg1)->get_params(); 
     } 
     catch (...) 
     {
@@ -42779,10 +43811,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvBoost_get_data(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvBoost *arg1 = (CvBoost *) 0 ;
-  CvDTreeTrainData *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvDTreeTrainData *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvBoost_get_data",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvBoost, 0 |  0 );
@@ -42808,7 +43840,7 @@ fail:
 
 SWIGINTERN PyObject *CvBoost_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvBoost, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -42840,7 +43872,6 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP_TrainParams__SWIG_1(PyObject *SWIGUNUSE
   int arg2 ;
   double arg3 ;
   double arg4 ;
-  CvANN_MLP_TrainParams *result = 0 ;
   CvTermCriteria temp1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -42852,6 +43883,7 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP_TrainParams__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvANN_MLP_TrainParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvANN_MLP_TrainParams",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -42911,7 +43943,6 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP_TrainParams__SWIG_2(PyObject *SWIGUNUSE
   CvTermCriteria arg1 ;
   int arg2 ;
   double arg3 ;
-  CvANN_MLP_TrainParams *result = 0 ;
   CvTermCriteria temp1 ;
   int val2 ;
   int ecode2 = 0 ;
@@ -42920,6 +43951,7 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP_TrainParams__SWIG_2(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvANN_MLP_TrainParams *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvANN_MLP_TrainParams",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -42975,7 +44007,7 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP_TrainParams(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -43030,7 +44062,11 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP_TrainParams(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvANN_MLP_TrainParams'.\n  Possible C/C++ prototypes are:\n    CvANN_MLP_TrainParams()\n    CvANN_MLP_TrainParams(CvTermCriteria,int,double,double)\n    CvANN_MLP_TrainParams(CvTermCriteria,int,double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvANN_MLP_TrainParams'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvANN_MLP_TrainParams()\n"
+    "    CvANN_MLP_TrainParams(CvTermCriteria,int,double,double)\n"
+    "    CvANN_MLP_TrainParams(CvTermCriteria,int,double)\n");
   return NULL;
 }
 
@@ -43050,7 +44086,7 @@ SWIGINTERN PyObject *_wrap_delete_CvANN_MLP_TrainParams(PyObject *SWIGUNUSEDPARM
   arg1 = reinterpret_cast< CvANN_MLP_TrainParams * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -43087,7 +44123,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_term_crit_set(PyObject *SWIGUNU
   }
   arg2 = reinterpret_cast< CvTermCriteria * >(argp2);
   if (arg1) (arg1)->term_crit = *arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43098,10 +44133,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_term_crit_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  CvTermCriteria *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTermCriteria *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_term_crit_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43140,7 +44175,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_train_method_set(PyObject *SWIG
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->train_method = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43151,10 +44185,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_train_method_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_train_method_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43193,7 +44227,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_bp_dw_scale_set(PyObject *SWIGU
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->bp_dw_scale = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43204,10 +44237,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_bp_dw_scale_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_bp_dw_scale_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43246,7 +44279,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_bp_moment_scale_set(PyObject *S
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->bp_moment_scale = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43257,10 +44289,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_bp_moment_scale_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_bp_moment_scale_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43299,7 +44331,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw0_set(PyObject *SWIGUNUSED
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->rp_dw0 = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43310,10 +44341,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw0_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_rp_dw0_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43352,7 +44383,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw_plus_set(PyObject *SWIGUN
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->rp_dw_plus = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43363,10 +44393,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw_plus_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_rp_dw_plus_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43405,7 +44435,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw_minus_set(PyObject *SWIGU
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->rp_dw_minus = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43416,10 +44445,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw_minus_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_rp_dw_minus_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43458,7 +44487,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw_min_set(PyObject *SWIGUNU
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->rp_dw_min = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43469,10 +44497,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw_min_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_rp_dw_min_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43511,7 +44539,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw_max_set(PyObject *SWIGUNU
   } 
   arg2 = static_cast< double >(val2);
   if (arg1) (arg1)->rp_dw_max = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -43522,10 +44549,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_TrainParams_rp_dw_max_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP_TrainParams *arg1 = (CvANN_MLP_TrainParams *) 0 ;
-  double result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  double result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_TrainParams_rp_dw_max_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP_TrainParams, 0 |  0 );
@@ -43543,7 +44570,7 @@ fail:
 
 SWIGINTERN PyObject *CvANN_MLP_TrainParams_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvANN_MLP_TrainParams, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -43575,7 +44602,6 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   int arg2 ;
   double arg3 ;
   double arg4 ;
-  CvANN_MLP *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -43587,6 +44613,7 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  CvANN_MLP *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CvANN_MLP",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
@@ -43640,7 +44667,6 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 ;
   double arg3 ;
-  CvANN_MLP *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
@@ -43649,6 +44675,7 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  CvANN_MLP *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_CvANN_MLP",&obj0,&obj1,&obj2)) SWIG_fail;
   {
@@ -43696,12 +44723,12 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
   int arg2 ;
-  CvANN_MLP *result = 0 ;
   bool freearg1 = false ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvANN_MLP *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvANN_MLP",&obj0,&obj1)) SWIG_fail;
   {
@@ -43743,9 +44770,9 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvANN_MLP__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMat *arg1 = (CvMat *) 0 ;
-  CvANN_MLP *result = 0 ;
   bool freearg1 = false ;
   PyObject * obj0 = 0 ;
+  CvANN_MLP *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvANN_MLP",&obj0)) SWIG_fail;
   {
@@ -43785,7 +44812,7 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -43866,7 +44893,13 @@ SWIGINTERN PyObject *_wrap_new_CvANN_MLP(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvANN_MLP'.\n  Possible C/C++ prototypes are:\n    CvANN_MLP()\n    CvANN_MLP(CvMat const *,int,double,double)\n    CvANN_MLP(CvMat const *,int,double)\n    CvANN_MLP(CvMat const *,int)\n    CvANN_MLP(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvANN_MLP'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvANN_MLP()\n"
+    "    CvANN_MLP(CvMat const *,int,double,double)\n"
+    "    CvANN_MLP(CvMat const *,int,double)\n"
+    "    CvANN_MLP(CvMat const *,int)\n"
+    "    CvANN_MLP(CvMat const *)\n");
   return NULL;
 }
 
@@ -43886,7 +44919,7 @@ SWIGINTERN PyObject *_wrap_delete_CvANN_MLP(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< CvANN_MLP * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -44148,7 +45181,7 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_create(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -44246,7 +45279,12 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_create(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvANN_MLP_create'.\n  Possible C/C++ prototypes are:\n    create(CvMat const *,int,double,double)\n    create(CvMat const *,int,double)\n    create(CvMat const *,int)\n    create(CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvANN_MLP_create'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    create(CvANN_MLP *,CvMat const *,int,double,double)\n"
+    "    create(CvANN_MLP *,CvMat const *,int,double)\n"
+    "    create(CvANN_MLP *,CvMat const *,int)\n"
+    "    create(CvANN_MLP *,CvMat const *)\n");
   return NULL;
 }
 
@@ -44260,7 +45298,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg5 = (CvMat *) 0 ;
   CvANN_MLP_TrainParams arg6 ;
   int arg7 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -44278,6 +45315,7 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
   PyObject * obj6 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:CvANN_MLP_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
@@ -44387,7 +45425,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
   CvANN_MLP_TrainParams arg6 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -44402,6 +45439,7 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   PyObject * obj5 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CvANN_MLP_train",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
@@ -44505,7 +45543,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
   CvMat *arg5 = (CvMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -44517,6 +45554,7 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train__SWIG_2(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:CvANN_MLP_train",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
@@ -44606,7 +45644,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
   CvMat *arg4 = (CvMat *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -44616,6 +45653,7 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train__SWIG_3(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:CvANN_MLP_train",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
@@ -44690,7 +45728,7 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 7); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -44821,7 +45859,12 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_train(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvANN_MLP_train'.\n  Possible C/C++ prototypes are:\n    train(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvANN_MLP_TrainParams,int)\n    train(CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvANN_MLP_TrainParams)\n    train(CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n    train(CvMat const *,CvMat const *,CvMat const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CvANN_MLP_train'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    train(CvANN_MLP *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvANN_MLP_TrainParams,int)\n"
+    "    train(CvANN_MLP *,CvMat const *,CvMat const *,CvMat const *,CvMat const *,CvANN_MLP_TrainParams)\n"
+    "    train(CvANN_MLP *,CvMat const *,CvMat const *,CvMat const *,CvMat const *)\n"
+    "    train(CvANN_MLP *,CvMat const *,CvMat const *,CvMat const *)\n");
   return NULL;
 }
 
@@ -44831,7 +45874,6 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_predict(PyObject *SWIGUNUSEDPARM(self), PyO
   CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   CvMat *arg2 = (CvMat *) 0 ;
   CvMat *arg3 = (CvMat *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool freearg2 = false ;
@@ -44839,6 +45881,7 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_predict(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:CvANN_MLP_predict",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
@@ -45021,10 +46064,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_get_layer_count(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_get_layer_count",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
@@ -45051,10 +46094,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvANN_MLP_get_layer_sizes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvANN_MLP_get_layer_sizes",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
@@ -45082,13 +46125,13 @@ SWIGINTERN PyObject *_wrap_CvANN_MLP_get_weights(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvANN_MLP *arg1 = (CvANN_MLP *) 0 ;
   int arg2 ;
-  double *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  double *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvANN_MLP_get_weights",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvANN_MLP, 0 |  0 );
@@ -45119,7 +46162,7 @@ fail:
 
 SWIGINTERN PyObject *CvANN_MLP_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvANN_MLP, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -45420,13 +46463,13 @@ SWIGINTERN PyObject *_wrap_new_CvTrainTestSplit__SWIG_1(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   int arg1 ;
   bool arg2 ;
-  CvTrainTestSplit *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvTrainTestSplit *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvTrainTestSplit",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -45458,10 +46501,10 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvTrainTestSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
-  CvTrainTestSplit *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTrainTestSplit *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvTrainTestSplit",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
@@ -45489,13 +46532,13 @@ SWIGINTERN PyObject *_wrap_new_CvTrainTestSplit__SWIG_3(PyObject *SWIGUNUSEDPARM
   PyObject *resultobj = 0;
   float arg1 ;
   bool arg2 ;
-  CvTrainTestSplit *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  CvTrainTestSplit *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_CvTrainTestSplit",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
@@ -45527,10 +46570,10 @@ fail:
 SWIGINTERN PyObject *_wrap_new_CvTrainTestSplit__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   float arg1 ;
-  CvTrainTestSplit *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTrainTestSplit *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CvTrainTestSplit",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
@@ -45560,7 +46603,7 @@ SWIGINTERN PyObject *_wrap_new_CvTrainTestSplit(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -45621,7 +46664,13 @@ SWIGINTERN PyObject *_wrap_new_CvTrainTestSplit(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvTrainTestSplit'.\n  Possible C/C++ prototypes are:\n    CvTrainTestSplit()\n    CvTrainTestSplit(int,bool)\n    CvTrainTestSplit(int)\n    CvTrainTestSplit(float,bool)\n    CvTrainTestSplit(float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CvTrainTestSplit'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CvTrainTestSplit()\n"
+    "    CvTrainTestSplit(int,bool)\n"
+    "    CvTrainTestSplit(int)\n"
+    "    CvTrainTestSplit(float,bool)\n"
+    "    CvTrainTestSplit(float)\n");
   return NULL;
 }
 
@@ -45649,7 +46698,6 @@ SWIGINTERN PyObject *_wrap_CvTrainTestSplit_train_sample_part_mode_set(PyObject
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->train_sample_part_mode = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45660,10 +46708,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_train_sample_part_mode_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_train_sample_part_mode_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
@@ -45702,7 +46750,6 @@ SWIGINTERN PyObject *_wrap_CvTrainTestSplit_class_part_mode_set(PyObject *SWIGUN
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->class_part_mode = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45713,10 +46760,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_class_part_mode_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_class_part_mode_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
@@ -45755,7 +46802,6 @@ SWIGINTERN PyObject *_wrap_CvTrainTestSplit_mix_set(PyObject *SWIGUNUSEDPARM(sel
   } 
   arg2 = static_cast< bool >(val2);
   if (arg1) (arg1)->mix = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45766,10 +46812,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_mix_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  bool result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_mix_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
@@ -45788,10 +46834,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_class_part_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
-  CvTrainTestSplit_class_part *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTrainTestSplit_class_part *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_class_part_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
@@ -45810,10 +46856,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_train_sample_part_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit *arg1 = (CvTrainTestSplit *) 0 ;
-  CvTrainTestSplit_train_sample_part *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvTrainTestSplit_train_sample_part *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_train_sample_part_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit, 0 |  0 );
@@ -45844,7 +46890,7 @@ SWIGINTERN PyObject *_wrap_delete_CvTrainTestSplit(PyObject *SWIGUNUSEDPARM(self
   arg1 = reinterpret_cast< CvTrainTestSplit * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -45860,7 +46906,7 @@ fail:
 
 SWIGINTERN PyObject *CvTrainTestSplit_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvTrainTestSplit, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -45888,7 +46934,6 @@ SWIGINTERN PyObject *_wrap_CvTrainTestSplit_class_part_count_set(PyObject *SWIGU
   }
   arg2 = reinterpret_cast< int * >(argp2);
   if (arg1) (arg1)->count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45899,10 +46944,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_class_part_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit_class_part *arg1 = (CvTrainTestSplit_class_part *) 0 ;
-  int *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_class_part_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit_class_part, 0 |  0 );
@@ -45941,7 +46986,6 @@ SWIGINTERN PyObject *_wrap_CvTrainTestSplit_class_part_portion_set(PyObject *SWI
   }
   arg2 = reinterpret_cast< float * >(argp2);
   if (arg1) (arg1)->portion = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -45952,10 +46996,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_class_part_portion_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit_class_part *arg1 = (CvTrainTestSplit_class_part *) 0 ;
-  float *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_class_part_portion_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit_class_part, 0 |  0 );
@@ -46007,7 +47051,7 @@ SWIGINTERN PyObject *_wrap_delete_CvTrainTestSplit_class_part(PyObject *SWIGUNUS
   arg1 = reinterpret_cast< CvTrainTestSplit_class_part * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -46023,7 +47067,7 @@ fail:
 
 SWIGINTERN PyObject *CvTrainTestSplit_class_part_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvTrainTestSplit_class_part, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -46051,7 +47095,6 @@ SWIGINTERN PyObject *_wrap_CvTrainTestSplit_train_sample_part_count_set(PyObject
   } 
   arg2 = static_cast< int >(val2);
   if (arg1) (arg1)->count = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -46062,10 +47105,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_train_sample_part_count_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit_train_sample_part *arg1 = (CvTrainTestSplit_train_sample_part *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_train_sample_part_count_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit_train_sample_part, 0 |  0 );
@@ -46104,7 +47147,6 @@ SWIGINTERN PyObject *_wrap_CvTrainTestSplit_train_sample_part_portion_set(PyObje
   } 
   arg2 = static_cast< float >(val2);
   if (arg1) (arg1)->portion = arg2;
-  
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -46115,10 +47157,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvTrainTestSplit_train_sample_part_portion_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvTrainTestSplit_train_sample_part *arg1 = (CvTrainTestSplit_train_sample_part *) 0 ;
-  float result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  float result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvTrainTestSplit_train_sample_part_portion_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvTrainTestSplit_train_sample_part, 0 |  0 );
@@ -46170,7 +47212,7 @@ SWIGINTERN PyObject *_wrap_delete_CvTrainTestSplit_train_sample_part(PyObject *S
   arg1 = reinterpret_cast< CvTrainTestSplit_train_sample_part * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -46186,7 +47228,7 @@ fail:
 
 SWIGINTERN PyObject *CvTrainTestSplit_train_sample_part_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvTrainTestSplit_train_sample_part, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -46227,7 +47269,7 @@ SWIGINTERN PyObject *_wrap_delete_CvMLData(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = reinterpret_cast< CvMLData * >(argp1);
   {
     try {
-      delete arg1;
+      delete arg1; 
     } 
     catch (...) 
     {
@@ -46245,7 +47287,6 @@ SWIGINTERN PyObject *_wrap_CvMLData_read_csv(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
   char *arg2 = (char *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -46253,6 +47294,7 @@ SWIGINTERN PyObject *_wrap_CvMLData_read_csv(PyObject *SWIGUNUSEDPARM(self), PyO
   int alloc2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMLData_read_csv",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46286,10 +47328,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_values(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_values",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46316,10 +47358,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_response(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_response",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46346,10 +47388,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_missing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_missing",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46414,10 +47456,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_response_idx(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_response_idx",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46444,10 +47486,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_train_sample_idx(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_train_sample_idx",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46474,10 +47516,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_test_sample_idx(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_test_sample_idx",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46571,10 +47613,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_var_idx(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_var_idx",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46648,10 +47690,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_var_types(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  CvMat *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  CvMat *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_var_types",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46679,13 +47721,13 @@ SWIGINTERN PyObject *_wrap_CvMLData_get_var_type(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
   int arg2 ;
-  int result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:CvMLData_get_var_type",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46843,10 +47885,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_delimiter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  char result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_delimiter",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46911,10 +47953,10 @@ fail:
 SWIGINTERN PyObject *_wrap_CvMLData_get_miss_ch(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CvMLData *arg1 = (CvMLData *) 0 ;
-  char result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
+  char result;
   
   if (!PyArg_ParseTuple(args,(char *)"O:CvMLData_get_miss_ch",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CvMLData, 0 |  0 );
@@ -46940,12 +47982,13 @@ fail:
 
 SWIGINTERN PyObject *CvMLData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CvMLData, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 static PyMethodDef SwigMethods[] = {
+        { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
         { (char *)"new_CvRNG_Wrapper", _wrap_new_CvRNG_Wrapper, METH_VARARGS, NULL},
         { (char *)"CvRNG_Wrapper_ptr", _wrap_CvRNG_Wrapper_ptr, METH_VARARGS, NULL},
         { (char *)"CvRNG_Wrapper_ref", _wrap_CvRNG_Wrapper_ref, METH_VARARGS, NULL},
@@ -47462,10 +48505,9 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_CvForestERTree", _wrap_new_CvForestERTree, METH_VARARGS, NULL},
         { (char *)"delete_CvForestERTree", _wrap_delete_CvForestERTree, METH_VARARGS, NULL},
         { (char *)"CvForestERTree_swigregister", CvForestERTree_swigregister, METH_VARARGS, NULL},
-        { (char *)"CvERTrees_train", _wrap_CvERTrees_train, METH_VARARGS, NULL},
-        { (char *)"CvERTrees_clear", _wrap_CvERTrees_clear, METH_VARARGS, NULL},
         { (char *)"new_CvERTrees", _wrap_new_CvERTrees, METH_VARARGS, NULL},
         { (char *)"delete_CvERTrees", _wrap_delete_CvERTrees, METH_VARARGS, NULL},
+        { (char *)"CvERTrees_train", _wrap_CvERTrees_train, METH_VARARGS, NULL},
         { (char *)"CvERTrees_swigregister", CvERTrees_swigregister, METH_VARARGS, NULL},
         { (char *)"CvBoostParams_boost_type_set", _wrap_CvBoostParams_boost_type_set, METH_VARARGS, NULL},
         { (char *)"CvBoostParams_boost_type_get", _wrap_CvBoostParams_boost_type_get, METH_VARARGS, NULL},
@@ -47592,70 +48634,70 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_CvERTreesTo_p_CvRTrees(void *x) {
+static void *_p_CvERTreesTo_p_CvRTrees(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvRTrees *)  ((CvERTrees *) x));
 }
-static void *_p_CvERTreeTrainDataTo_p_CvDTreeTrainData(void *x) {
+static void *_p_CvERTreeTrainDataTo_p_CvDTreeTrainData(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvDTreeTrainData *)  ((CvERTreeTrainData *) x));
 }
-static void *_p_CvForestERTreeTo_p_CvForestTree(void *x) {
+static void *_p_CvForestERTreeTo_p_CvForestTree(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvForestTree *)  ((CvForestERTree *) x));
 }
-static void *_p_CvRTParamsTo_p_CvDTreeParams(void *x) {
+static void *_p_CvRTParamsTo_p_CvDTreeParams(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvDTreeParams *)  ((CvRTParams *) x));
 }
-static void *_p_CvBoostParamsTo_p_CvDTreeParams(void *x) {
+static void *_p_CvBoostParamsTo_p_CvDTreeParams(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvDTreeParams *)  ((CvBoostParams *) x));
 }
-static void *_p_CvNormalBayesClassifierTo_p_CvStatModel(void *x) {
+static void *_p_CvNormalBayesClassifierTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvNormalBayesClassifier *) x));
 }
-static void *_p_CvSVMTo_p_CvStatModel(void *x) {
+static void *_p_CvSVMTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvSVM *) x));
 }
-static void *_p_CvForestERTreeTo_p_CvStatModel(void *x) {
+static void *_p_CvForestERTreeTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *) (CvDTree *)(CvForestTree *) ((CvForestERTree *) x));
 }
-static void *_p_CvANN_MLPTo_p_CvStatModel(void *x) {
+static void *_p_CvANN_MLPTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvANN_MLP *) x));
 }
-static void *_p_CvKNearestTo_p_CvStatModel(void *x) {
+static void *_p_CvKNearestTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvKNearest *) x));
 }
-static void *_p_CvForestTreeTo_p_CvStatModel(void *x) {
+static void *_p_CvForestTreeTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *) (CvDTree *) ((CvForestTree *) x));
 }
-static void *_p_CvRTreesTo_p_CvStatModel(void *x) {
+static void *_p_CvRTreesTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvRTrees *) x));
 }
-static void *_p_CvBoostTreeTo_p_CvStatModel(void *x) {
+static void *_p_CvBoostTreeTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *) (CvDTree *) ((CvBoostTree *) x));
 }
-static void *_p_CvERTreesTo_p_CvStatModel(void *x) {
+static void *_p_CvERTreesTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *) (CvRTrees *) ((CvERTrees *) x));
 }
-static void *_p_CvEMTo_p_CvStatModel(void *x) {
+static void *_p_CvEMTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvEM *) x));
 }
-static void *_p_CvDTreeTo_p_CvStatModel(void *x) {
+static void *_p_CvDTreeTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvDTree *) x));
 }
-static void *_p_CvBoostTo_p_CvStatModel(void *x) {
+static void *_p_CvBoostTo_p_CvStatModel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvStatModel *)  ((CvBoost *) x));
 }
-static void *_p_CvForestERTreeTo_p_CvDTree(void *x) {
+static void *_p_CvForestERTreeTo_p_CvDTree(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvDTree *) (CvForestTree *) ((CvForestERTree *) x));
 }
-static void *_p_CvForestTreeTo_p_CvDTree(void *x) {
+static void *_p_CvForestTreeTo_p_CvDTree(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvDTree *)  ((CvForestTree *) x));
 }
-static void *_p_CvBoostTreeTo_p_CvDTree(void *x) {
+static void *_p_CvBoostTreeTo_p_CvDTree(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((CvDTree *)  ((CvBoostTree *) x));
 }
 static swig_type_info _swigt__m_CvSVMKernel__f_int_int_p_p_q_const__float_p_q_const__float_p_float__void = {"_m_CvSVMKernel__f_int_int_p_p_q_const__float_p_q_const__float_p_float__void", "void (CvSVMKernel::*)(int,int,float const **,float const *,float *)|CvSVMKernel::Calc", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__m_CvSVMSolver__f_int_p_float_p_float_bool__p_float = {"_m_CvSVMSolver__f_int_p_float_p_float_bool__p_float", "float *(CvSVMSolver::*)(int,float *,float *,bool)|CvSVMSolver::GetRow", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__m_CvSVMSolver__f_int_p_float_p_float_bool__p_float = {"_m_CvSVMSolver__f_int_p_float_p_float_bool__p_float", "CvSVMSolver::GetRow|float *(CvSVMSolver::*)(int,float *,float *,bool)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__m_CvSVMSolver__f_r_double_r_double__void = {"_m_CvSVMSolver__f_r_double_r_double__void", "void (CvSVMSolver::*)(double &,double &)|CvSVMSolver::CalcRho", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__m_CvSVMSolver__f_r_int_r_int__bool = {"_m_CvSVMSolver__f_r_int_r_int__bool", "bool (CvSVMSolver::*)(int &,int &)|CvSVMSolver::SelectWorkingSet", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__m_CvSVMSolver__f_r_int_r_int__bool = {"_m_CvSVMSolver__f_r_int_r_int__bool", "CvSVMSolver::SelectWorkingSet|bool (CvSVMSolver::*)(int &,int &)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Calc = {"_p_Calc", "Calc *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CalcRho = {"_p_CalcRho", "CalcRho *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Cv32suf = {"_p_Cv32suf", "Cv32suf *", 0, 0, (void*)0, 0};
@@ -47672,7 +48714,7 @@ static swig_type_info _swigt__p_CvChain = {"_p_CvChain", "CvChain *", 0, 0, (voi
 static swig_type_info _swigt__p_CvChainPtReader = {"_p_CvChainPtReader", "CvChainPtReader *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConDensation = {"_p_CvConDensation", "CvConDensation *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConnectedComp = {"_p_CvConnectedComp", "CvConnectedComp *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CvContour = {"_p_CvContour", "CvContour *|CvPoint2DSeq *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CvContour = {"_p_CvContour", "CvPoint2DSeq *|CvContour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvContourTree = {"_p_CvContourTree", "CvContourTree *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvConvexityDefect = {"_p_CvConvexityDefect", "CvConvexityDefect *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CvDTree = {"_p_CvDTree", "CvDTree *", 0, 0, (void*)0, 0};
@@ -47785,19 +48827,19 @@ static swig_type_info _swigt__p_bool = {"_p_bool", "bool *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_float = {"_p_float", "float *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_long_long = {"_p_long_long", "long long *|int64 *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "CvHistType *|int *|CVStatus *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64 *|long long *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_CvMat = {"_p_p_CvMat", "CvMat **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_double = {"_p_p_double", "double **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_float = {"_p_p_float", "float **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_int = {"_p_p_int", "int **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_unsigned_char = {"_p_p_unsigned_char", "unsigned char **|uchar **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|schar *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "schar *|signed char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_t = {"_p_size_t", "size_t *|CvSubdiv2DEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uchar *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "unsigned long long *|CvRNG *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_void = {"_p_void", "void *|CvArr *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "uchar *|unsigned char *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "uint64 *|unsigned long long *|CvRNG *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|ushort *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_void = {"_p_void", "CvArr *|void *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__m_CvSVMKernel__f_int_int_p_p_q_const__float_p_q_const__float_p_float__void,
@@ -48310,7 +49352,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
   
   clientdata = clientdata;
   
@@ -48320,6 +49362,9 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -48348,6 +49393,12 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -48510,26 +49561,58 @@ extern "C" {
   
   SWIGINTERN PyObject *
   swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
+#if PY_VERSION_HEX >= 0x03000000
+    return PyUnicode_InternFromString("<Swig global variables>");
+#else
     return PyString_FromString("<Swig global variables>");
+#endif
   }
   
   SWIGINTERN PyObject *
   swig_varlink_str(swig_varlinkobject *v) {
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *str = PyUnicode_InternFromString("(");
+    PyObject *tail;
+    PyObject *joined;
+    swig_globalvar *var;
+    for (var = v->vars; var; var=var->next) {
+      tail = PyUnicode_FromString(var->name);
+      joined = PyUnicode_Concat(str, tail);
+      Py_DecRef(str);
+      Py_DecRef(tail);
+      str = joined;
+      if (var->next) {
+        tail = PyUnicode_InternFromString(", ");
+        joined = PyUnicode_Concat(str, tail);
+        Py_DecRef(str);
+        Py_DecRef(tail);
+        str = joined;
+      }
+    }
+    tail = PyUnicode_InternFromString(")");
+    joined = PyUnicode_Concat(str, tail);
+    Py_DecRef(str);
+    Py_DecRef(tail);
+    str = joined;
+#else
     PyObject *str = PyString_FromString("(");
-    swig_globalvar  *var;
+    swig_globalvar *var;
     for (var = v->vars; var; var=var->next) {
       PyString_ConcatAndDel(&str,PyString_FromString(var->name));
       if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
     }
     PyString_ConcatAndDel(&str,PyString_FromString(")"));
+#endif
     return str;
   }
   
   SWIGINTERN int
   swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
+    char *tmp;
     PyObject *str = swig_varlink_str(v);
     fprintf(fp,"Swig global variables ");
-    fprintf(fp,"%s\n", PyString_AsString(str));
+    fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
+    SWIG_Python_str_DelForPy3(tmp);
     Py_DECREF(str);
     return 0;
   }
@@ -48587,8 +49670,13 @@ extern "C" {
     if (!type_init) {
       const PyTypeObject tmp
       = {
+        /* PyObject header changed in Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+        PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else
         PyObject_HEAD_INIT(NULL)
         0,                                  /* Number of items in variable part (ob_size) */
+#endif
         (char *)"swigvarlink",              /* Type name (tp_name) */
         sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
         0,                                  /* Itemsize (tp_itemsize) */
@@ -48624,7 +49712,10 @@ extern "C" {
 #endif
       };
       varlink_type = tmp;
+      /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
       varlink_type.ob_type = &PyType_Type;
+#endif
       type_init = 1;
     }
     return &varlink_type;
@@ -48749,13 +49840,37 @@ extern "C" {
 #ifdef __cplusplus
 extern "C"
 #endif
-SWIGEXPORT void SWIG_init(void) {
-  PyObject *m, *d;
+
+SWIGEXPORT 
+#if PY_VERSION_HEX >= 0x03000000
+PyObject*
+#else
+void
+#endif
+SWIG_init(void) {
+  PyObject *m, *d;  
+#if PY_VERSION_HEX >= 0x03000000
+  static struct PyModuleDef SWIG_module = {
+    PyModuleDef_HEAD_INIT,
+    (char *) SWIG_name,
+    NULL,
+    -1,
+    SwigMethods,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  };
+#endif
   
   /* Fix SwigMethods to carry the callback ptrs when needed */
   SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
   
+#if PY_VERSION_HEX >= 0x03000000
+  m = PyModule_Create(&SWIG_module);
+#else
   m = Py_InitModule((char *) SWIG_name, SwigMethods);
+#endif
   d = PyModule_GetDict(m);
   
   SWIG_InitializeModule(0);
@@ -48825,5 +49940,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CV_TS_CONCENTRIC_SPHERES",SWIG_From_int(static_cast< int >(0)));
   SWIG_Python_SetConstant(d, "CV_COUNT",SWIG_From_int(static_cast< int >(0)));
   SWIG_Python_SetConstant(d, "CV_PORTION",SWIG_From_int(static_cast< int >(1)));
+#if PY_VERSION_HEX >= 0x03000000
+  return m;
+#else
+  return;
+#endif
 }
 
index d0e9012b6b044b2afca6844c0d9a73010bfacd0b..71e2b27c5f5eebbcd07dd01e6bf8c33c96fa1559 100644 (file)
@@ -1,12 +1,32 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.31
+# Version 1.3.39
 #
-# 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,268 +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): raise AttributeError, "No constructor defined"
+    __getattr__ = lambda self, name: _swig_getattr(self, SwigPyIterator, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __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):
-        """
-        begin(self) -> iterator
-        begin(self) -> const_iterator
-        """
-        return _cv.FloatVector_begin(*args)
+    def begin(self):
+        """begin(self) -> const_iterator"""
+        return _cv.FloatVector_begin(self)
 
-    def end(*args):
-        """
-        end(self) -> iterator
-        end(self) -> const_iterator
-        """
-        return _cv.FloatVector_end(*args)
+    def end(self):
+        """end(self) -> const_iterator"""
+        return _cv.FloatVector_end(self)
 
-    def rbegin(*args):
-        """
-        rbegin(self) -> reverse_iterator
-        rbegin(self) -> const_reverse_iterator
-        """
-        return _cv.FloatVector_rbegin(*args)
+    def rbegin(self):
+        """rbegin(self) -> const_reverse_iterator"""
+        return _cv.FloatVector_rbegin(self)
 
-    def rend(*args):
-        """
-        rend(self) -> reverse_iterator
-        rend(self) -> const_reverse_iterator
-        """
-        return _cv.FloatVector_rend(*args)
+    def rend(self):
+        """rend(self) -> const_reverse_iterator"""
+        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;
@@ -362,163 +385,164 @@ 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):
-        """
-        begin(self) -> iterator
-        begin(self) -> const_iterator
-        """
-        return _cv.CvPointVector_begin(*args)
+    def begin(self):
+        """begin(self) -> const_iterator"""
+        return _cv.CvPointVector_begin(self)
 
-    def end(*args):
-        """
-        end(self) -> iterator
-        end(self) -> const_iterator
-        """
-        return _cv.CvPointVector_end(*args)
+    def end(self):
+        """end(self) -> const_iterator"""
+        return _cv.CvPointVector_end(self)
 
-    def rbegin(*args):
-        """
-        rbegin(self) -> reverse_iterator
-        rbegin(self) -> const_reverse_iterator
-        """
-        return _cv.CvPointVector_rbegin(*args)
+    def rbegin(self):
+        """rbegin(self) -> const_reverse_iterator"""
+        return _cv.CvPointVector_rbegin(self)
 
-    def rend(*args):
-        """
-        rend(self) -> reverse_iterator
-        rend(self) -> const_reverse_iterator
-        """
-        return _cv.CvPointVector_rend(*args)
+    def rend(self):
+        """rend(self) -> const_reverse_iterator"""
+        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;
@@ -656,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)
@@ -692,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)
@@ -961,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):
@@ -1154,7 +1175,6 @@ 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
@@ -1196,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
@@ -1226,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
@@ -1574,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
@@ -1586,7 +1606,7 @@ 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)
@@ -1594,15 +1614,15 @@ def cvCvtSeqToArray(*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)
@@ -1610,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
     """
@@ -1618,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)
@@ -1628,7 +1648,7 @@ 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
@@ -1651,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
@@ -1695,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): 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
@@ -1732,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)
@@ -1960,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)
@@ -1998,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
@@ -2014,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): 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
@@ -2061,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
@@ -2077,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): 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
@@ -2125,230 +2145,230 @@ class CvMat(_object):
     __swig_setmethods__["cols"] = _cv.CvMat_cols_set
     __swig_getmethods__["cols"] = _cv.CvMat_cols_get
     if _newclass:cols = _swig_property(_cv.CvMat_cols_get, _cv.CvMat_cols_set)
-    def __add__(*args):
+    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)
@@ -2356,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):
                """
@@ -2500,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
@@ -2519,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): 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
@@ -2553,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)
@@ -2571,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
@@ -2603,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
@@ -2619,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): 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
@@ -2669,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
@@ -2695,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
@@ -2711,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): 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
@@ -2752,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
@@ -2790,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
@@ -2816,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
@@ -2850,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
@@ -2896,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
@@ -2923,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
@@ -2953,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
@@ -2980,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
@@ -3007,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
@@ -3037,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
@@ -3072,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
@@ -3095,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
@@ -3118,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
@@ -3165,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
@@ -3177,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)
@@ -3190,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): 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
@@ -3228,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
@@ -3260,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
@@ -3346,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
@@ -3369,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
@@ -3434,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
@@ -3463,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
@@ -3486,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
@@ -3512,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
@@ -3580,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
@@ -3642,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
@@ -3710,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
@@ -3745,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
@@ -3786,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
@@ -3809,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
@@ -3832,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
@@ -3842,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"""
@@ -3866,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
@@ -3891,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
@@ -3923,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
@@ -3970,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
@@ -4002,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
@@ -4031,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
@@ -4060,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)
 
@@ -4082,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):
@@ -4125,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):
@@ -4172,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
@@ -4186,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)
 
@@ -4207,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)
 
@@ -4294,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):
@@ -4305,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):
@@ -4325,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):
@@ -4333,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):
@@ -4360,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):
@@ -4372,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):
@@ -4415,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):
@@ -4484,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):
@@ -4514,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):
@@ -4525,11 +4542,11 @@ 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)"""
+  """cvSort(CvArr src, CvArr dst = None, CvArr idxmat = None, int flags = 0)"""
   return _cv.cvSort(*args)
 
 def cvSolveCubic(*args):
@@ -4537,7 +4554,7 @@ def cvSolveCubic(*args):
   return _cv.cvSolveCubic(*args)
 
 def cvSolvePoly(*args):
-  """cvSolvePoly(CvMat coeffs, int maxiter=20, int fig=100)"""
+  """cvSolvePoly(CvMat coeffs, int maxiter = 20, int fig = 100)"""
   return _cv.cvSolvePoly(*args)
 
 def cvCrossProduct(*args):
@@ -4547,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):
@@ -4561,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)
 
@@ -4571,15 +4588,15 @@ def cvTranspose(*args):
   return _cv.cvTranspose(*args)
 
 def cvCompleteSymm(*args):
-  """cvCompleteSymm(CvMat matrix, int LtoR=0)"""
+  """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):
@@ -4587,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):
@@ -4603,11 +4620,11 @@ 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)"""
   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):
@@ -4646,37 +4663,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):
@@ -4695,9 +4709,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"""
@@ -4720,7 +4734,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):
@@ -4732,31 +4746,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):
@@ -4772,7 +4786,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):
@@ -4795,7 +4809,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):
@@ -4803,7 +4817,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):
@@ -4815,13 +4829,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):
@@ -4833,13 +4847,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)
 
@@ -4867,7 +4881,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):
@@ -4898,7 +4912,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):
@@ -4911,15 +4925,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)
 
@@ -4956,7 +4970,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): 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
@@ -4986,7 +5000,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):
@@ -5000,21 +5014,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)
 
@@ -5022,36 +5036,36 @@ 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, 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, 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)
+        int thickness = 1, int line_type = 8, int shift = 0)
     """
   return _cv.cvPolyLine(*args)
 
@@ -5062,7 +5076,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):
@@ -5102,9 +5116,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
@@ -5115,13 +5129,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):
@@ -5129,7 +5143,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):
@@ -5146,8 +5160,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)
 
@@ -5170,9 +5184,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
@@ -5208,8 +5222,9 @@ def cvTreeToNodeSeq(*args):
 def cvKMeans2(*args):
   """
     cvKMeans2(CvArr samples, int cluster_count, CvArr labels, CvTermCriteria termcrit, 
-        int attempts=1, CvRNG rng=0, 
-        int flags=0, CvArr _centers=0, double compactness=0) -> int
+        int attempts = 1, CvRNG rng = None, 
+        int flags = 0, CvArr _centers = None, 
+        double compactness = None) -> int
     """
   return _cv.cvKMeans2(*args)
 
@@ -5225,17 +5240,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"""
@@ -5265,8 +5280,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)
 
@@ -5291,12 +5306,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):
   """
@@ -5320,8 +5335,8 @@ def 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)
 
@@ -5338,7 +5353,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):
@@ -5346,7 +5361,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):
@@ -5358,17 +5373,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)
 
@@ -5377,35 +5392,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):
@@ -5442,9 +5457,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"""
@@ -5460,37 +5475,37 @@ 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):
   """
@@ -5511,8 +5526,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
@@ -5522,140 +5537,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):
+    def save(self, *args):
         """
-        save(self, char filename, char imgname, int params=0)
+        save(self, char filename, char imgname, int params = None)
         save(self, char filename, char imgname)
         """
-        return _cv.CvImage_save(*args)
+        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)
@@ -5671,19 +5686,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
@@ -5693,120 +5708,120 @@ 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):
+    def save(self, *args):
         """
-        save(self, char filename, char matname, int params=0)
+        save(self, char filename, char matname, int params = None)
         save(self, char filename, char matname)
         """
-        return _cv.CvMatrix_save(*args)
+        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)
@@ -5847,14 +5862,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)
@@ -5935,9 +5950,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
@@ -5973,9 +5988,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
@@ -6002,9 +6017,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
@@ -6052,9 +6067,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
@@ -6117,9 +6132,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
@@ -6146,9 +6161,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
@@ -6172,9 +6187,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
@@ -6198,9 +6213,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
@@ -6281,22 +6296,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
@@ -6328,9 +6343,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
@@ -6344,7 +6359,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): 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
@@ -6393,7 +6408,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): 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
@@ -6499,9 +6514,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
@@ -6522,9 +6537,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
@@ -6557,9 +6572,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
@@ -6592,9 +6607,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
@@ -6608,7 +6623,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): 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
@@ -6649,9 +6664,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
@@ -6663,37 +6678,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)
 
@@ -6703,15 +6719,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)
 
@@ -6727,11 +6743,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):
@@ -6739,13 +6755,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)
 
@@ -6759,8 +6775,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)
 
@@ -6770,8 +6786,8 @@ 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)
 
@@ -6782,41 +6798,41 @@ def 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)
+        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):
@@ -6838,7 +6854,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)
 
@@ -6857,25 +6873,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)
 
@@ -6893,9 +6909,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)
 
@@ -6925,7 +6941,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)
 
@@ -6960,7 +6976,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)
 
@@ -6972,25 +6988,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)
 
@@ -7014,11 +7030,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):
@@ -7045,7 +7061,7 @@ def cvSubdivDelaunay2DInsert(*args):
   return _cv.cvSubdivDelaunay2DInsert(*args)
 
 def cvSubdiv2DLocate(*args):
-  """cvSubdiv2DLocate(CvSubdiv2D subdiv, CvPoint2D32f pt, CvSubdiv2DEdge edge) -> int"""
+  """cvSubdiv2DLocate(CvSubdiv2D subdiv, CvPoint2D32f pt) -> CvSubdiv2DPointLocation"""
   return _cv.cvSubdiv2DLocate(*args)
 
 def cvCalcSubdivVoronoi2D(*args):
@@ -7090,34 +7106,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"""
+  """
+    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):
@@ -7144,7 +7163,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):
@@ -7156,7 +7175,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):
@@ -7171,17 +7190,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)
 
@@ -7190,10 +7209,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):
@@ -7217,11 +7233,11 @@ 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 cvCalcHist(*args):
-  """cvCalcHist( image, CvHistogram hist, int accumulate=0, CvArr mask=None)"""
+  """cvCalcHist( image, CvHistogram hist, int accumulate = 0, CvArr mask = None)"""
   return _cv.cvCalcHist(*args)
 
 def cvCalcArrBackProject(*args):
@@ -7238,7 +7254,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)
 
@@ -7252,8 +7268,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)
 
@@ -7266,44 +7282,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)
 
@@ -7318,24 +7334,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)
 
@@ -7351,7 +7367,7 @@ def cvCreateKDTree(*args):
   return _cv.cvCreateKDTree(*args)
 
 def cvCreateSpillTree(*args):
-  """cvCreateSpillTree(CvMat raw_data, int naive=50, double rho=.7, double tau=.1) -> CvFeatureTree"""
+  """cvCreateSpillTree(CvMat raw_data, int naive = 50, double rho = .7, double tau = .1) -> CvFeatureTree"""
   return _cv.cvCreateSpillTree(*args)
 
 def cvReleaseFeatureTree(*args):
@@ -7361,7 +7377,7 @@ def cvReleaseFeatureTree(*args):
 def cvFindFeatures(*args):
   """
     cvFindFeatures(CvFeatureTree tr, CvMat query_points, CvMat indices, 
-        int emax=20)
+        int emax = 20)
     """
   return _cv.cvFindFeatures(*args)
 
@@ -7374,15 +7390,17 @@ def cvFindFeaturesBoxed(*args):
 
 def cvCreateLSH(*args):
   """
-    cvCreateLSH(CvLSHOperations ops, int d, int L=10, int k=10, int type=((6) +(((1) -1) << 3)), 
-        double r=4, int64 seed=-1) -> CvLSH
+    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) -1) << 3)), 
-        double r=4, int64 seed=-1) -> CvLSH
+    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)
 
@@ -7427,9 +7445,9 @@ class CvSURFPoint(_object):
     __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, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSURFPoint"""
-        this = _cv.new_CvSURFPoint(*args)
+        this = _cv.new_CvSURFPoint()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSURFPoint
@@ -7440,8 +7458,8 @@ CvSURFPoint_swigregister(CvSURFPoint)
 
 def cvSURFPoint(*args):
   """
-    cvSURFPoint(CvPoint2D32f pt, int laplacian, int size, float dir=0, 
-        float hessian=0) -> CvSURFPoint
+    cvSURFPoint(CvPoint2D32f pt, int laplacian, int size, float dir = 0, 
+        float hessian = 0) -> CvSURFPoint
     """
   return _cv.cvSURFPoint(*args)
 class CvSURFParams(_object):
@@ -7463,9 +7481,9 @@ class CvSURFParams(_object):
     __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, *args): 
+    def __init__(self): 
         """__init__(self) -> CvSURFParams"""
-        this = _cv.new_CvSURFParams(*args)
+        this = _cv.new_CvSURFParams()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvSURFParams
@@ -7475,14 +7493,11 @@ CvSURFParams_swigregister(CvSURFParams)
 
 
 def cvSURFParams(*args):
-  """cvSURFParams(double hessianThreshold, int extended=0) -> CvSURFParams"""
+  """cvSURFParams(double hessianThreshold, int extended = 0) -> CvSURFParams"""
   return _cv.cvSURFParams(*args)
 
 def cvExtractSURF(*args):
-  """
-    cvExtractSURF(CvArr img, CvArr mask, CvSeq keypoints, CvSURFParams params, 
-        int useProvidedKeyPts=0)
-    """
+  """cvExtractSURF(CvArr img, CvArr mask, CvSURFParams params, int useProvidedKeyPts = 0)"""
   return _cv.cvExtractSURF(*args)
 class CvMSERParams(_object):
     """Proxy of C++ CvMSERParams class"""
@@ -7518,9 +7533,9 @@ class CvMSERParams(_object):
     __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, *args): 
+    def __init__(self): 
         """__init__(self) -> CvMSERParams"""
-        this = _cv.new_CvMSERParams(*args)
+        this = _cv.new_CvMSERParams()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvMSERParams
@@ -7531,10 +7546,11 @@ CvMSERParams_swigregister(CvMSERParams)
 
 def cvMSERParams(*args):
   """
-    cvMSERParams(int delta=5, int min_area=60, int max_area=14400, float max_variation=.25f, 
-        float min_diversity=.2f, 
-        int max_evolution=200, double area_threshold=1.01, 
-        double min_margin=.003, int edge_blur_size=5) -> CvMSERParams
+    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)
 
@@ -7560,9 +7576,9 @@ class CvStarKeypoint(_object):
     __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, *args): 
+    def __init__(self): 
         """__init__(self) -> CvStarKeypoint"""
-        this = _cv.new_CvStarKeypoint(*args)
+        this = _cv.new_CvStarKeypoint()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvStarKeypoint
@@ -7596,9 +7612,9 @@ class CvStarDetectorParams(_object):
     __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, *args): 
+    def __init__(self): 
         """__init__(self) -> CvStarDetectorParams"""
-        this = _cv.new_CvStarDetectorParams(*args)
+        this = _cv.new_CvStarDetectorParams()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvStarDetectorParams
@@ -7607,16 +7623,18 @@ CvStarDetectorParams_swigregister = _cv.CvStarDetectorParams_swigregister
 CvStarDetectorParams_swigregister(CvStarDetectorParams)
 
 
-def cvStarDetectorParams(*args):
+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
+    cvStarDetectorParams(int maxSize = 45, int responseThreshold = 30, int lineThresholdProjected = 10, 
+        int lineThresholdBinarized = 8, 
+        int suppressNonmaxSize = 5) -> CvStarDetectorParams
     """
-  return _cv.cvStarDetectorParams(*args)
+  return _cv.cvStarDetectorParams(maxSize, responseThreshold, lineThresholdProjected, 
+    lineThresholdBinarized, suppressNonmaxSize)
 
 def cvGetStarKeypoints(*args):
-  """cvGetStarKeypoints(CvArr img, CvMemStorage storage, CvStarDetectorParams params=cvStarDetectorParams()) -> CvSeq"""
+  """cvGetStarKeypoints(CvArr img, CvMemStorage storage, CvStarDetectorParams params = cvStarDetectorParams()) -> CvSeq"""
   return _cv.cvGetStarKeypoints(*args)
 
 def cvLoadHaarClassifierCascade(*args):
@@ -7631,7 +7649,7 @@ 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):
@@ -7655,35 +7673,34 @@ def cvInitUndistortRectifyMap(*args):
 def cvUndistortPoints(*args):
   """
     cvUndistortPoints(CvMat src, CvMat dst, CvMat camera_matrix, CvMat dist_coeffs, 
-        CvMat R=0, CvMat P=0)
+        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, 
-        int method=0, double ransacReprojThreshold=0, 
-        CvMat mask=0) -> int
+    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)
 
@@ -7694,10 +7711,11 @@ def cvCalcMatMulDeriv(*args):
 def cvComposeRT(*args):
   """
     cvComposeRT(CvMat _rvec1, CvMat _tvec1, CvMat _rvec2, CvMat _tvec2, 
-        CvMat _rvec3, CvMat _tvec3, CvMat dr3dr1=0, 
-        CvMat dr3dt1=0, CvMat dr3dr2=0, CvMat dr3dt2=0, 
-        CvMat dt3dr1=0, CvMat dt3dt1=0, CvMat dt3dr2=0, 
-        CvMat dt3dt2=0)
+        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)
 
@@ -7705,9 +7723,10 @@ def cvProjectPoints2(*args):
   """
     cvProjectPoints2(CvMat object_points, CvMat rotation_vector, CvMat translation_vector, 
         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)
+        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)
 
@@ -7715,7 +7734,7 @@ def cvFindExtrinsicCameraParams2(*args):
   """
     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)
 
@@ -7723,12 +7742,12 @@ def cvInitIntrinsicParams2D(*args):
   """
     cvInitIntrinsicParams2D(CvMat object_points, CvMat image_points, CvMat npoints, 
         CvSize image_size, CvMat camera_matrix, 
-        double aspect_ratio=1.)
+        double aspect_ratio = 1.)
     """
   return _cv.cvInitIntrinsicParams2D(*args)
 
 def cvFindChessboardCorners(*args):
-  """cvFindChessboardCorners(void image, CvSize pattern_size, int flags=1+2) -> int"""
+  """cvFindChessboardCorners(void image, CvSize pattern_size, int flags = 1+2) -> int"""
   return _cv.cvFindChessboardCorners(*args)
 
 def cvDrawChessboardCorners(*args):
@@ -7742,19 +7761,19 @@ def cvCalibrateCamera2(*args):
   """
     cvCalibrateCamera2(CvMat object_points, CvMat image_points, CvMat point_counts, 
         CvSize image_size, CvMat camera_matrix, 
-        CvMat distortion_coeffs, CvMat rotation_vectors=None, 
-        CvMat translation_vectors=None, 
-        int flags=0)
+        CvMat distortion_coeffs, CvMat rotation_vectors = None, 
+        CvMat translation_vectors = None, 
+        int flags = 0)
     """
   return _cv.cvCalibrateCamera2(*args)
 
 def cvCalibrationMatrixValues(*args):
   """
-    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)
+    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)
 
@@ -7764,8 +7783,9 @@ def cvStereoCalibrate(*args):
         CvMat npoints, CvMat camera_matrix1, 
         CvMat dist_coeffs1, CvMat camera_matrix2, 
         CvMat dist_coeffs2, CvSize image_size, CvMat R, 
-        CvMat T, CvMat E=0, CvMat F=0, CvTermCriteria term_crit=cvTermCriteria( 1 +2,30,1e-6), 
-        int flags=256)
+        CvMat T, CvMat E = None, CvMat F = None, 
+        CvTermCriteria term_crit = cvTermCriteria( 1 +2,30,1e-6), 
+        int flags = 256)
     """
   return _cv.cvStereoCalibrate(*args)
 
@@ -7774,14 +7794,14 @@ def cvStereoRectify(*args):
     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=0, int flags=1024)
+        CvMat P1, CvMat P2, CvMat Q = None, int flags = 1024)
     """
   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
+        CvMat H1, CvMat H2, double threshold = 5) -> int
     """
   return _cv.cvStereoRectifyUncalibrated(*args)
 
@@ -7812,8 +7832,8 @@ def cvConvertPointsHomogeneous(*args):
 def cvFindFundamentalMat(*args):
   """
     cvFindFundamentalMat(CvMat points1, CvMat points2, CvMat fundamental_matrix, 
-        int method=8, double param1=3., 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)
 
@@ -7892,9 +7912,9 @@ class CvStereoBMState(_object):
     __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, *args): 
+    def __init__(self): 
         """__init__(self) -> CvStereoBMState"""
-        this = _cv.new_CvStereoBMState(*args)
+        this = _cv.new_CvStereoBMState()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvStereoBMState
@@ -7903,9 +7923,9 @@ CvStereoBMState_swigregister = _cv.CvStereoBMState_swigregister
 CvStereoBMState_swigregister(CvStereoBMState)
 
 
-def cvCreateStereoBMState(*args):
-  """cvCreateStereoBMState(int preset=0, int numberOfDisparities=0) -> CvStereoBMState"""
-  return _cv.cvCreateStereoBMState(*args)
+def cvCreateStereoBMState(preset = 0, numberOfDisparities = 0):
+  """cvCreateStereoBMState(int preset = 0, int numberOfDisparities = 0) -> CvStereoBMState"""
+  return _cv.cvCreateStereoBMState(preset, numberOfDisparities)
 
 def cvReleaseStereoBMState(*args):
   """cvReleaseStereoBMState(CvStereoBMState state)"""
@@ -7975,9 +7995,9 @@ class CvStereoGCState(_object):
     __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, *args): 
+    def __init__(self): 
         """__init__(self) -> CvStereoGCState"""
-        this = _cv.new_CvStereoGCState(*args)
+        this = _cv.new_CvStereoGCState()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _cv.delete_CvStereoGCState
@@ -7997,12 +8017,12 @@ def cvReleaseStereoGCState(*args):
 def cvFindStereoCorrespondenceGC(*args):
   """
     cvFindStereoCorrespondenceGC(CvArr left, CvArr right, CvArr disparityLeft, CvArr disparityRight, 
-        CvStereoGCState state, int useDisparityGuess=0)
+        CvStereoGCState state, int useDisparityGuess = 0)
     """
   return _cv.cvFindStereoCorrespondenceGC(*args)
 
 def cvReprojectImageTo3D(*args):
-  """cvReprojectImageTo3D(CvArr disparityImage, CvArr _3dImage, CvMat Q, int handleMissingValues=0)"""
+  """cvReprojectImageTo3D(CvArr disparityImage, CvArr _3dImage, CvMat Q, int handleMissingValues = 0)"""
   return _cv.cvReprojectImageTo3D(*args)
 class CvLSH(_object):
     """Proxy of C++ CvLSH class"""
@@ -8010,7 +8030,7 @@ class CvLSH(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvLSH, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvLSH, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_destroy__ = _cv.delete_CvLSH
     __del__ = lambda self : None;
@@ -8018,7 +8038,7 @@ 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__ = {}
@@ -8027,17 +8047,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
@@ -8046,7 +8066,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__ = {}
@@ -8055,17 +8075,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
@@ -8074,7 +8094,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__ = {}
@@ -8083,17 +8103,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
@@ -8102,7 +8122,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)
@@ -8116,25 +8136,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
@@ -8147,7 +8167,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)
@@ -8161,25 +8181,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
@@ -8192,7 +8212,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)
@@ -8206,25 +8226,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
@@ -8237,7 +8257,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)
@@ -8251,25 +8271,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
@@ -8282,7 +8302,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)
@@ -8296,25 +8316,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
@@ -8327,7 +8347,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)
@@ -8341,25 +8361,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
@@ -8372,7 +8392,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)
@@ -8386,25 +8406,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
@@ -8417,7 +8437,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)
@@ -8431,25 +8451,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
@@ -8462,7 +8482,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)
@@ -8476,25 +8496,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
@@ -8510,21 +8530,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
@@ -8561,6 +8581,30 @@ cvDrawCircle=cvCircle
 cvDrawEllipse=cvEllipse
 cvDrawPolyLine=cvPolyLine
 CV_FONT_VECTOR0=CV_FONT_HERSHEY_SIMPLEX
+CV_RGB2RGBA=CV_BGR2BGRA
+CV_RGBA2RGB=CV_BGRA2BGR
+CV_RGB2BGRA=CV_BGR2RGBA
+CV_BGRA2RGB=CV_RGBA2BGR
+CV_RGB2BGR=CV_BGR2RGB
+CV_RGBA2BGRA=CV_BGRA2RGBA
+CV_GRAY2RGB=CV_GRAY2BGR
+CV_GRAY2RGBA=CV_GRAY2BGRA
+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
index ecbb2034990e0c24b10bc998a97daafebf0b0200..19eeb113bea5370ddc28d946122442df136d5189 100644 (file)
@@ -1,4 +1,61 @@
-/** This file was automatically generated using util/extract_aliases.py script */
-%module cv
-%pythoncode %{
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+/*M// 
+// This file contains custom python-based aliases for some methods where
+// an autogenerated wrapper was unusable or missing.
+//M*/
+
+// This macro removes the wrapper for the function from_name, and creates 
+// an alias to to_name, so calling from_name() will invoke to_name()
+%define %myalias(from_name, to_name)
+%ignore from_name;
+%pythoncode%{
+from_name = to_name;
 %}
+%enddef
+
+// Map functions using IplImage ** argument to CvArr ** function instead
+%myalias(cvCalcBackProject, cvCalcArrBackProject);
+%myalias(cvCalcBackProjectPatch, cvCalcArrBackProjectPatch);
+%myalias(cvCalcImageHist, cvCalcArrHist);
+%myalias(cvCalcHist, cvCalcArrHist);
+
index e3c0f3b5f78d93cb770b7d6bdcbecbe39cb2615b..4f7b764028d860770ce09c24a914ea92f186ac20 100644 (file)
@@ -37,4 +37,20 @@ cvDrawCircle=cvCircle
 cvDrawEllipse=cvEllipse
 cvDrawPolyLine=cvPolyLine
 CV_FONT_VECTOR0=CV_FONT_HERSHEY_SIMPLEX
+CV_RGB2RGBA=CV_BGR2BGRA
+CV_RGBA2RGB=CV_BGRA2BGR
+CV_RGB2BGRA=CV_BGR2RGBA
+CV_BGRA2RGB=CV_RGBA2BGR
+CV_RGB2BGR=CV_BGR2RGB
+CV_RGBA2BGRA=CV_BGRA2RGBA
+CV_GRAY2RGB=CV_GRAY2BGR
+CV_GRAY2RGBA=CV_GRAY2BGRA
+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
 %}
index 693e910e2a620d5148ef259b457fae84abb9741a..d60e4dd382a4fc0b1f192182449cfd7d1e5b1803 100644 (file)
@@ -1,12 +1,32 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.31
+# Version 1.3.39
 #
-# 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 _highgui
-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('_highgui', [dirname(__file__)])
+        except ImportError:
+            import _highgui
+            return _highgui
+        if fp is not None:
+            try:
+                _mod = imp.load_module('_highgui', fp, pathname, description)
+            finally:
+                fp.close()
+                return _mod
+    _highgui = swig_import_helper()
+    del swig_import_helper
+else:
+    import _highgui
+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):
@@ -58,10 +76,10 @@ class CvRNG_Wrapper(_object):
         this = _highgui.new_CvRNG_Wrapper(*args)
         try: self.this.append(this)
         except: self.this = this
-    def ptr(*args): return _highgui.CvRNG_Wrapper_ptr(*args)
-    def ref(*args): return _highgui.CvRNG_Wrapper_ref(*args)
-    def __eq__(*args): return _highgui.CvRNG_Wrapper___eq__(*args)
-    def __ne__(*args): return _highgui.CvRNG_Wrapper___ne__(*args)
+    def ptr(self): return _highgui.CvRNG_Wrapper_ptr(self)
+    def ref(self): return _highgui.CvRNG_Wrapper_ref(self)
+    def __eq__(self, *args): return _highgui.CvRNG_Wrapper___eq__(self, *args)
+    def __ne__(self, *args): return _highgui.CvRNG_Wrapper___ne__(self, *args)
     __swig_destroy__ = _highgui.delete_CvRNG_Wrapper
     __del__ = lambda self : None;
 CvRNG_Wrapper_swigregister = _highgui.CvRNG_Wrapper_swigregister
@@ -77,10 +95,10 @@ class CvSubdiv2DEdge_Wrapper(_object):
         this = _highgui.new_CvSubdiv2DEdge_Wrapper(*args)
         try: self.this.append(this)
         except: self.this = this
-    def ptr(*args): return _highgui.CvSubdiv2DEdge_Wrapper_ptr(*args)
-    def ref(*args): return _highgui.CvSubdiv2DEdge_Wrapper_ref(*args)
-    def __eq__(*args): return _highgui.CvSubdiv2DEdge_Wrapper___eq__(*args)
-    def __ne__(*args): return _highgui.CvSubdiv2DEdge_Wrapper___ne__(*args)
+    def ptr(self): return _highgui.CvSubdiv2DEdge_Wrapper_ptr(self)
+    def ref(self): return _highgui.CvSubdiv2DEdge_Wrapper_ref(self)
+    def __eq__(self, *args): return _highgui.CvSubdiv2DEdge_Wrapper___eq__(self, *args)
+    def __ne__(self, *args): return _highgui.CvSubdiv2DEdge_Wrapper___ne__(self, *args)
     __swig_destroy__ = _highgui.delete_CvSubdiv2DEdge_Wrapper
     __del__ = lambda self : None;
 CvSubdiv2DEdge_Wrapper_swigregister = _highgui.CvSubdiv2DEdge_Wrapper_swigregister
@@ -103,13 +121,13 @@ def cvInitSystem(*args):
   """cvInitSystem(int argc, char argv) -> int"""
   return _highgui.cvInitSystem(*args)
 
-def cvStartWindowThread(*args):
+def cvStartWindowThread():
   """cvStartWindowThread() -> int"""
-  return _highgui.cvStartWindowThread(*args)
+  return _highgui.cvStartWindowThread()
 CV_WINDOW_AUTOSIZE = _highgui.CV_WINDOW_AUTOSIZE
 
 def cvNamedWindow(*args):
-  """cvNamedWindow(char name, int flags=1) -> int"""
+  """cvNamedWindow(char name, int flags = 1) -> int"""
   return _highgui.cvNamedWindow(*args)
 
 def cvShowImage(*args):
@@ -128,9 +146,9 @@ def cvDestroyWindow(*args):
   """cvDestroyWindow(char name)"""
   return _highgui.cvDestroyWindow(*args)
 
-def cvDestroyAllWindows(*args):
+def cvDestroyAllWindows():
   """cvDestroyAllWindows()"""
-  return _highgui.cvDestroyAllWindows(*args)
+  return _highgui.cvDestroyAllWindows()
 
 def cvGetWindowHandle(*args):
   """cvGetWindowHandle(char name) -> void"""
@@ -147,6 +165,13 @@ def cvCreateTrackbar(*args):
     """
   return _highgui.cvCreateTrackbar(*args)
 
+def cvCreateTrackbar2(*args):
+  """
+    cvCreateTrackbar2(char trackbar_name, char window_name, int value, int count, 
+        CvTrackbarCallback2 on_change, void userdata = None) -> int
+    """
+  return _highgui.cvCreateTrackbar2(*args)
+
 def cvGetTrackbarPos(*args):
   """cvGetTrackbarPos(char trackbar_name, char window_name) -> int"""
   return _highgui.cvGetTrackbarPos(*args)
@@ -172,7 +197,7 @@ CV_EVENT_FLAG_SHIFTKEY = _highgui.CV_EVENT_FLAG_SHIFTKEY
 CV_EVENT_FLAG_ALTKEY = _highgui.CV_EVENT_FLAG_ALTKEY
 
 def cvSetMouseCallbackOld(*args):
-  """cvSetMouseCallbackOld(char window_name, CvMouseCallback on_mouse, void param=None)"""
+  """cvSetMouseCallbackOld(char window_name, CvMouseCallback on_mouse, void param = None)"""
   return _highgui.cvSetMouseCallbackOld(*args)
 CV_LOAD_IMAGE_UNCHANGED = _highgui.CV_LOAD_IMAGE_UNCHANGED
 CV_LOAD_IMAGE_GRAYSCALE = _highgui.CV_LOAD_IMAGE_GRAYSCALE
@@ -181,37 +206,37 @@ CV_LOAD_IMAGE_ANYDEPTH = _highgui.CV_LOAD_IMAGE_ANYDEPTH
 CV_LOAD_IMAGE_ANYCOLOR = _highgui.CV_LOAD_IMAGE_ANYCOLOR
 
 def cvLoadImageM(*args):
-  """cvLoadImageM(char filename, int iscolor=1) -> CvMat"""
+  """cvLoadImageM(char filename, int iscolor = 1) -> CvMat"""
   return _highgui.cvLoadImageM(*args)
 CV_IMWRITE_JPEG_QUALITY = _highgui.CV_IMWRITE_JPEG_QUALITY
 CV_IMWRITE_PNG_COMPRESSION = _highgui.CV_IMWRITE_PNG_COMPRESSION
 CV_IMWRITE_PXM_BINARY = _highgui.CV_IMWRITE_PXM_BINARY
 
 def cvSaveImage(*args):
-  """cvSaveImage(char filename, CvArr image, int params=0) -> int"""
+  """cvSaveImage(char filename, CvArr image, int params = None) -> int"""
   return _highgui.cvSaveImage(*args)
 
 def cvDecodeImage(*args):
-  """cvDecodeImage(CvMat buf, int iscolor=1)"""
+  """cvDecodeImage(CvMat buf, int iscolor = 1)"""
   return _highgui.cvDecodeImage(*args)
 
 def cvDecodeImageM(*args):
-  """cvDecodeImageM(CvMat buf, int iscolor=1) -> CvMat"""
+  """cvDecodeImageM(CvMat buf, int iscolor = 1) -> CvMat"""
   return _highgui.cvDecodeImageM(*args)
 
 def cvEncodeImage(*args):
-  """cvEncodeImage(char ext, CvArr image, int params=0) -> CvMat"""
+  """cvEncodeImage(char ext, CvArr image, int params = None) -> CvMat"""
   return _highgui.cvEncodeImage(*args)
 CV_CVTIMG_FLIP = _highgui.CV_CVTIMG_FLIP
 CV_CVTIMG_SWAP_RB = _highgui.CV_CVTIMG_SWAP_RB
 
 def cvConvertImage(*args):
-  """cvConvertImage(CvArr src, CvArr dst, int flags=0)"""
+  """cvConvertImage(CvArr src, CvArr dst, int flags = 0)"""
   return _highgui.cvConvertImage(*args)
 
-def cvWaitKeyC(*args):
-  """cvWaitKeyC(int delay=0) -> int"""
-  return _highgui.cvWaitKeyC(*args)
+def cvWaitKeyC(delay = 0):
+  """cvWaitKeyC(int delay = 0) -> int"""
+  return _highgui.cvWaitKeyC(delay)
 
 def cvCreateFileCapture(*args):
   """cvCreateFileCapture(char filename) -> CvCapture"""
@@ -245,7 +270,7 @@ def cvGrabFrame(*args):
   return _highgui.cvGrabFrame(*args)
 
 def cvRetrieveFrame__Deprecated(*args):
-  """cvRetrieveFrame__Deprecated(CvCapture capture, int streamIdx=0)"""
+  """cvRetrieveFrame__Deprecated(CvCapture capture, int streamIdx = 0)"""
   return _highgui.cvRetrieveFrame__Deprecated(*args)
 
 def cvQueryFrame__Deprecated(*args):
@@ -279,6 +304,10 @@ def cvSetCaptureProperty(*args):
   """cvSetCaptureProperty(CvCapture capture, int property_id, double value) -> int"""
   return _highgui.cvSetCaptureProperty(*args)
 
+def cvGetCaptureDomain(*args):
+  """cvGetCaptureDomain(CvCapture capture) -> int"""
+  return _highgui.cvGetCaptureDomain(*args)
+
 def CV_FOURCC(*args):
   """CV_FOURCC(char c1, char c2, char c3, char c4) -> int"""
   return _highgui.CV_FOURCC(*args)
@@ -287,7 +316,7 @@ CV_FOURCC_PROMPT = _highgui.CV_FOURCC_PROMPT
 def cvCreateVideoWriter(*args):
   """
     cvCreateVideoWriter(char filename, int fourcc, double fps, CvSize frame_size, 
-        int is_color=1) -> CvVideoWriter
+        int is_color = 1) -> CvVideoWriter
     """
   return _highgui.cvCreateVideoWriter(*args)
 
@@ -302,80 +331,86 @@ class CvvImage(_object):
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvvImage, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
+    def __init__(self): 
         """__init__(self) -> CvvImage"""
-        this = _highgui.new_CvvImage(*args)
+        this = _highgui.new_CvvImage()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _highgui.delete_CvvImage
     __del__ = lambda self : None;
-    def Create(*args):
+    def Create(self, *args):
         """
-        Create(self, int width, int height, int bits_per_pixel, int image_origin=0) -> bool
+        Create(self, int width, int height, int bits_per_pixel, int image_origin = 0) -> bool
         Create(self, int width, int height, int bits_per_pixel) -> bool
         """
-        return _highgui.CvvImage_Create(*args)
+        return _highgui.CvvImage_Create(self, *args)
 
-    def Load(*args):
+    def Load(self, *args):
         """
-        Load(self, char filename, int desired_color=1) -> bool
+        Load(self, char filename, int desired_color = 1) -> bool
         Load(self, char filename) -> bool
         """
-        return _highgui.CvvImage_Load(*args)
+        return _highgui.CvvImage_Load(self, *args)
 
-    def LoadRect(*args):
+    def LoadRect(self, *args):
         """LoadRect(self, char filename, int desired_color, CvRect r) -> bool"""
-        return _highgui.CvvImage_LoadRect(*args)
+        return _highgui.CvvImage_LoadRect(self, *args)
 
-    def Save(*args):
+    def Save(self, *args):
         """Save(self, char filename) -> bool"""
-        return _highgui.CvvImage_Save(*args)
+        return _highgui.CvvImage_Save(self, *args)
 
-    def CopyOf(*args):
+    def CopyOf(self, *args):
         """
-        CopyOf(self, CvvImage image, int desired_color=-1)
+        CopyOf(self, CvvImage image, int desired_color = -1)
         CopyOf(self, CvvImage image)
-        CopyOf(self,  img, int desired_color=-1)
+        CopyOf(self,  img, int desired_color = -1)
         CopyOf(self,  img)
         """
-        return _highgui.CvvImage_CopyOf(*args)
+        return _highgui.CvvImage_CopyOf(self, *args)
 
-    def GetImage(*args):
+    def GetImage(self):
         """GetImage(self)"""
-        return _highgui.CvvImage_GetImage(*args)
+        return _highgui.CvvImage_GetImage(self)
 
-    def Destroy(*args):
+    def Destroy(self):
         """Destroy(self)"""
-        return _highgui.CvvImage_Destroy(*args)
+        return _highgui.CvvImage_Destroy(self)
 
-    def Width(*args):
+    def Width(self):
         """Width(self) -> int"""
-        return _highgui.CvvImage_Width(*args)
+        return _highgui.CvvImage_Width(self)
 
-    def Height(*args):
+    def Height(self):
         """Height(self) -> int"""
-        return _highgui.CvvImage_Height(*args)
+        return _highgui.CvvImage_Height(self)
 
-    def Bpp(*args):
+    def Bpp(self):
         """Bpp(self) -> int"""
-        return _highgui.CvvImage_Bpp(*args)
+        return _highgui.CvvImage_Bpp(self)
 
-    def Fill(*args):
+    def Fill(self, *args):
         """Fill(self, int color)"""
-        return _highgui.CvvImage_Fill(*args)
+        return _highgui.CvvImage_Fill(self, *args)
 
-    def Show(*args):
+    def Show(self, *args):
         """Show(self, char window)"""
-        return _highgui.CvvImage_Show(*args)
+        return _highgui.CvvImage_Show(self, *args)
 
 CvvImage_swigregister = _highgui.CvvImage_swigregister
 CvvImage_swigregister(CvvImage)
+
+def cvSetMouseCallback(*args):
+  return _highgui.cvSetMouseCallback(*args)
 cvSetMouseCallback = _highgui.cvSetMouseCallback
+
+def cvWaitKey(delay = 0):
+  return _highgui.cvWaitKey(delay)
 cvWaitKey = _highgui.cvWaitKey
 
 def cvLoadImage(*args):
   """
-    cvLoadImage(char filename, int iscolor=1) -> CvMat
+    cvLoadImage(char filename, int iscolor = 1) -> CvMat
     cvLoadImage(char filename) -> CvMat
     """
   return _highgui.cvLoadImage(*args)
@@ -386,7 +421,7 @@ class CvCapture(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvCapture, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvCapture, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_destroy__ = _highgui.delete_CvCapture
     __del__ = lambda self : None;
@@ -399,7 +434,7 @@ class CvVideoWriter(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CvVideoWriter, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvVideoWriter, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     __swig_destroy__ = _highgui.delete_CvVideoWriter
     __del__ = lambda self : None;
index 7a7f059eca5e7d550cba6eeb15a980d759d91c19..c06f047ca93724be61d93dfdc04f88a4561342ec 100644 (file)
@@ -1,12 +1,32 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.31
+# Version 1.3.39
 #
-# 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 _ml
-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('_ml', [dirname(__file__)])
+        except ImportError:
+            import _ml
+            return _ml
+        if fp is not None:
+            try:
+                _mod = imp.load_module('_ml', fp, pathname, description)
+            finally:
+                fp.close()
+                return _mod
+    _ml = swig_import_helper()
+    del swig_import_helper
+else:
+    import _ml
+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):
@@ -58,10 +76,10 @@ class CvRNG_Wrapper(_object):
         this = _ml.new_CvRNG_Wrapper(*args)
         try: self.this.append(this)
         except: self.this = this
-    def ptr(*args): return _ml.CvRNG_Wrapper_ptr(*args)
-    def ref(*args): return _ml.CvRNG_Wrapper_ref(*args)
-    def __eq__(*args): return _ml.CvRNG_Wrapper___eq__(*args)
-    def __ne__(*args): return _ml.CvRNG_Wrapper___ne__(*args)
+    def ptr(self): return _ml.CvRNG_Wrapper_ptr(self)
+    def ref(self): return _ml.CvRNG_Wrapper_ref(self)
+    def __eq__(self, *args): return _ml.CvRNG_Wrapper___eq__(self, *args)
+    def __ne__(self, *args): return _ml.CvRNG_Wrapper___ne__(self, *args)
     __swig_destroy__ = _ml.delete_CvRNG_Wrapper
     __del__ = lambda self : None;
 CvRNG_Wrapper_swigregister = _ml.CvRNG_Wrapper_swigregister
@@ -77,10 +95,10 @@ class CvSubdiv2DEdge_Wrapper(_object):
         this = _ml.new_CvSubdiv2DEdge_Wrapper(*args)
         try: self.this.append(this)
         except: self.this = this
-    def ptr(*args): return _ml.CvSubdiv2DEdge_Wrapper_ptr(*args)
-    def ref(*args): return _ml.CvSubdiv2DEdge_Wrapper_ref(*args)
-    def __eq__(*args): return _ml.CvSubdiv2DEdge_Wrapper___eq__(*args)
-    def __ne__(*args): return _ml.CvSubdiv2DEdge_Wrapper___ne__(*args)
+    def ptr(self): return _ml.CvSubdiv2DEdge_Wrapper_ptr(self)
+    def ref(self): return _ml.CvSubdiv2DEdge_Wrapper_ref(self)
+    def __eq__(self, *args): return _ml.CvSubdiv2DEdge_Wrapper___eq__(self, *args)
+    def __ne__(self, *args): return _ml.CvSubdiv2DEdge_Wrapper___ne__(self, *args)
     __swig_destroy__ = _ml.delete_CvSubdiv2DEdge_Wrapper
     __del__ = lambda self : None;
 CvSubdiv2DEdge_Wrapper_swigregister = _ml.CvSubdiv2DEdge_Wrapper_swigregister
@@ -127,8 +145,8 @@ class CvVectors(_object):
     if _newclass:next = _swig_property(_ml.CvVectors_next_get, _ml.CvVectors_next_set)
     __swig_getmethods__["data"] = _ml.CvVectors_data_get
     if _newclass:data = _swig_property(_ml.CvVectors_data_get)
-    def __init__(self, *args): 
-        this = _ml.new_CvVectors(*args)
+    def __init__(self): 
+        this = _ml.new_CvVectors()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvVectors
@@ -151,8 +169,8 @@ class CvVectors_data(_object):
     __swig_setmethods__["db"] = _ml.CvVectors_data_db_set
     __swig_getmethods__["db"] = _ml.CvVectors_data_db_get
     if _newclass:db = _swig_property(_ml.CvVectors_data_db_get, _ml.CvVectors_data_db_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvVectors_data(*args)
+    def __init__(self): 
+        this = _ml.new_CvVectors_data()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvVectors_data
@@ -180,17 +198,17 @@ class CvStatModel(_object):
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvStatModel, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _ml.new_CvStatModel(*args)
+    def __init__(self): 
+        this = _ml.new_CvStatModel()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvStatModel
     __del__ = lambda self : None;
-    def clear(*args): return _ml.CvStatModel_clear(*args)
-    def save(*args): return _ml.CvStatModel_save(*args)
-    def load(*args): return _ml.CvStatModel_load(*args)
-    def write(*args): return _ml.CvStatModel_write(*args)
-    def read(*args): return _ml.CvStatModel_read(*args)
+    def clear(self): return _ml.CvStatModel_clear(self)
+    def save(self, *args): return _ml.CvStatModel_save(self, *args)
+    def load(self, *args): return _ml.CvStatModel_load(self, *args)
+    def write(self, *args): return _ml.CvStatModel_write(self, *args)
+    def read(self, *args): return _ml.CvStatModel_read(self, *args)
 CvStatModel_swigregister = _ml.CvStatModel_swigregister
 CvStatModel_swigregister(CvStatModel)
 
@@ -210,7 +228,7 @@ class CvParamGrid(_object):
         this = _ml.new_CvParamGrid(*args)
         try: self.this.append(this)
         except: self.this = this
-    def check(*args): return _ml.CvParamGrid_check(*args)
+    def check(self): return _ml.CvParamGrid_check(self)
     __swig_setmethods__["min_val"] = _ml.CvParamGrid_min_val_set
     __swig_getmethods__["min_val"] = _ml.CvParamGrid_min_val_get
     if _newclass:min_val = _swig_property(_ml.CvParamGrid_min_val_get, _ml.CvParamGrid_min_val_set)
@@ -239,11 +257,11 @@ class CvNormalBayesClassifier(CvStatModel):
         this = _ml.new_CvNormalBayesClassifier(*args)
         try: self.this.append(this)
         except: self.this = this
-    def train(*args): return _ml.CvNormalBayesClassifier_train(*args)
-    def predict(*args): return _ml.CvNormalBayesClassifier_predict(*args)
-    def clear(*args): return _ml.CvNormalBayesClassifier_clear(*args)
-    def write(*args): return _ml.CvNormalBayesClassifier_write(*args)
-    def read(*args): return _ml.CvNormalBayesClassifier_read(*args)
+    def train(self, *args): return _ml.CvNormalBayesClassifier_train(self, *args)
+    def predict(self, *args): return _ml.CvNormalBayesClassifier_predict(self, *args)
+    def clear(self): return _ml.CvNormalBayesClassifier_clear(self)
+    def write(self, *args): return _ml.CvNormalBayesClassifier_write(self, *args)
+    def read(self, *args): return _ml.CvNormalBayesClassifier_read(self, *args)
 CvNormalBayesClassifier_swigregister = _ml.CvNormalBayesClassifier_swigregister
 CvNormalBayesClassifier_swigregister(CvNormalBayesClassifier)
 
@@ -261,13 +279,13 @@ class CvKNearest(CvStatModel):
         this = _ml.new_CvKNearest(*args)
         try: self.this.append(this)
         except: self.this = this
-    def train(*args): return _ml.CvKNearest_train(*args)
-    def find_nearest(*args): return _ml.CvKNearest_find_nearest(*args)
-    def clear(*args): return _ml.CvKNearest_clear(*args)
-    def get_max_k(*args): return _ml.CvKNearest_get_max_k(*args)
-    def get_var_count(*args): return _ml.CvKNearest_get_var_count(*args)
-    def get_sample_count(*args): return _ml.CvKNearest_get_sample_count(*args)
-    def is_regression(*args): return _ml.CvKNearest_is_regression(*args)
+    def train(self, *args): return _ml.CvKNearest_train(self, *args)
+    def find_nearest(self, *args): return _ml.CvKNearest_find_nearest(self, *args)
+    def clear(self): return _ml.CvKNearest_clear(self)
+    def get_max_k(self): return _ml.CvKNearest_get_max_k(self)
+    def get_var_count(self): return _ml.CvKNearest_get_var_count(self)
+    def get_sample_count(self): return _ml.CvKNearest_get_sample_count(self)
+    def is_regression(self): return _ml.CvKNearest_is_regression(self)
 CvKNearest_swigregister = _ml.CvKNearest_swigregister
 CvKNearest_swigregister(CvKNearest)
 
@@ -326,22 +344,22 @@ class CvSVMKernel(_object):
         this = _ml.new_CvSVMKernel(*args)
         try: self.this.append(this)
         except: self.this = this
-    def create(*args): return _ml.CvSVMKernel_create(*args)
+    def create(self, *args): return _ml.CvSVMKernel_create(self, *args)
     __swig_destroy__ = _ml.delete_CvSVMKernel
     __del__ = lambda self : None;
-    def clear(*args): return _ml.CvSVMKernel_clear(*args)
-    def calc(*args): return _ml.CvSVMKernel_calc(*args)
+    def clear(self): return _ml.CvSVMKernel_clear(self)
+    def calc(self, *args): return _ml.CvSVMKernel_calc(self, *args)
     __swig_setmethods__["params"] = _ml.CvSVMKernel_params_set
     __swig_getmethods__["params"] = _ml.CvSVMKernel_params_get
     if _newclass:params = _swig_property(_ml.CvSVMKernel_params_get, _ml.CvSVMKernel_params_set)
     __swig_setmethods__["calc_func"] = _ml.CvSVMKernel_calc_func_set
     __swig_getmethods__["calc_func"] = _ml.CvSVMKernel_calc_func_get
     if _newclass:calc_func = _swig_property(_ml.CvSVMKernel_calc_func_get, _ml.CvSVMKernel_calc_func_set)
-    def calc_non_rbf_base(*args): return _ml.CvSVMKernel_calc_non_rbf_base(*args)
-    def calc_linear(*args): return _ml.CvSVMKernel_calc_linear(*args)
-    def calc_rbf(*args): return _ml.CvSVMKernel_calc_rbf(*args)
-    def calc_poly(*args): return _ml.CvSVMKernel_calc_poly(*args)
-    def calc_sigmoid(*args): return _ml.CvSVMKernel_calc_sigmoid(*args)
+    def calc_non_rbf_base(self, *args): return _ml.CvSVMKernel_calc_non_rbf_base(self, *args)
+    def calc_linear(self, *args): return _ml.CvSVMKernel_calc_linear(self, *args)
+    def calc_rbf(self, *args): return _ml.CvSVMKernel_calc_rbf(self, *args)
+    def calc_poly(self, *args): return _ml.CvSVMKernel_calc_poly(self, *args)
+    def calc_sigmoid(self, *args): return _ml.CvSVMKernel_calc_sigmoid(self, *args)
 CvSVMKernel_swigregister = _ml.CvSVMKernel_swigregister
 CvSVMKernel_swigregister(CvSVMKernel)
 
@@ -360,8 +378,8 @@ class CvSVMKernelRow(_object):
     __swig_setmethods__["data"] = _ml.CvSVMKernelRow_data_set
     __swig_getmethods__["data"] = _ml.CvSVMKernelRow_data_get
     if _newclass:data = _swig_property(_ml.CvSVMKernelRow_data_get, _ml.CvSVMKernelRow_data_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvSVMKernelRow(*args)
+    def __init__(self): 
+        this = _ml.new_CvSVMKernelRow()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvSVMKernelRow
@@ -390,8 +408,8 @@ class CvSVMSolutionInfo(_object):
     __swig_setmethods__["r"] = _ml.CvSVMSolutionInfo_r_set
     __swig_getmethods__["r"] = _ml.CvSVMSolutionInfo_r_get
     if _newclass:r = _swig_property(_ml.CvSVMSolutionInfo_r_get, _ml.CvSVMSolutionInfo_r_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvSVMSolutionInfo(*args)
+    def __init__(self): 
+        this = _ml.new_CvSVMSolutionInfo()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvSVMSolutionInfo
@@ -409,18 +427,18 @@ class CvSVMSolver(_object):
         this = _ml.new_CvSVMSolver(*args)
         try: self.this.append(this)
         except: self.this = this
-    def create(*args): return _ml.CvSVMSolver_create(*args)
+    def create(self, *args): return _ml.CvSVMSolver_create(self, *args)
     __swig_destroy__ = _ml.delete_CvSVMSolver
     __del__ = lambda self : None;
-    def clear(*args): return _ml.CvSVMSolver_clear(*args)
-    def solve_generic(*args): return _ml.CvSVMSolver_solve_generic(*args)
-    def solve_c_svc(*args): return _ml.CvSVMSolver_solve_c_svc(*args)
-    def solve_nu_svc(*args): return _ml.CvSVMSolver_solve_nu_svc(*args)
-    def solve_one_class(*args): return _ml.CvSVMSolver_solve_one_class(*args)
-    def solve_eps_svr(*args): return _ml.CvSVMSolver_solve_eps_svr(*args)
-    def solve_nu_svr(*args): return _ml.CvSVMSolver_solve_nu_svr(*args)
-    def get_row_base(*args): return _ml.CvSVMSolver_get_row_base(*args)
-    def get_row(*args): return _ml.CvSVMSolver_get_row(*args)
+    def clear(self): return _ml.CvSVMSolver_clear(self)
+    def solve_generic(self, *args): return _ml.CvSVMSolver_solve_generic(self, *args)
+    def solve_c_svc(self, *args): return _ml.CvSVMSolver_solve_c_svc(self, *args)
+    def solve_nu_svc(self, *args): return _ml.CvSVMSolver_solve_nu_svc(self, *args)
+    def solve_one_class(self, *args): return _ml.CvSVMSolver_solve_one_class(self, *args)
+    def solve_eps_svr(self, *args): return _ml.CvSVMSolver_solve_eps_svr(self, *args)
+    def solve_nu_svr(self, *args): return _ml.CvSVMSolver_solve_nu_svr(self, *args)
+    def get_row_base(self, *args): return _ml.CvSVMSolver_get_row_base(self, *args)
+    def get_row(self, *args): return _ml.CvSVMSolver_get_row(self, *args)
     __swig_setmethods__["sample_count"] = _ml.CvSVMSolver_sample_count_set
     __swig_getmethods__["sample_count"] = _ml.CvSVMSolver_sample_count_get
     if _newclass:sample_count = _swig_property(_ml.CvSVMSolver_sample_count_get, _ml.CvSVMSolver_sample_count_set)
@@ -490,13 +508,13 @@ class CvSVMSolver(_object):
     __swig_setmethods__["get_row_func"] = _ml.CvSVMSolver_get_row_func_set
     __swig_getmethods__["get_row_func"] = _ml.CvSVMSolver_get_row_func_get
     if _newclass:get_row_func = _swig_property(_ml.CvSVMSolver_get_row_func_get, _ml.CvSVMSolver_get_row_func_set)
-    def select_working_set(*args): return _ml.CvSVMSolver_select_working_set(*args)
-    def select_working_set_nu_svm(*args): return _ml.CvSVMSolver_select_working_set_nu_svm(*args)
-    def calc_rho(*args): return _ml.CvSVMSolver_calc_rho(*args)
-    def calc_rho_nu_svm(*args): return _ml.CvSVMSolver_calc_rho_nu_svm(*args)
-    def get_row_svc(*args): return _ml.CvSVMSolver_get_row_svc(*args)
-    def get_row_one_class(*args): return _ml.CvSVMSolver_get_row_one_class(*args)
-    def get_row_svr(*args): return _ml.CvSVMSolver_get_row_svr(*args)
+    def select_working_set(self, *args): return _ml.CvSVMSolver_select_working_set(self, *args)
+    def select_working_set_nu_svm(self, *args): return _ml.CvSVMSolver_select_working_set_nu_svm(self, *args)
+    def calc_rho(self, *args): return _ml.CvSVMSolver_calc_rho(self, *args)
+    def calc_rho_nu_svm(self, *args): return _ml.CvSVMSolver_calc_rho_nu_svm(self, *args)
+    def get_row_svc(self, *args): return _ml.CvSVMSolver_get_row_svc(self, *args)
+    def get_row_one_class(self, *args): return _ml.CvSVMSolver_get_row_one_class(self, *args)
+    def get_row_svr(self, *args): return _ml.CvSVMSolver_get_row_svr(self, *args)
 CvSVMSolver_swigregister = _ml.CvSVMSolver_swigregister
 CvSVMSolver_swigregister(CvSVMSolver)
 
@@ -518,8 +536,8 @@ class CvSVMDecisionFunc(_object):
     __swig_setmethods__["sv_index"] = _ml.CvSVMDecisionFunc_sv_index_set
     __swig_getmethods__["sv_index"] = _ml.CvSVMDecisionFunc_sv_index_get
     if _newclass:sv_index = _swig_property(_ml.CvSVMDecisionFunc_sv_index_get, _ml.CvSVMDecisionFunc_sv_index_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvSVMDecisionFunc(*args)
+    def __init__(self): 
+        this = _ml.new_CvSVMDecisionFunc()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvSVMDecisionFunc
@@ -556,20 +574,23 @@ class CvSVM(CvStatModel):
         this = _ml.new_CvSVM(*args)
         try: self.this.append(this)
         except: self.this = this
-    def train(*args): return _ml.CvSVM_train(*args)
-    def train_auto(*args): return _ml.CvSVM_train_auto(*args)
-    def predict(*args): return _ml.CvSVM_predict(*args)
-    def get_support_vector_count(*args): return _ml.CvSVM_get_support_vector_count(*args)
-    def get_support_vector(*args): return _ml.CvSVM_get_support_vector(*args)
-    def get_params(*args): return _ml.CvSVM_get_params(*args)
-    def clear(*args): return _ml.CvSVM_clear(*args)
+    def train(self, *args): return _ml.CvSVM_train(self, *args)
+    def train_auto(self, *args): return _ml.CvSVM_train_auto(self, *args)
+    def predict(self, *args): return _ml.CvSVM_predict(self, *args)
+    def get_support_vector_count(self): return _ml.CvSVM_get_support_vector_count(self)
+    def get_support_vector(self, *args): return _ml.CvSVM_get_support_vector(self, *args)
+    def get_params(self): return _ml.CvSVM_get_params(self)
+    def clear(self): return _ml.CvSVM_clear(self)
     __swig_getmethods__["get_default_grid"] = lambda x: _ml.CvSVM_get_default_grid
     if _newclass:get_default_grid = staticmethod(_ml.CvSVM_get_default_grid)
-    def write(*args): return _ml.CvSVM_write(*args)
-    def read(*args): return _ml.CvSVM_read(*args)
-    def get_var_count(*args): return _ml.CvSVM_get_var_count(*args)
+    def write(self, *args): return _ml.CvSVM_write(self, *args)
+    def read(self, *args): return _ml.CvSVM_read(self, *args)
+    def get_var_count(self): return _ml.CvSVM_get_var_count(self)
 CvSVM_swigregister = _ml.CvSVM_swigregister
 CvSVM_swigregister(CvSVM)
+
+def CvSVM_get_default_grid(*args):
+  return _ml.CvSVM_get_default_grid(*args)
 CvSVM_get_default_grid = _ml.CvSVM_get_default_grid
 
 class CvEMParams(_object):
@@ -631,15 +652,15 @@ class CvEM(CvStatModel):
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvEM
     __del__ = lambda self : None;
-    def train(*args): return _ml.CvEM_train(*args)
-    def predict(*args): return _ml.CvEM_predict(*args)
-    def clear(*args): return _ml.CvEM_clear(*args)
-    def get_nclusters(*args): return _ml.CvEM_get_nclusters(*args)
-    def get_means(*args): return _ml.CvEM_get_means(*args)
-    def get_weights(*args): return _ml.CvEM_get_weights(*args)
-    def get_probs(*args): return _ml.CvEM_get_probs(*args)
-    def get_log_likelihood(*args): return _ml.CvEM_get_log_likelihood(*args)
-    def get_covs(*args): return _ml.CvEM_get_covs(*args)
+    def train(self, *args): return _ml.CvEM_train(self, *args)
+    def predict(self, *args): return _ml.CvEM_predict(self, *args)
+    def clear(self): return _ml.CvEM_clear(self)
+    def get_nclusters(self): return _ml.CvEM_get_nclusters(self)
+    def get_means(self): return _ml.CvEM_get_means(self)
+    def get_weights(self): return _ml.CvEM_get_weights(self)
+    def get_probs(self): return _ml.CvEM_get_probs(self)
+    def get_log_likelihood(self): return _ml.CvEM_get_log_likelihood(self)
+    def get_covs(self): return _ml.CvEM_get_covs(self)
 CvEM_swigregister = _ml.CvEM_swigregister
 CvEM_swigregister(CvEM)
 
@@ -655,8 +676,8 @@ class CvPair16u32s(_object):
     __swig_setmethods__["i"] = _ml.CvPair16u32s_i_set
     __swig_getmethods__["i"] = _ml.CvPair16u32s_i_get
     if _newclass:i = _swig_property(_ml.CvPair16u32s_i_get, _ml.CvPair16u32s_i_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvPair16u32s(*args)
+    def __init__(self): 
+        this = _ml.new_CvPair16u32s()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvPair16u32s
@@ -685,8 +706,8 @@ class CvDTreeSplit(_object):
     __swig_setmethods__["next"] = _ml.CvDTreeSplit_next_set
     __swig_getmethods__["next"] = _ml.CvDTreeSplit_next_get
     if _newclass:next = _swig_property(_ml.CvDTreeSplit_next_get, _ml.CvDTreeSplit_next_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvDTreeSplit(*args)
+    def __init__(self): 
+        this = _ml.new_CvDTreeSplit()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvDTreeSplit
@@ -763,10 +784,10 @@ class CvDTreeNode(_object):
     __swig_setmethods__["cv_node_error"] = _ml.CvDTreeNode_cv_node_error_set
     __swig_getmethods__["cv_node_error"] = _ml.CvDTreeNode_cv_node_error_get
     if _newclass:cv_node_error = _swig_property(_ml.CvDTreeNode_cv_node_error_get, _ml.CvDTreeNode_cv_node_error_set)
-    def get_num_valid(*args): return _ml.CvDTreeNode_get_num_valid(*args)
-    def set_num_valid(*args): return _ml.CvDTreeNode_set_num_valid(*args)
-    def __init__(self, *args): 
-        this = _ml.new_CvDTreeNode(*args)
+    def get_num_valid(self, *args): return _ml.CvDTreeNode_get_num_valid(self, *args)
+    def set_num_valid(self, *args): return _ml.CvDTreeNode_set_num_valid(self, *args)
+    def __init__(self): 
+        this = _ml.new_CvDTreeNode()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvDTreeNode
@@ -828,30 +849,30 @@ class CvDTreeTrainData(_object):
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvDTreeTrainData
     __del__ = lambda self : None;
-    def set_data(*args): return _ml.CvDTreeTrainData_set_data(*args)
-    def do_responses_copy(*args): return _ml.CvDTreeTrainData_do_responses_copy(*args)
-    def get_vectors(*args): return _ml.CvDTreeTrainData_get_vectors(*args)
-    def subsample_data(*args): return _ml.CvDTreeTrainData_subsample_data(*args)
-    def write_params(*args): return _ml.CvDTreeTrainData_write_params(*args)
-    def read_params(*args): return _ml.CvDTreeTrainData_read_params(*args)
-    def clear(*args): return _ml.CvDTreeTrainData_clear(*args)
-    def get_num_classes(*args): return _ml.CvDTreeTrainData_get_num_classes(*args)
-    def get_var_type(*args): return _ml.CvDTreeTrainData_get_var_type(*args)
-    def get_work_var_count(*args): return _ml.CvDTreeTrainData_get_work_var_count(*args)
-    def get_ord_responses(*args): return _ml.CvDTreeTrainData_get_ord_responses(*args)
-    def get_class_labels(*args): return _ml.CvDTreeTrainData_get_class_labels(*args)
-    def get_cv_labels(*args): return _ml.CvDTreeTrainData_get_cv_labels(*args)
-    def get_sample_indices(*args): return _ml.CvDTreeTrainData_get_sample_indices(*args)
-    def get_cat_var_data(*args): return _ml.CvDTreeTrainData_get_cat_var_data(*args)
-    def get_ord_var_data(*args): return _ml.CvDTreeTrainData_get_ord_var_data(*args)
-    def get_child_buf_idx(*args): return _ml.CvDTreeTrainData_get_child_buf_idx(*args)
-    def set_params(*args): return _ml.CvDTreeTrainData_set_params(*args)
-    def new_node(*args): return _ml.CvDTreeTrainData_new_node(*args)
-    def new_split_ord(*args): return _ml.CvDTreeTrainData_new_split_ord(*args)
-    def new_split_cat(*args): return _ml.CvDTreeTrainData_new_split_cat(*args)
-    def free_node_data(*args): return _ml.CvDTreeTrainData_free_node_data(*args)
-    def free_train_data(*args): return _ml.CvDTreeTrainData_free_train_data(*args)
-    def free_node(*args): return _ml.CvDTreeTrainData_free_node(*args)
+    def set_data(self, *args): return _ml.CvDTreeTrainData_set_data(self, *args)
+    def do_responses_copy(self): return _ml.CvDTreeTrainData_do_responses_copy(self)
+    def get_vectors(self, *args): return _ml.CvDTreeTrainData_get_vectors(self, *args)
+    def subsample_data(self, *args): return _ml.CvDTreeTrainData_subsample_data(self, *args)
+    def write_params(self, *args): return _ml.CvDTreeTrainData_write_params(self, *args)
+    def read_params(self, *args): return _ml.CvDTreeTrainData_read_params(self, *args)
+    def clear(self): return _ml.CvDTreeTrainData_clear(self)
+    def get_num_classes(self): return _ml.CvDTreeTrainData_get_num_classes(self)
+    def get_var_type(self, *args): return _ml.CvDTreeTrainData_get_var_type(self, *args)
+    def get_work_var_count(self): return _ml.CvDTreeTrainData_get_work_var_count(self)
+    def get_ord_responses(self, *args): return _ml.CvDTreeTrainData_get_ord_responses(self, *args)
+    def get_class_labels(self, *args): return _ml.CvDTreeTrainData_get_class_labels(self, *args)
+    def get_cv_labels(self, *args): return _ml.CvDTreeTrainData_get_cv_labels(self, *args)
+    def get_sample_indices(self, *args): return _ml.CvDTreeTrainData_get_sample_indices(self, *args)
+    def get_cat_var_data(self, *args): return _ml.CvDTreeTrainData_get_cat_var_data(self, *args)
+    def get_ord_var_data(self, *args): return _ml.CvDTreeTrainData_get_ord_var_data(self, *args)
+    def get_child_buf_idx(self, *args): return _ml.CvDTreeTrainData_get_child_buf_idx(self, *args)
+    def set_params(self, *args): return _ml.CvDTreeTrainData_set_params(self, *args)
+    def new_node(self, *args): return _ml.CvDTreeTrainData_new_node(self, *args)
+    def new_split_ord(self, *args): return _ml.CvDTreeTrainData_new_split_ord(self, *args)
+    def new_split_cat(self, *args): return _ml.CvDTreeTrainData_new_split_cat(self, *args)
+    def free_node_data(self, *args): return _ml.CvDTreeTrainData_free_node_data(self, *args)
+    def free_train_data(self): return _ml.CvDTreeTrainData_free_train_data(self)
+    def free_node(self, *args): return _ml.CvDTreeTrainData_free_node(self, *args)
     __swig_setmethods__["pred_float_buf"] = _ml.CvDTreeTrainData_pred_float_buf_set
     __swig_getmethods__["pred_float_buf"] = _ml.CvDTreeTrainData_pred_float_buf_get
     if _newclass:pred_float_buf = _swig_property(_ml.CvDTreeTrainData_pred_float_buf_get, _ml.CvDTreeTrainData_pred_float_buf_set)
@@ -995,22 +1016,22 @@ class CvDTree(CvStatModel):
     for _s in [CvStatModel]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, CvDTree, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _ml.new_CvDTree(*args)
+    def __init__(self): 
+        this = _ml.new_CvDTree()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvDTree
     __del__ = lambda self : None;
-    def calc_error(*args): return _ml.CvDTree_calc_error(*args)
-    def train(*args): return _ml.CvDTree_train(*args)
-    def predict(*args): return _ml.CvDTree_predict(*args)
-    def get_var_importance(*args): return _ml.CvDTree_get_var_importance(*args)
-    def clear(*args): return _ml.CvDTree_clear(*args)
-    def read(*args): return _ml.CvDTree_read(*args)
-    def write(*args): return _ml.CvDTree_write(*args)
-    def get_root(*args): return _ml.CvDTree_get_root(*args)
-    def get_pruned_tree_idx(*args): return _ml.CvDTree_get_pruned_tree_idx(*args)
-    def get_data(*args): return _ml.CvDTree_get_data(*args)
+    def calc_error(self, *args): return _ml.CvDTree_calc_error(self, *args)
+    def train(self, *args): return _ml.CvDTree_train(self, *args)
+    def predict(self, *args): return _ml.CvDTree_predict(self, *args)
+    def get_var_importance(self): return _ml.CvDTree_get_var_importance(self)
+    def clear(self): return _ml.CvDTree_clear(self)
+    def read(self, *args): return _ml.CvDTree_read(self, *args)
+    def write(self, *args): return _ml.CvDTree_write(self, *args)
+    def get_root(self): return _ml.CvDTree_get_root(self)
+    def get_pruned_tree_idx(self): return _ml.CvDTree_get_pruned_tree_idx(self)
+    def get_data(self): return _ml.CvDTree_get_data(self)
 CvDTree_swigregister = _ml.CvDTree_swigregister
 CvDTree_swigregister(CvDTree)
 
@@ -1022,15 +1043,15 @@ class CvForestTree(CvDTree):
     for _s in [CvDTree]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, CvForestTree, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _ml.new_CvForestTree(*args)
+    def __init__(self): 
+        this = _ml.new_CvForestTree()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvForestTree
     __del__ = lambda self : None;
-    def get_var_count(*args): return _ml.CvForestTree_get_var_count(*args)
-    def train(*args): return _ml.CvForestTree_train(*args)
-    def read(*args): return _ml.CvForestTree_read(*args)
+    def get_var_count(self): return _ml.CvForestTree_get_var_count(self)
+    def train(self, *args): return _ml.CvForestTree_train(self, *args)
+    def read(self, *args): return _ml.CvForestTree_read(self, *args)
 CvForestTree_swigregister = _ml.CvForestTree_swigregister
 CvForestTree_swigregister(CvForestTree)
 
@@ -1068,26 +1089,26 @@ class CvRTrees(CvStatModel):
     for _s in [CvStatModel]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, CvRTrees, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _ml.new_CvRTrees(*args)
+    def __init__(self): 
+        this = _ml.new_CvRTrees()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvRTrees
     __del__ = lambda self : None;
-    def train(*args): return _ml.CvRTrees_train(*args)
-    def predict(*args): return _ml.CvRTrees_predict(*args)
-    def predict_prob(*args): return _ml.CvRTrees_predict_prob(*args)
-    def clear(*args): return _ml.CvRTrees_clear(*args)
-    def get_var_importance(*args): return _ml.CvRTrees_get_var_importance(*args)
-    def get_proximity(*args): return _ml.CvRTrees_get_proximity(*args)
-    def calc_error(*args): return _ml.CvRTrees_calc_error(*args)
-    def get_train_error(*args): return _ml.CvRTrees_get_train_error(*args)
-    def read(*args): return _ml.CvRTrees_read(*args)
-    def write(*args): return _ml.CvRTrees_write(*args)
-    def get_active_var_mask(*args): return _ml.CvRTrees_get_active_var_mask(*args)
-    def get_rng(*args): return _ml.CvRTrees_get_rng(*args)
-    def get_tree_count(*args): return _ml.CvRTrees_get_tree_count(*args)
-    def get_tree(*args): return _ml.CvRTrees_get_tree(*args)
+    def train(self, *args): return _ml.CvRTrees_train(self, *args)
+    def predict(self, *args): return _ml.CvRTrees_predict(self, *args)
+    def predict_prob(self, *args): return _ml.CvRTrees_predict_prob(self, *args)
+    def clear(self): return _ml.CvRTrees_clear(self)
+    def get_var_importance(self): return _ml.CvRTrees_get_var_importance(self)
+    def get_proximity(self, *args): return _ml.CvRTrees_get_proximity(self, *args)
+    def calc_error(self, *args): return _ml.CvRTrees_calc_error(self, *args)
+    def get_train_error(self): return _ml.CvRTrees_get_train_error(self)
+    def read(self, *args): return _ml.CvRTrees_read(self, *args)
+    def write(self, *args): return _ml.CvRTrees_write(self, *args)
+    def get_active_var_mask(self): return _ml.CvRTrees_get_active_var_mask(self)
+    def get_rng(self): return _ml.CvRTrees_get_rng(self)
+    def get_tree_count(self): return _ml.CvRTrees_get_tree_count(self)
+    def get_tree(self, *args): return _ml.CvRTrees_get_tree(self, *args)
 CvRTrees_swigregister = _ml.CvRTrees_swigregister
 CvRTrees_swigregister(CvRTrees)
 
@@ -1099,18 +1120,18 @@ class CvERTreeTrainData(CvDTreeTrainData):
     for _s in [CvDTreeTrainData]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, CvERTreeTrainData, name)
     __repr__ = _swig_repr
-    def set_data(*args): return _ml.CvERTreeTrainData_set_data(*args)
-    def get_ord_var_data(*args): return _ml.CvERTreeTrainData_get_ord_var_data(*args)
-    def get_sample_indices(*args): return _ml.CvERTreeTrainData_get_sample_indices(*args)
-    def get_cv_labels(*args): return _ml.CvERTreeTrainData_get_cv_labels(*args)
-    def get_cat_var_data(*args): return _ml.CvERTreeTrainData_get_cat_var_data(*args)
-    def get_vectors(*args): return _ml.CvERTreeTrainData_get_vectors(*args)
-    def subsample_data(*args): return _ml.CvERTreeTrainData_subsample_data(*args)
+    def set_data(self, *args): return _ml.CvERTreeTrainData_set_data(self, *args)
+    def get_ord_var_data(self, *args): return _ml.CvERTreeTrainData_get_ord_var_data(self, *args)
+    def get_sample_indices(self, *args): return _ml.CvERTreeTrainData_get_sample_indices(self, *args)
+    def get_cv_labels(self, *args): return _ml.CvERTreeTrainData_get_cv_labels(self, *args)
+    def get_cat_var_data(self, *args): return _ml.CvERTreeTrainData_get_cat_var_data(self, *args)
+    def get_vectors(self, *args): return _ml.CvERTreeTrainData_get_vectors(self, *args)
+    def subsample_data(self, *args): return _ml.CvERTreeTrainData_subsample_data(self, *args)
     __swig_setmethods__["missing_mask"] = _ml.CvERTreeTrainData_missing_mask_set
     __swig_getmethods__["missing_mask"] = _ml.CvERTreeTrainData_missing_mask_get
     if _newclass:missing_mask = _swig_property(_ml.CvERTreeTrainData_missing_mask_get, _ml.CvERTreeTrainData_missing_mask_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvERTreeTrainData(*args)
+    def __init__(self): 
+        this = _ml.new_CvERTreeTrainData()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvERTreeTrainData
@@ -1126,8 +1147,8 @@ class CvForestERTree(CvForestTree):
     for _s in [CvForestTree]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, CvForestERTree, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _ml.new_CvForestERTree(*args)
+    def __init__(self): 
+        this = _ml.new_CvForestERTree()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvForestERTree
@@ -1143,14 +1164,13 @@ class CvERTrees(CvRTrees):
     for _s in [CvRTrees]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, CvERTrees, name)
     __repr__ = _swig_repr
-    def train(*args): return _ml.CvERTrees_train(*args)
-    def clear(*args): return _ml.CvERTrees_clear(*args)
-    def __init__(self, *args): 
-        this = _ml.new_CvERTrees(*args)
+    def __init__(self): 
+        this = _ml.new_CvERTrees()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvERTrees
     __del__ = lambda self : None;
+    def train(self, *args): return _ml.CvERTrees_train(self, *args)
 CvERTrees_swigregister = _ml.CvERTrees_swigregister
 CvERTrees_swigregister(CvERTrees)
 
@@ -1191,16 +1211,16 @@ class CvBoostTree(CvDTree):
     for _s in [CvDTree]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, CvBoostTree, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _ml.new_CvBoostTree(*args)
+    def __init__(self): 
+        this = _ml.new_CvBoostTree()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvBoostTree
     __del__ = lambda self : None;
-    def scale(*args): return _ml.CvBoostTree_scale(*args)
-    def clear(*args): return _ml.CvBoostTree_clear(*args)
-    def train(*args): return _ml.CvBoostTree_train(*args)
-    def read(*args): return _ml.CvBoostTree_read(*args)
+    def scale(self, *args): return _ml.CvBoostTree_scale(self, *args)
+    def clear(self): return _ml.CvBoostTree_clear(self)
+    def train(self, *args): return _ml.CvBoostTree_train(self, *args)
+    def read(self, *args): return _ml.CvBoostTree_read(self, *args)
 CvBoostTree_swigregister = _ml.CvBoostTree_swigregister
 CvBoostTree_swigregister(CvBoostTree)
 
@@ -1226,20 +1246,20 @@ class CvBoost(CvStatModel):
         this = _ml.new_CvBoost(*args)
         try: self.this.append(this)
         except: self.this = this
-    def train(*args): return _ml.CvBoost_train(*args)
-    def predict(*args): return _ml.CvBoost_predict(*args)
-    def calc_error(*args): return _ml.CvBoost_calc_error(*args)
-    def prune(*args): return _ml.CvBoost_prune(*args)
-    def clear(*args): return _ml.CvBoost_clear(*args)
-    def write(*args): return _ml.CvBoost_write(*args)
-    def read(*args): return _ml.CvBoost_read(*args)
-    def get_active_vars(*args): return _ml.CvBoost_get_active_vars(*args)
-    def get_weak_predictors(*args): return _ml.CvBoost_get_weak_predictors(*args)
-    def get_weights(*args): return _ml.CvBoost_get_weights(*args)
-    def get_subtree_weights(*args): return _ml.CvBoost_get_subtree_weights(*args)
-    def get_weak_response(*args): return _ml.CvBoost_get_weak_response(*args)
-    def get_params(*args): return _ml.CvBoost_get_params(*args)
-    def get_data(*args): return _ml.CvBoost_get_data(*args)
+    def train(self, *args): return _ml.CvBoost_train(self, *args)
+    def predict(self, *args): return _ml.CvBoost_predict(self, *args)
+    def calc_error(self, *args): return _ml.CvBoost_calc_error(self, *args)
+    def prune(self, *args): return _ml.CvBoost_prune(self, *args)
+    def clear(self): return _ml.CvBoost_clear(self)
+    def write(self, *args): return _ml.CvBoost_write(self, *args)
+    def read(self, *args): return _ml.CvBoost_read(self, *args)
+    def get_active_vars(self, absolute_idx = True): return _ml.CvBoost_get_active_vars(self, absolute_idx)
+    def get_weak_predictors(self): return _ml.CvBoost_get_weak_predictors(self)
+    def get_weights(self): return _ml.CvBoost_get_weights(self)
+    def get_subtree_weights(self): return _ml.CvBoost_get_subtree_weights(self)
+    def get_weak_response(self): return _ml.CvBoost_get_weak_response(self)
+    def get_params(self): return _ml.CvBoost_get_params(self)
+    def get_data(self): return _ml.CvBoost_get_data(self)
 CvBoost_swigregister = _ml.CvBoost_swigregister
 CvBoost_swigregister(CvBoost)
 
@@ -1301,27 +1321,36 @@ class CvANN_MLP(CvStatModel):
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvANN_MLP
     __del__ = lambda self : None;
-    def create(*args): return _ml.CvANN_MLP_create(*args)
-    def train(*args): return _ml.CvANN_MLP_train(*args)
-    def predict(*args): return _ml.CvANN_MLP_predict(*args)
-    def clear(*args): return _ml.CvANN_MLP_clear(*args)
+    def create(self, *args): return _ml.CvANN_MLP_create(self, *args)
+    def train(self, *args): return _ml.CvANN_MLP_train(self, *args)
+    def predict(self, *args): return _ml.CvANN_MLP_predict(self, *args)
+    def clear(self): return _ml.CvANN_MLP_clear(self)
     IDENTITY = _ml.CvANN_MLP_IDENTITY
     SIGMOID_SYM = _ml.CvANN_MLP_SIGMOID_SYM
     GAUSSIAN = _ml.CvANN_MLP_GAUSSIAN
     UPDATE_WEIGHTS = _ml.CvANN_MLP_UPDATE_WEIGHTS
     NO_INPUT_SCALE = _ml.CvANN_MLP_NO_INPUT_SCALE
     NO_OUTPUT_SCALE = _ml.CvANN_MLP_NO_OUTPUT_SCALE
-    def read(*args): return _ml.CvANN_MLP_read(*args)
-    def write(*args): return _ml.CvANN_MLP_write(*args)
-    def get_layer_count(*args): return _ml.CvANN_MLP_get_layer_count(*args)
-    def get_layer_sizes(*args): return _ml.CvANN_MLP_get_layer_sizes(*args)
-    def get_weights(*args): return _ml.CvANN_MLP_get_weights(*args)
+    def read(self, *args): return _ml.CvANN_MLP_read(self, *args)
+    def write(self, *args): return _ml.CvANN_MLP_write(self, *args)
+    def get_layer_count(self): return _ml.CvANN_MLP_get_layer_count(self)
+    def get_layer_sizes(self): return _ml.CvANN_MLP_get_layer_sizes(self)
+    def get_weights(self, *args): return _ml.CvANN_MLP_get_weights(self, *args)
 CvANN_MLP_swigregister = _ml.CvANN_MLP_swigregister
 CvANN_MLP_swigregister(CvANN_MLP)
 
+
+def cvRandMVNormal(*args):
+  return _ml.cvRandMVNormal(*args)
 cvRandMVNormal = _ml.cvRandMVNormal
+
+def cvRandGaussMixture(*args):
+  return _ml.cvRandGaussMixture(*args)
 cvRandGaussMixture = _ml.cvRandGaussMixture
 CV_TS_CONCENTRIC_SPHERES = _ml.CV_TS_CONCENTRIC_SPHERES
+
+def cvCreateTestSet(*args):
+  return _ml.cvCreateTestSet(*args)
 cvCreateTestSet = _ml.cvCreateTestSet
 CV_COUNT = _ml.CV_COUNT
 CV_PORTION = _ml.CV_PORTION
@@ -1365,8 +1394,8 @@ class CvTrainTestSplit_class_part(_object):
     __swig_setmethods__["portion"] = _ml.CvTrainTestSplit_class_part_portion_set
     __swig_getmethods__["portion"] = _ml.CvTrainTestSplit_class_part_portion_get
     if _newclass:portion = _swig_property(_ml.CvTrainTestSplit_class_part_portion_get, _ml.CvTrainTestSplit_class_part_portion_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvTrainTestSplit_class_part(*args)
+    def __init__(self): 
+        this = _ml.new_CvTrainTestSplit_class_part()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvTrainTestSplit_class_part
@@ -1386,8 +1415,8 @@ class CvTrainTestSplit_train_sample_part(_object):
     __swig_setmethods__["portion"] = _ml.CvTrainTestSplit_train_sample_part_portion_set
     __swig_getmethods__["portion"] = _ml.CvTrainTestSplit_train_sample_part_portion_get
     if _newclass:portion = _swig_property(_ml.CvTrainTestSplit_train_sample_part_portion_get, _ml.CvTrainTestSplit_train_sample_part_portion_set)
-    def __init__(self, *args): 
-        this = _ml.new_CvTrainTestSplit_train_sample_part(*args)
+    def __init__(self): 
+        this = _ml.new_CvTrainTestSplit_train_sample_part()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvTrainTestSplit_train_sample_part
@@ -1401,32 +1430,32 @@ class CvMLData(_object):
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CvMLData, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _ml.new_CvMLData(*args)
+    def __init__(self): 
+        this = _ml.new_CvMLData()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ml.delete_CvMLData
     __del__ = lambda self : None;
-    def read_csv(*args): return _ml.CvMLData_read_csv(*args)
-    def get_values(*args): return _ml.CvMLData_get_values(*args)
-    def get_response(*args): return _ml.CvMLData_get_response(*args)
-    def get_missing(*args): return _ml.CvMLData_get_missing(*args)
-    def set_response_idx(*args): return _ml.CvMLData_set_response_idx(*args)
-    def get_response_idx(*args): return _ml.CvMLData_get_response_idx(*args)
-    def get_train_sample_idx(*args): return _ml.CvMLData_get_train_sample_idx(*args)
-    def get_test_sample_idx(*args): return _ml.CvMLData_get_test_sample_idx(*args)
-    def mix_train_and_test_idx(*args): return _ml.CvMLData_mix_train_and_test_idx(*args)
-    def set_train_test_split(*args): return _ml.CvMLData_set_train_test_split(*args)
-    def get_var_idx(*args): return _ml.CvMLData_get_var_idx(*args)
-    def chahge_var_idx(*args): return _ml.CvMLData_chahge_var_idx(*args)
-    def get_var_types(*args): return _ml.CvMLData_get_var_types(*args)
-    def get_var_type(*args): return _ml.CvMLData_get_var_type(*args)
-    def set_var_types(*args): return _ml.CvMLData_set_var_types(*args)
-    def change_var_type(*args): return _ml.CvMLData_change_var_type(*args)
-    def set_delimiter(*args): return _ml.CvMLData_set_delimiter(*args)
-    def get_delimiter(*args): return _ml.CvMLData_get_delimiter(*args)
-    def set_miss_ch(*args): return _ml.CvMLData_set_miss_ch(*args)
-    def get_miss_ch(*args): return _ml.CvMLData_get_miss_ch(*args)
+    def read_csv(self, *args): return _ml.CvMLData_read_csv(self, *args)
+    def get_values(self): return _ml.CvMLData_get_values(self)
+    def get_response(self): return _ml.CvMLData_get_response(self)
+    def get_missing(self): return _ml.CvMLData_get_missing(self)
+    def set_response_idx(self, *args): return _ml.CvMLData_set_response_idx(self, *args)
+    def get_response_idx(self): return _ml.CvMLData_get_response_idx(self)
+    def get_train_sample_idx(self): return _ml.CvMLData_get_train_sample_idx(self)
+    def get_test_sample_idx(self): return _ml.CvMLData_get_test_sample_idx(self)
+    def mix_train_and_test_idx(self): return _ml.CvMLData_mix_train_and_test_idx(self)
+    def set_train_test_split(self, *args): return _ml.CvMLData_set_train_test_split(self, *args)
+    def get_var_idx(self): return _ml.CvMLData_get_var_idx(self)
+    def chahge_var_idx(self, *args): return _ml.CvMLData_chahge_var_idx(self, *args)
+    def get_var_types(self): return _ml.CvMLData_get_var_types(self)
+    def get_var_type(self, *args): return _ml.CvMLData_get_var_type(self, *args)
+    def set_var_types(self, *args): return _ml.CvMLData_set_var_types(self, *args)
+    def change_var_type(self, *args): return _ml.CvMLData_change_var_type(self, *args)
+    def set_delimiter(self, *args): return _ml.CvMLData_set_delimiter(self, *args)
+    def get_delimiter(self): return _ml.CvMLData_get_delimiter(self)
+    def set_miss_ch(self, *args): return _ml.CvMLData_set_miss_ch(self, *args)
+    def get_miss_ch(self): return _ml.CvMLData_get_miss_ch(self)
 CvMLData_swigregister = _ml.CvMLData_swigregister
 CvMLData_swigregister(CvMLData)
 
index a441303c0920580bbb781202a75d3ccbeff81097..752c6946aa9ccf521079c0e9c1b4cbac2ed1d6fd 100644 (file)
@@ -6,7 +6,9 @@ EXTRA_DIST = \
   CMakeLists.txt        \
   c/CMakeLists.txt      \
   python/CMakeLists.txt \
-  octave/CMakeLists.txt
+  octave/CMakeLists.txt \
+  \
+  c/cvsample.vs2005.vcproj
 
 # C/C++ samples
 csamplesdir=$(pkgdatadir)/samples/c
index f48270884369cf96c57dbc813209f2699383dda3..818670123d266d6053de2936ab8751c9d5218102 100644 (file)
@@ -46,7 +46,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -102,15 +106,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -127,10 +130,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -140,6 +145,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -149,6 +155,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -190,7 +198,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -221,6 +229,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -250,7 +259,9 @@ EXTRA_DIST = \
   CMakeLists.txt        \
   c/CMakeLists.txt      \
   python/CMakeLists.txt \
-  octave/CMakeLists.txt
+  octave/CMakeLists.txt \
+  \
+  c/cvsample.vs2005.vcproj
 
 
 # C/C++ samples
@@ -309,7 +320,7 @@ dist_csamples_DATA = \
   c/letter-recognition.data \
   c/waveform.data\
   \
-  c/adaptiveskindetector_sample.cpp \
+  c/adaptiveskindetector.cpp \
   c/bgfg_codebook.cpp \
   c/bgfg_segm.cpp \
   c/blobtrack.cpp \
@@ -317,10 +328,7 @@ dist_csamples_DATA = \
   c/camshiftdemo.c \
   c/contours.c \
   c/convexhull.c \
-  c/camshiftdemo.c \
-  c/contours.c \
   c/convert_cascade.c \
-  c/convexhull.c \
   c/delaunay.c \
   c/demhist.c \
   c/dft.c \
@@ -343,6 +351,7 @@ dist_csamples_DATA = \
   c/morphology.c \
   c/motempl.c \
   c/mushroom.cpp \
+  c/peopledetect.cpp \
   c/polar_transforms.c \
   c/pyramid_segmentation.c \
   c/squares.c \
index 5ece794558eec45e973fb314211ddcebd5f802a9..1700367acf6a7f101bcd72f7777425b7f999a24b 100644 (file)
@@ -24,6 +24,8 @@ EXTRA_DIST = \
   highgui/CMakeLists.txt       \
   ml/CMakeLists.txt            \
   \
+  highgui/makeswig.sh          \
+  \
   highgui/cvcap_cmu.cpp        \
   highgui/cvcap_tyzx.cpp       \
   highgui/cvcap_vfw.cpp        \
@@ -32,13 +34,17 @@ EXTRA_DIST = \
   highgui/window_w32.cpp       \
   \
   highgui/cvcap_dc1394.cpp     \
-  highgui/cvcap_v4l.cpp        \
-  highgui/cvcap_unicap.cpp     \
+  highgui/cvcap_dc1394_v2.cpp  \
+  highgui/cvcap_dshow.cpp      \
   highgui/cvcap_ffmpeg.cpp     \
-  highgui/cvcap_xine.cpp       \
   highgui/cvcap_gstreamer.cpp  \
-  highgui/gstappsink.cpp       \
+  highgui/cvcap_libv4l.cpp     \
   highgui/cvcap_qt.cpp         \
+  highgui/cvcap_unicap.cpp     \
+  highgui/cvcap_v4l.cpp        \
+  highgui/cvcap_w32.cpp        \
+  highgui/cvcap_xine.cpp       \
+  highgui/gstappsink.cpp       \
   highgui/window_carbon.cpp    \
   highgui/window_gtk.cpp       \
   highgui/grfmt_imageio.cpp
@@ -250,6 +256,7 @@ lib_cvaux_la_SOURCES = \
   cvaux/cvmorphcontours.cpp \
   cvaux/cvmorphing.cpp \
   cvaux/cvocttree.cpp \
+  cvaux/cvplanardetect.cpp \
   cvaux/cvprewarp.cpp \
   cvaux/cvscanlines.cpp \
   cvaux/cvsegment.cpp \
@@ -338,6 +345,12 @@ else
 TMP_DC1394=
 endif
 
+if BUILD_DC1394_2
+TMP_DC1394=highgui/cvcap_dc1394_v2.cpp
+else
+TMP_DC1394=
+endif
+
 if BUILD_V4L
 TMP_V4L=highgui/cvcap_v4l.cpp
 else
@@ -363,7 +376,7 @@ TMP_XINE=
 endif
 
 if BUILD_GSTREAMER
-TMP_GSTREAMER=highgui/cvcap_gstreamer.cpp highgui/gstappsink.c
+TMP_GSTREAMER=highgui/cvcap_gstreamer.cpp highgui/gstappsink.cpp
 else
 TMP_GSTREAMER=
 endif
index 4227c2bf36a28cbb481172bc407f65ef9fd8c6a6..8fd94601f284e5bf07a621f38a216f771f01bd8a 100644 (file)
@@ -45,7 +45,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -125,8 +129,9 @@ am_lib_cvaux_la_OBJECTS = lib_cvaux_la-camshift.lo \
        lib_cvaux_la-cvlevmartrif.lo lib_cvaux_la-cvlines.lo \
        lib_cvaux_la-cvlmeds.lo lib_cvaux_la-cvmat.lo \
        lib_cvaux_la-cvmorphcontours.lo lib_cvaux_la-cvmorphing.lo \
-       lib_cvaux_la-cvocttree.lo lib_cvaux_la-cvprewarp.lo \
-       lib_cvaux_la-cvscanlines.lo lib_cvaux_la-cvsegment.lo \
+       lib_cvaux_la-cvocttree.lo lib_cvaux_la-cvplanardetect.lo \
+       lib_cvaux_la-cvprewarp.lo lib_cvaux_la-cvscanlines.lo \
+       lib_cvaux_la-cvsegment.lo lib_cvaux_la-cvselfsimilarity.lo \
        lib_cvaux_la-cvspinimages.lo lib_cvaux_la-cvsubdiv2.lo \
        lib_cvaux_la-cvtexture.lo lib_cvaux_la-cvtrifocal.lo \
        lib_cvaux_la-cvvecfacetracking.lo lib_cvaux_la-cvvideo.lo \
@@ -177,20 +182,23 @@ am__lib_highgui_la_SOURCES_DIST = highgui/bitstrm.cpp \
        highgui/grfmt_pxm.cpp highgui/grfmt_sunras.cpp \
        highgui/grfmt_tiff.cpp highgui/image.cpp highgui/loadsave.cpp \
        highgui/utils.cpp highgui/cvcap.cpp highgui/cvcap_images.cpp \
-       highgui/window.cpp highgui/cvcap_dc1394.cpp \
-       highgui/cvcap_v4l.cpp highgui/cvcap_unicap.cpp \
-       highgui/cvcap_ffmpeg.cpp highgui/cvcap_xine.cpp \
-       highgui/cvcap_gstreamer.cpp highgui/gstappsink.c \
-       highgui/cvcap_qt.cpp highgui/window_carbon.cpp \
-       highgui/window_gtk.cpp highgui/grfmt_imageio.cpp
-@BUILD_DC1394_TRUE@am__objects_1 = lib_highgui_la-cvcap_dc1394.lo
+       highgui/window.cpp highgui/cvcap_dc1394_v2.cpp \
+       highgui/cvcap_dc1394.cpp highgui/cvcap_v4l.cpp \
+       highgui/cvcap_unicap.cpp highgui/cvcap_ffmpeg.cpp \
+       highgui/cvcap_xine.cpp highgui/cvcap_gstreamer.cpp \
+       highgui/gstappsink.cpp highgui/cvcap_qt.cpp \
+       highgui/window_carbon.cpp highgui/window_gtk.cpp \
+       highgui/grfmt_imageio.cpp
+@BUILD_DC1394_2_FALSE@@BUILD_DC1394_TRUE@am__objects_1 = lib_highgui_la-cvcap_dc1394.lo
+@BUILD_DC1394_2_TRUE@am__objects_1 =  \
+@BUILD_DC1394_2_TRUE@  lib_highgui_la-cvcap_dc1394_v2.lo
 @BUILD_V4L_TRUE@am__objects_2 = lib_highgui_la-cvcap_v4l.lo
 @BUILD_UNICAP_TRUE@am__objects_3 = lib_highgui_la-cvcap_unicap.lo
 @BUILD_FFMPEG_TRUE@am__objects_4 = lib_highgui_la-cvcap_ffmpeg.lo
 @BUILD_XINE_TRUE@am__objects_5 = lib_highgui_la-cvcap_xine.lo
 @BUILD_GSTREAMER_TRUE@am__objects_6 =  \
 @BUILD_GSTREAMER_TRUE@ lib_highgui_la-cvcap_gstreamer.lo \
-@BUILD_GSTREAMER_TRUE@ gstappsink.lo
+@BUILD_GSTREAMER_TRUE@ lib_highgui_la-gstappsink.lo
 @BUILD_QUICKTIME_TRUE@am__objects_7 = lib_highgui_la-cvcap_qt.lo
 @BUILD_CARBON_TRUE@am__objects_8 = lib_highgui_la-window_carbon.lo
 @BUILD_GTK_TRUE@am__objects_9 = lib_highgui_la-window_gtk.lo
@@ -321,15 +329,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -346,10 +353,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -359,6 +368,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -368,6 +378,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -409,7 +421,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -440,6 +452,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -484,6 +497,8 @@ EXTRA_DIST = \
   highgui/CMakeLists.txt       \
   ml/CMakeLists.txt            \
   \
+  highgui/makeswig.sh          \
+  \
   highgui/cvcap_cmu.cpp        \
   highgui/cvcap_tyzx.cpp       \
   highgui/cvcap_vfw.cpp        \
@@ -492,13 +507,17 @@ EXTRA_DIST = \
   highgui/window_w32.cpp       \
   \
   highgui/cvcap_dc1394.cpp     \
-  highgui/cvcap_v4l.cpp        \
-  highgui/cvcap_unicap.cpp     \
+  highgui/cvcap_dc1394_v2.cpp  \
+  highgui/cvcap_dshow.cpp      \
   highgui/cvcap_ffmpeg.cpp     \
-  highgui/cvcap_xine.cpp       \
   highgui/cvcap_gstreamer.cpp  \
-  highgui/gstappsink.c         \
+  highgui/cvcap_libv4l.cpp     \
   highgui/cvcap_qt.cpp         \
+  highgui/cvcap_unicap.cpp     \
+  highgui/cvcap_v4l.cpp        \
+  highgui/cvcap_w32.cpp        \
+  highgui/cvcap_xine.cpp       \
+  highgui/gstappsink.cpp       \
   highgui/window_carbon.cpp    \
   highgui/window_gtk.cpp       \
   highgui/grfmt_imageio.cpp
@@ -713,9 +732,11 @@ lib_cvaux_la_SOURCES = \
   cvaux/cvmorphcontours.cpp \
   cvaux/cvmorphing.cpp \
   cvaux/cvocttree.cpp \
+  cvaux/cvplanardetect.cpp \
   cvaux/cvprewarp.cpp \
   cvaux/cvscanlines.cpp \
   cvaux/cvsegment.cpp \
+  cvaux/cvselfsimilarity.cpp \
   cvaux/cvspinimages.cpp \
   cvaux/cvsubdiv2.cpp \
   cvaux/cvtexture.cpp \
@@ -793,6 +814,8 @@ libml_la_LIBADD = \
   libcxcore.la \
   @LTLIBOBJS@
 
+@BUILD_DC1394_2_FALSE@TMP_DC1394 = 
+@BUILD_DC1394_2_TRUE@TMP_DC1394 = highgui/cvcap_dc1394_v2.cpp
 @BUILD_DC1394_FALSE@TMP_DC1394 = 
 
 # =========================================================================
@@ -808,7 +831,7 @@ libml_la_LIBADD = \
 @BUILD_XINE_FALSE@TMP_XINE = 
 @BUILD_XINE_TRUE@TMP_XINE = highgui/cvcap_xine.cpp
 @BUILD_GSTREAMER_FALSE@TMP_GSTREAMER = 
-@BUILD_GSTREAMER_TRUE@TMP_GSTREAMER = highgui/cvcap_gstreamer.cpp highgui/gstappsink.c
+@BUILD_GSTREAMER_TRUE@TMP_GSTREAMER = highgui/cvcap_gstreamer.cpp highgui/gstappsink.cpp
 @BUILD_QUICKTIME_FALSE@TMP_QT = 
 @BUILD_QUICKTIME_TRUE@TMP_QT = highgui/cvcap_qt.cpp
 @BUILD_CARBON_FALSE@TMP_CARBON = 
@@ -966,7 +989,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvprecomp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxprecomp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstappsink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cv_la-cvaccum.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cv_la-cvapprox.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cv_la-cvcalccontrasthistogram.Plo@am__quote@
@@ -1090,9 +1112,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvmorphcontours.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvmorphing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvocttree.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvplanardetect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvprewarp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvscanlines.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvsegment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvselfsimilarity.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvspinimages.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvsubdiv2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_cvaux_la-cvtexture.Plo@am__quote@
@@ -1126,6 +1150,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-bitstrm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-cvcap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-cvcap_dc1394.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-cvcap_dc1394_v2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-cvcap_ffmpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-cvcap_gstreamer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-cvcap_images.Plo@am__quote@
@@ -1143,6 +1168,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-grfmt_pxm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-grfmt_sunras.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-grfmt_tiff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-gstappsink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-image.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-loadsave.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_highgui_la-utils.Plo@am__quote@
@@ -1188,13 +1214,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-gstappsink.lo: highgui/gstappsink.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gstappsink.lo -MD -MP -MF $(DEPDIR)/gstappsink.Tpo -c -o gstappsink.lo `test -f 'highgui/gstappsink.c' || echo '$(srcdir)/'`highgui/gstappsink.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/gstappsink.Tpo $(DEPDIR)/gstappsink.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='highgui/gstappsink.c' object='gstappsink.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gstappsink.lo `test -f 'highgui/gstappsink.c' || echo '$(srcdir)/'`highgui/gstappsink.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -1958,6 +1977,13 @@ lib_cvaux_la-cvocttree.lo: cvaux/cvocttree.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_cvaux_la_CPPFLAGS) $(CPPFLAGS) $(lib_cvaux_la_CXXFLAGS) $(CXXFLAGS) -c -o lib_cvaux_la-cvocttree.lo `test -f 'cvaux/cvocttree.cpp' || echo '$(srcdir)/'`cvaux/cvocttree.cpp
 
+lib_cvaux_la-cvplanardetect.lo: cvaux/cvplanardetect.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_cvaux_la_CPPFLAGS) $(CPPFLAGS) $(lib_cvaux_la_CXXFLAGS) $(CXXFLAGS) -MT lib_cvaux_la-cvplanardetect.lo -MD -MP -MF $(DEPDIR)/lib_cvaux_la-cvplanardetect.Tpo -c -o lib_cvaux_la-cvplanardetect.lo `test -f 'cvaux/cvplanardetect.cpp' || echo '$(srcdir)/'`cvaux/cvplanardetect.cpp
+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/lib_cvaux_la-cvplanardetect.Tpo $(DEPDIR)/lib_cvaux_la-cvplanardetect.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='cvaux/cvplanardetect.cpp' object='lib_cvaux_la-cvplanardetect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_cvaux_la_CPPFLAGS) $(CPPFLAGS) $(lib_cvaux_la_CXXFLAGS) $(CXXFLAGS) -c -o lib_cvaux_la-cvplanardetect.lo `test -f 'cvaux/cvplanardetect.cpp' || echo '$(srcdir)/'`cvaux/cvplanardetect.cpp
+
 lib_cvaux_la-cvprewarp.lo: cvaux/cvprewarp.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_cvaux_la_CPPFLAGS) $(CPPFLAGS) $(lib_cvaux_la_CXXFLAGS) $(CXXFLAGS) -MT lib_cvaux_la-cvprewarp.lo -MD -MP -MF $(DEPDIR)/lib_cvaux_la-cvprewarp.Tpo -c -o lib_cvaux_la-cvprewarp.lo `test -f 'cvaux/cvprewarp.cpp' || echo '$(srcdir)/'`cvaux/cvprewarp.cpp
 @am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/lib_cvaux_la-cvprewarp.Tpo $(DEPDIR)/lib_cvaux_la-cvprewarp.Plo
@@ -1979,6 +2005,13 @@ lib_cvaux_la-cvsegment.lo: cvaux/cvsegment.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_cvaux_la_CPPFLAGS) $(CPPFLAGS) $(lib_cvaux_la_CXXFLAGS) $(CXXFLAGS) -c -o lib_cvaux_la-cvsegment.lo `test -f 'cvaux/cvsegment.cpp' || echo '$(srcdir)/'`cvaux/cvsegment.cpp
 
+lib_cvaux_la-cvselfsimilarity.lo: cvaux/cvselfsimilarity.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_cvaux_la_CPPFLAGS) $(CPPFLAGS) $(lib_cvaux_la_CXXFLAGS) $(CXXFLAGS) -MT lib_cvaux_la-cvselfsimilarity.lo -MD -MP -MF $(DEPDIR)/lib_cvaux_la-cvselfsimilarity.Tpo -c -o lib_cvaux_la-cvselfsimilarity.lo `test -f 'cvaux/cvselfsimilarity.cpp' || echo '$(srcdir)/'`cvaux/cvselfsimilarity.cpp
+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/lib_cvaux_la-cvselfsimilarity.Tpo $(DEPDIR)/lib_cvaux_la-cvselfsimilarity.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='cvaux/cvselfsimilarity.cpp' object='lib_cvaux_la-cvselfsimilarity.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_cvaux_la_CPPFLAGS) $(CPPFLAGS) $(lib_cvaux_la_CXXFLAGS) $(CXXFLAGS) -c -o lib_cvaux_la-cvselfsimilarity.lo `test -f 'cvaux/cvselfsimilarity.cpp' || echo '$(srcdir)/'`cvaux/cvselfsimilarity.cpp
+
 lib_cvaux_la-cvspinimages.lo: cvaux/cvspinimages.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_cvaux_la_CPPFLAGS) $(CPPFLAGS) $(lib_cvaux_la_CXXFLAGS) $(CXXFLAGS) -MT lib_cvaux_la-cvspinimages.lo -MD -MP -MF $(DEPDIR)/lib_cvaux_la-cvspinimages.Tpo -c -o lib_cvaux_la-cvspinimages.lo `test -f 'cvaux/cvspinimages.cpp' || echo '$(srcdir)/'`cvaux/cvspinimages.cpp
 @am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/lib_cvaux_la-cvspinimages.Tpo $(DEPDIR)/lib_cvaux_la-cvspinimages.Plo
@@ -2420,6 +2453,13 @@ lib_highgui_la-window.lo: highgui/window.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_highgui_la_CXXFLAGS) $(CXXFLAGS) -c -o lib_highgui_la-window.lo `test -f 'highgui/window.cpp' || echo '$(srcdir)/'`highgui/window.cpp
 
+lib_highgui_la-cvcap_dc1394_v2.lo: highgui/cvcap_dc1394_v2.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_highgui_la_CXXFLAGS) $(CXXFLAGS) -MT lib_highgui_la-cvcap_dc1394_v2.lo -MD -MP -MF $(DEPDIR)/lib_highgui_la-cvcap_dc1394_v2.Tpo -c -o lib_highgui_la-cvcap_dc1394_v2.lo `test -f 'highgui/cvcap_dc1394_v2.cpp' || echo '$(srcdir)/'`highgui/cvcap_dc1394_v2.cpp
+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/lib_highgui_la-cvcap_dc1394_v2.Tpo $(DEPDIR)/lib_highgui_la-cvcap_dc1394_v2.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='highgui/cvcap_dc1394_v2.cpp' object='lib_highgui_la-cvcap_dc1394_v2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_highgui_la_CXXFLAGS) $(CXXFLAGS) -c -o lib_highgui_la-cvcap_dc1394_v2.lo `test -f 'highgui/cvcap_dc1394_v2.cpp' || echo '$(srcdir)/'`highgui/cvcap_dc1394_v2.cpp
+
 lib_highgui_la-cvcap_dc1394.lo: highgui/cvcap_dc1394.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_highgui_la_CXXFLAGS) $(CXXFLAGS) -MT lib_highgui_la-cvcap_dc1394.lo -MD -MP -MF $(DEPDIR)/lib_highgui_la-cvcap_dc1394.Tpo -c -o lib_highgui_la-cvcap_dc1394.lo `test -f 'highgui/cvcap_dc1394.cpp' || echo '$(srcdir)/'`highgui/cvcap_dc1394.cpp
 @am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/lib_highgui_la-cvcap_dc1394.Tpo $(DEPDIR)/lib_highgui_la-cvcap_dc1394.Plo
@@ -2462,6 +2502,13 @@ lib_highgui_la-cvcap_gstreamer.lo: highgui/cvcap_gstreamer.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_highgui_la_CXXFLAGS) $(CXXFLAGS) -c -o lib_highgui_la-cvcap_gstreamer.lo `test -f 'highgui/cvcap_gstreamer.cpp' || echo '$(srcdir)/'`highgui/cvcap_gstreamer.cpp
 
+lib_highgui_la-gstappsink.lo: highgui/gstappsink.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_highgui_la_CXXFLAGS) $(CXXFLAGS) -MT lib_highgui_la-gstappsink.lo -MD -MP -MF $(DEPDIR)/lib_highgui_la-gstappsink.Tpo -c -o lib_highgui_la-gstappsink.lo `test -f 'highgui/gstappsink.cpp' || echo '$(srcdir)/'`highgui/gstappsink.cpp
+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/lib_highgui_la-gstappsink.Tpo $(DEPDIR)/lib_highgui_la-gstappsink.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='highgui/gstappsink.cpp' object='lib_highgui_la-gstappsink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_highgui_la_CXXFLAGS) $(CXXFLAGS) -c -o lib_highgui_la-gstappsink.lo `test -f 'highgui/gstappsink.cpp' || echo '$(srcdir)/'`highgui/gstappsink.cpp
+
 lib_highgui_la-cvcap_qt.lo: highgui/cvcap_qt.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_highgui_la_CXXFLAGS) $(CXXFLAGS) -MT lib_highgui_la-cvcap_qt.lo -MD -MP -MF $(DEPDIR)/lib_highgui_la-cvcap_qt.Tpo -c -o lib_highgui_la-cvcap_qt.lo `test -f 'highgui/cvcap_qt.cpp' || echo '$(srcdir)/'`highgui/cvcap_qt.cpp
 @am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/lib_highgui_la-cvcap_qt.Tpo $(DEPDIR)/lib_highgui_la-cvcap_qt.Plo
index 64d23c5379a8e111b90d53fd7b68c10f9703a655..6a80d92cefc344eb5a4c49f1d364c387906db451 100644 (file)
@@ -43,7 +43,7 @@
 #include "_cxcore.h"
 #include <ctype.h>
 #include <wchar.h>
-#include "zlib.h"
+#include <zlib.h>
 
 /****************************************************************************************\
 *                            Common macros and type definitions                          *
index 35e0a15fcce827184df19a9b52baf0ff5d7057df..2233f54528c115898054e75e148a9ed1684bb5a3 100644 (file)
@@ -58,25 +58,43 @@ extern "C" {
 #include <errno.h>
 #endif
 
+// please remove the lines below as soon as the CMAKE environment
+// has been updated to set the correct HAVE_XYZ values
 #if defined(HAVE_GENTOO_FFMPEG)
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-#if defined(HAVE_FFMPEG_SWSCALE)
-#include <libswscale/swscale.h>
+  #define HAVE_LIBAVCODEC_AVCODEC_H
+  #define HAVE_LIBAVFORMAT_AVFORMAT_H
+  
+  #if defined(HAVE_FFMPEG_SWSCALE)
+    #define HAVE_LIBSWSCALE_SWSCALE_H
+  #endif
 #endif
-#else
+
 #ifdef WIN32
-#include <ffmpeg_/avformat.h>
-#include <ffmpeg_/avcodec.h>
-#include <ffmpeg_/imgconvert.h>
-#else
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
-#if defined(HAVE_FFMPEG_SWSCALE)
-#include <ffmpeg/swscale.h>
+  #include <ffmpeg_/avformat.h>
+  #include <ffmpeg_/avcodec.h>
+  #include <ffmpeg_/imgconvert.h>
+#endif
+
+#if defined(HAVE_FFMPEG_AVCODEC_H)
+  #include <ffmpeg/avcodec.h>
+#endif
+#if defined(HAVE_FFMPEG_AVFORMAT_H)
+  #include <ffmpeg/avformat.h>
+#endif
+#if defined(HAVE_FFMPEG_SWSCALE_H)
+  #include <ffmpeg/swscale.h>
 #endif
+
+#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
+  #include <libavformat/avformat.h>
+#endif
+#if defined(HAVE_LIBAVCODEC_AVCODEC_H)
+  #include <libavcodec/avcodec.h>
 #endif
+#if defined(HAVE_LIBSWSCALE_SWSCALE_H)
+  #include <libswscale/swscale.h>
 #endif
+
 }
 
 #if defined _MSC_VER && _MSC_VER >= 1200
index 915a50c29244bc2dcb8da635f4f344474f81041b..af637e2a26b5a7a08dedb7ab063dcd9e74dc8716 100644 (file)
@@ -136,6 +136,15 @@ cvCreateTrackbar( const char*, const char*,
     return -1;
 }
 
+CV_IMPL int
+cvCreateTrackbar2( const char* trackbar_name, const char* window_name,
+                   int* val, int count, CvTrackbarCallback2 on_notify2,
+                   void* userdata )
+{
+    CV_NO_GUI_ERROR( "cvCreateTrackbar2" );
+    return -1;
+}
+
 CV_IMPL void
 cvSetMouseCallback( const char*, CvMouseCallback, void* )
 {
index a55a6c500a4c48822268c5dddbce2d1c2071ff6e..77e008993347440b9e243fd4705755d8a85ee9d1 100644 (file)
@@ -2,13 +2,14 @@
 # Python and Octave tests are only run if python or octave resp. have been --enable[d] in ./configure
 
 
-check_LTLIBRARIES = libcxts.la
-check_PROGRAMS    = cxcoretest cvtest mltest
-check_SCRIPTS     = $(TMP_OCTAVE_FILES) $(TMP_PYTHON_FILES)
-TESTS             = $(check_PROGRAMS) $(check_SCRIPTS)
+check_LTLIBRARIES  = libcxts.la
+check_PROGRAMS     = cxcoretest cvtest mltest
+dist_check_SCRIPTS = test_cxcore.sh test_cv.sh test_ml.sh $(TMP_OCTAVE_FILES) $(TMP_PYTHON_FILES)
+TESTS              = $(dist_check_SCRIPTS)
+
 
 clean-local:
-       -rm -rf *.lst *.sum python/*.pyc python/*.works python/highgui/*.pyc python/highgui/*.works
+       -rm -rf *.lst *.sum python/*.pyc *.works python/*.works python/highgui/*.pyc python/highgui/*.works
 
 
 TESTS_ENVIRONMENT = \
@@ -17,7 +18,6 @@ TESTS_ENVIRONMENT = \
   OCTAVEPATH=$(top_builddir)/interfaces/swig/octave \
   PYTHONPATH=$(top_srcdir)/tests/python:$(top_srcdir)/tests/python/highgui:$(top_srcdir)/interfaces/swig/python:$(top_builddir)/interfaces/swig/python/.libs
 
-
 AM_CPPFLAGS = \
   -I$(top_srcdir)/tests/cxts        \
   -I$(top_srcdir)/include/opencv
@@ -32,15 +32,13 @@ EXTRA_DIST = \
   cxts/CMakeLists.txt \
   ml/CMakeLists.txt \
   \
-  cv/testdata \
   cxcore/src/precomp.cpp \
   cxts/precomp.cpp \
   \
   ml/src/precomp.cpp \
   ml/Readme.txt \
   \
-  octave \
-  python/testdata
+  octave/frame.jpg
 
 noinst_HEADERS = \
   cxts/_cxts.h                  \
@@ -153,7 +151,7 @@ noinst_OCTAVE    = $(TMP_OCTAVE_FILES)
 
 if BUILD_PYTHON_WRAPPERS
 TMP_PYTHON_FILES = \
-  python/test_adaptors.py                              \
+  python/testall.py            \
   python/highgui/cvInitSystem.py                       \
   python/highgui/cvLoadImageBMP.py                     \
   python/highgui/cvLoadImageJPG.py                     \
@@ -167,8 +165,8 @@ TMP_PYTHON_FILES = \
   python/highgui/cvWaitKey.py                          \
   python/highgui/cvCreateTrackbar.py                   \
   python/highgui/cvMoveResizeWindow.py                 \
-  python/highgui/cvGetWindowHandleName.py              \
   python/highgui/cvGetSetTrackbarPos.py                \
+  python/highgui/cvGetWindowHandleName.py              \
   python/highgui/cvSetMouseCallback.py                 \
   python/highgui/cvCreateFileCaptureRGB.py             \
   python/highgui/cvCreateFileCaptureRGBA.py            \
@@ -178,6 +176,7 @@ TMP_PYTHON_FILES = \
   python/highgui/cvCreateFileCaptureYV12.py            \
   python/highgui/cvCreateFileCaptureYV16.py            \
   python/highgui/cvCreateFileCaptureYVU9.py            \
+  python/highgui/cvGetCaptureProperty.py               \
   python/highgui/cvGrabFrame.py                        \
   python/highgui/cvRetrieveFrame.py                    \
   python/highgui/cvQueryFrame.py                       \
@@ -234,7 +233,16 @@ else
 endif
 
 noinst_PYTHON = \
-  $(TMP_PYTHON_FILES)                          \
+  $(TMP_PYTHON_FILES)                    \
+  python/cmp_tests.py                    \
+  python/cvtestutils.py                  \
+  python/feature_tree_tests.py           \
+  python/histogram_tests.py              \
+  python/homography_tests.py             \
+  python/lsh_tests.py                    \
+  python/moments_tests.py                \
+  python/roots_tests.py                  \
+  python/test_adaptors.py                \
   python/highgui/works.py                \
   python/highgui/frames.py               \
   python/highgui/match.py                \
@@ -243,4 +251,3 @@ noinst_PYTHON = \
   python/highgui/size_test.py            \
   python/highgui/cvCreateFileCapture.py  \
   python/highgui/cvLoadImage.py
-
index 5eb74e678c82a83644f153a02ccebcb4ba83497a..f9d84734d615994064ca58b60caaad05c7cc3b7f 100644 (file)
@@ -37,17 +37,21 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 check_PROGRAMS = cxcoretest$(EXEEXT) cvtest$(EXEEXT) mltest$(EXEEXT)
-TESTS = $(check_PROGRAMS) $(am__EXEEXT_3)
+TESTS = $(am__EXEEXT_3)
 subdir = tests
-DIST_COMMON = $(am__noinst_PYTHON_DIST) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(am__dist_check_SCRIPTS_DIST) $(am__noinst_PYTHON_DIST) \
+       $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_check_compiler_flags.m4 \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -94,6 +98,72 @@ am_mltest_OBJECTS = aboost.$(OBJEXT) adtree.$(OBJEXT) \
 mltest_OBJECTS = $(am_mltest_OBJECTS)
 mltest_DEPENDENCIES = libcxts.la $(top_builddir)/src/libcxcore.la \
        $(top_builddir)/src/libcv.la $(top_builddir)/src/libml.la
+am__dist_check_SCRIPTS_DIST = test_cxcore.sh test_cv.sh test_ml.sh \
+       octave/test_adaptors.m python/testall.py \
+       python/highgui/cvInitSystem.py \
+       python/highgui/cvLoadImageBMP.py \
+       python/highgui/cvLoadImageJPG.py \
+       python/highgui/cvLoadImageTIFF.py \
+       python/highgui/cvLoadImagePPM.py \
+       python/highgui/cvLoadImagePNG.py \
+       python/highgui/cvLoadImageSR.py python/highgui/cvSaveImage.py \
+       python/highgui/cvNamedWindow.py python/highgui/cvShowImage.py \
+       python/highgui/cvWaitKey.py python/highgui/cvCreateTrackbar.py \
+       python/highgui/cvMoveResizeWindow.py \
+       python/highgui/cvGetSetTrackbarPos.py \
+       python/highgui/cvGetWindowHandleName.py \
+       python/highgui/cvSetMouseCallback.py \
+       python/highgui/cvCreateFileCaptureRGB.py \
+       python/highgui/cvCreateFileCaptureRGBA.py \
+       python/highgui/cvCreateFileCaptureUYVY.py \
+       python/highgui/cvCreateFileCaptureY8.py \
+       python/highgui/cvCreateFileCaptureYUY2.py \
+       python/highgui/cvCreateFileCaptureYV12.py \
+       python/highgui/cvCreateFileCaptureYV16.py \
+       python/highgui/cvCreateFileCaptureYVU9.py \
+       python/highgui/cvGetCaptureProperty.py \
+       python/highgui/cvGrabFrame.py \
+       python/highgui/cvRetrieveFrame.py \
+       python/highgui/cvQueryFrame.py python/highgui/query_3gp.py \
+       python/highgui/query_bmp24.py python/highgui/query_bmp32.py \
+       python/highgui/query_cinepak.py python/highgui/query_divx.py \
+       python/highgui/query_dv_pal_progressive_avi.py \
+       python/highgui/query_dv_pal_progressive_dv.py \
+       python/highgui/query_huffyuv.py python/highgui/query_indeo.py \
+       python/highgui/query_mpeg4.py \
+       python/highgui/query_uncompressed.py \
+       python/highgui/query_wmv9.py python/highgui/seek_frame_3gp.py \
+       python/highgui/seek_frame_bmp24.py \
+       python/highgui/seek_frame_bmp32.py \
+       python/highgui/seek_frame_cinepak.py \
+       python/highgui/seek_frame_divx.py \
+       python/highgui/seek_frame_dv_pal_progressive_avi.py \
+       python/highgui/seek_frame_dv_pal_progressive_dv.py \
+       python/highgui/seek_frame_huffyuv.py \
+       python/highgui/seek_frame_indeo.py \
+       python/highgui/seek_frame_mpeg4.py \
+       python/highgui/seek_frame_uncompressed.py \
+       python/highgui/seek_frame_wmv9.py \
+       python/highgui/seek_time_3gp.py \
+       python/highgui/seek_time_bmp24.py \
+       python/highgui/seek_time_bmp32.py \
+       python/highgui/seek_time_cinepak.py \
+       python/highgui/seek_time_divx.py \
+       python/highgui/seek_time_dv_pal_progressive_avi.py \
+       python/highgui/seek_time_dv_pal_progressive_dv.py \
+       python/highgui/seek_time_huffyuv.py \
+       python/highgui/seek_time_indeo.py \
+       python/highgui/seek_time_mpeg4.py \
+       python/highgui/seek_time_uncompressed.py \
+       python/highgui/seek_time_wmv9.py python/highgui/size_3gp.py \
+       python/highgui/size_bmp24.py python/highgui/size_bmp32.py \
+       python/highgui/size_cinepak.py python/highgui/size_divx.py \
+       python/highgui/size_dv_pal_progressive_avi.py \
+       python/highgui/size_dv_pal_progressive_dv.py \
+       python/highgui/size_huffyuv.py python/highgui/size_indeo.py \
+       python/highgui/size_mpeg4.py \
+       python/highgui/size_uncompressed.py \
+       python/highgui/size_wmv9.py
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
 am__depfiles_maybe = depfiles
@@ -110,7 +180,7 @@ SOURCES = $(libcxts_la_SOURCES) $(cvtest_SOURCES) \
        $(cxcoretest_SOURCES) $(mltest_SOURCES)
 DIST_SOURCES = $(libcxts_la_SOURCES) $(cvtest_SOURCES) \
        $(cxcoretest_SOURCES) $(mltest_SOURCES)
-am__noinst_PYTHON_DIST = python/test_adaptors.py \
+am__noinst_PYTHON_DIST = python/testall.py \
        python/highgui/cvInitSystem.py \
        python/highgui/cvLoadImageBMP.py \
        python/highgui/cvLoadImageJPG.py \
@@ -121,8 +191,8 @@ am__noinst_PYTHON_DIST = python/test_adaptors.py \
        python/highgui/cvNamedWindow.py python/highgui/cvShowImage.py \
        python/highgui/cvWaitKey.py python/highgui/cvCreateTrackbar.py \
        python/highgui/cvMoveResizeWindow.py \
-       python/highgui/cvGetWindowHandleName.py \
        python/highgui/cvGetSetTrackbarPos.py \
+       python/highgui/cvGetWindowHandleName.py \
        python/highgui/cvSetMouseCallback.py \
        python/highgui/cvCreateFileCaptureRGB.py \
        python/highgui/cvCreateFileCaptureRGBA.py \
@@ -132,6 +202,7 @@ am__noinst_PYTHON_DIST = python/test_adaptors.py \
        python/highgui/cvCreateFileCaptureYV12.py \
        python/highgui/cvCreateFileCaptureYV16.py \
        python/highgui/cvCreateFileCaptureYVU9.py \
+       python/highgui/cvGetCaptureProperty.py \
        python/highgui/cvGrabFrame.py \
        python/highgui/cvRetrieveFrame.py \
        python/highgui/cvQueryFrame.py python/highgui/query_3gp.py \
@@ -173,10 +244,14 @@ am__noinst_PYTHON_DIST = python/test_adaptors.py \
        python/highgui/size_huffyuv.py python/highgui/size_indeo.py \
        python/highgui/size_mpeg4.py \
        python/highgui/size_uncompressed.py \
-       python/highgui/size_wmv9.py python/highgui/works.py \
-       python/highgui/frames.py python/highgui/match.py \
-       python/highgui/query_test.py python/highgui/seek_test.py \
-       python/highgui/size_test.py \
+       python/highgui/size_wmv9.py python/cmp_tests.py \
+       python/cvtestutils.py python/feature_tree_tests.py \
+       python/histogram_tests.py python/homography_tests.py \
+       python/lsh_tests.py python/moments_tests.py \
+       python/roots_tests.py python/test_adaptors.py \
+       python/highgui/works.py python/highgui/frames.py \
+       python/highgui/match.py python/highgui/query_test.py \
+       python/highgui/seek_test.py python/highgui/size_test.py \
        python/highgui/cvCreateFileCapture.py \
        python/highgui/cvLoadImage.py
 py_compile = $(top_srcdir)/autotools/py-compile
@@ -184,7 +259,7 @@ HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 @BUILD_OCTAVE_WRAPPERS_TRUE@am__EXEEXT_1 = octave/test_adaptors.m
-@BUILD_PYTHON_WRAPPERS_TRUE@am__EXEEXT_2 = python/test_adaptors.py \
+@BUILD_PYTHON_WRAPPERS_TRUE@am__EXEEXT_2 = python/testall.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvInitSystem.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvLoadImageBMP.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvLoadImageJPG.py \
@@ -198,8 +273,8 @@ CTAGS = ctags
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvWaitKey.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvCreateTrackbar.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvMoveResizeWindow.py \
-@BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvGetWindowHandleName.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvGetSetTrackbarPos.py \
+@BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvGetWindowHandleName.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvSetMouseCallback.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvCreateFileCaptureRGB.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvCreateFileCaptureRGBA.py \
@@ -209,6 +284,7 @@ CTAGS = ctags
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvCreateFileCaptureYV12.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvCreateFileCaptureYV16.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvCreateFileCaptureYVU9.py \
+@BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvGetCaptureProperty.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvGrabFrame.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvRetrieveFrame.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/cvQueryFrame.py \
@@ -260,7 +336,8 @@ CTAGS = ctags
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/size_mpeg4.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/size_uncompressed.py \
 @BUILD_PYTHON_WRAPPERS_TRUE@   python/highgui/size_wmv9.py
-am__EXEEXT_3 = $(am__EXEEXT_1) $(am__EXEEXT_2)
+am__EXEEXT_3 = test_cxcore.sh test_cv.sh test_ml.sh $(am__EXEEXT_1) \
+       $(am__EXEEXT_2)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -290,15 +367,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -315,10 +391,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -328,6 +406,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -337,6 +416,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -378,7 +459,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -409,6 +490,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -433,7 +515,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 check_LTLIBRARIES = libcxts.la
-check_SCRIPTS = $(TMP_OCTAVE_FILES) $(TMP_PYTHON_FILES)
+dist_check_SCRIPTS = test_cxcore.sh test_cv.sh test_ml.sh $(TMP_OCTAVE_FILES) $(TMP_PYTHON_FILES)
 TESTS_ENVIRONMENT = \
   LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
   DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
@@ -452,15 +534,13 @@ EXTRA_DIST = \
   cxts/CMakeLists.txt \
   ml/CMakeLists.txt \
   \
-  cv/testdata \
   cxcore/src/precomp.cpp \
   cxts/precomp.cpp \
   \
   ml/src/precomp.cpp \
   ml/Readme.txt \
   \
-  octave \
-  python/testdata
+  octave/frame.jpg
 
 noinst_HEADERS = \
   cxts/_cxts.h                  \
@@ -567,7 +647,7 @@ mltest_LDADD = \
 noinst_OCTAVE = $(TMP_OCTAVE_FILES)
 @BUILD_PYTHON_WRAPPERS_FALSE@TMP_PYTHON_FILES = 
 @BUILD_PYTHON_WRAPPERS_TRUE@TMP_PYTHON_FILES = \
-@BUILD_PYTHON_WRAPPERS_TRUE@  python/test_adaptors.py                              \
+@BUILD_PYTHON_WRAPPERS_TRUE@  python/testall.py            \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvInitSystem.py                       \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvLoadImageBMP.py                     \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvLoadImageJPG.py                     \
@@ -581,8 +661,8 @@ noinst_OCTAVE = $(TMP_OCTAVE_FILES)
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvWaitKey.py                          \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvCreateTrackbar.py                   \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvMoveResizeWindow.py                 \
-@BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvGetWindowHandleName.py              \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvGetSetTrackbarPos.py                \
+@BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvGetWindowHandleName.py              \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvSetMouseCallback.py                 \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvCreateFileCaptureRGB.py             \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvCreateFileCaptureRGBA.py            \
@@ -592,6 +672,7 @@ noinst_OCTAVE = $(TMP_OCTAVE_FILES)
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvCreateFileCaptureYV12.py            \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvCreateFileCaptureYV16.py            \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvCreateFileCaptureYVU9.py            \
+@BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvGetCaptureProperty.py               \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvGrabFrame.py                        \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvRetrieveFrame.py                    \
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/cvQueryFrame.py                       \
@@ -645,7 +726,16 @@ noinst_OCTAVE = $(TMP_OCTAVE_FILES)
 @BUILD_PYTHON_WRAPPERS_TRUE@  python/highgui/size_wmv9.py
 
 noinst_PYTHON = \
-  $(TMP_PYTHON_FILES)                          \
+  $(TMP_PYTHON_FILES)                    \
+  python/cmp_tests.py                    \
+  python/cvtestutils.py                  \
+  python/feature_tree_tests.py           \
+  python/histogram_tests.py              \
+  python/homography_tests.py             \
+  python/lsh_tests.py                    \
+  python/moments_tests.py                \
+  python/roots_tests.py                  \
+  python/test_adaptors.py                \
   python/highgui/works.py                \
   python/highgui/frames.py               \
   python/highgui/match.py                \
@@ -1805,7 +1895,7 @@ distdir: $(DISTFILES)
        done
 check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \
-         $(check_SCRIPTS)
+         $(dist_check_SCRIPTS)
        $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(HEADERS)
@@ -1911,7 +2001,7 @@ uninstall-am:
 
 
 clean-local:
-       -rm -rf *.lst *.sum python/*.pyc python/*.works python/highgui/*.pyc python/highgui/*.works
+       -rm -rf *.lst *.sum python/*.pyc *.works python/*.works python/highgui/*.pyc python/highgui/*.works
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
index 9aedc45e2d9c2787a45d9eb25e1595153cc46bf9..222458442497e3064a38938d2ffcef67fd1baab9 100644 (file)
@@ -1251,6 +1251,35 @@ int CvTS::run( int argc, char** argv )
             params.color_terminal = 0;
     }
 
+#if 0
+//#if !defined WIN32 && !defined _WIN32
+    if (! config_name )
+    {    
+      char * confname = getenv("configname");
+      if (confname)
+        config_name = confname;
+    }
+    
+    if( !params.data_path || !params.data_path[0] )
+    {
+        char* datapath = getenv("datapath");
+        if( datapath )
+            set_data_path(datapath);
+    }
+    
+    // this is the fallback for the current OpenCV autotools setup
+    if( !params.data_path || !params.data_path[0] )
+    {
+        char* srcdir = getenv("srcdir");
+        char buf[1024];
+        if( srcdir )
+        {
+            sprintf( buf, "%s/../../opencv_extra/testdata/", srcdir );
+            set_data_path(buf);
+        }
+    }
+#endif
+
     if( write_params )
     {
         if( !config_name )
@@ -1449,6 +1478,7 @@ void CvTS::print_help()
         "-O{0|1} - disable/enable on-fly detection of IPP and other supported optimized libs. It's enabled by default\n\n"
         "-t - switch to the performance testing mode instead of the default algorithmic/correctness testing mode\n\n"
         "-w - write default parameters of the algorithmic or performance (when -t is passed) tests to the specifed config file (see -f) and exit\n\n"
+        //"Test data path and config file can also be specified by the environment variables 'config' and 'datapath'.\n\n"
         );
 }
 
@@ -1480,18 +1510,6 @@ int CvTS::read_params( CvFileStorage* fs )
     params.resource_path = cvReadStringByName( fs, node, "." );
     if( params.use_optimized < 0 )
         params.use_optimized = cvReadIntByName( fs, node, "use_optimized", -1 );
-#if !defined WIN32 && !defined _WIN32
-    if( !params.data_path || !params.data_path[0] )
-    {
-        char* srcdir = getenv("srcdir");
-        char buf[1024];
-        if( srcdir )
-        {
-            sprintf( buf, "%s/../testdata/", srcdir );
-            set_data_path(buf);
-        }
-    }
-#endif
     if( !params.data_path || !params.data_path[0] )
     {
         const char* data_path =
index e950907b1f6f12e3fcda9282bd9ae5ef83fdd184..063d7877a7096d3bc2c153cd2c55b8f0449b6413 100644 (file)
@@ -69,7 +69,7 @@ def datadir():
     """
     Return a string containing the full path to the python testdata directory
     """
-    return os.path.sep.join([top_srcdir(), 'tests', 'python', 'testdata'])
+    return os.path.sep.join([top_srcdir(), '..', 'opencv_extra', 'testdata', 'python'])
 
 ### Module Initialization
 try:
diff --git a/opencv/tests/python/highgui/cvCaptureFromFile.py b/opencv/tests/python/highgui/cvCaptureFromFile.py
deleted file mode 100755 (executable)
index 107a509..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for a given parameter RAW formats.
-"""
-
-
-# needed for sys.exit(int) and .works file handling
-import sys
-import works
-from works import *
-
-#import the necessary things for OpenCV
-import opencv
-from opencv.highgui import *
-from opencv.cv import *
-
-
-# some defines
-TESTNAME = "cvCaptureFromFile"
-REQUIRED = []
-PREFIX   = "/home/dols/Source/opencv/data/qcif_"
-EXTENSION= ".avi"
-
-
-# this functions tries to open a videofile
-# using the filename PREFIX+FORMAT.EXTENSION  and returns True/False 
-# on success/fail.
-
-def video_ok( FORMAT ):
-       
-       # check requirements and delete old .works file
-       if not works.check_files( REQUIRED, TESTNAME+FORMAT ):
-               return false
-
-       video = cvCaptureFromFile(PREFIX+FORMAT+EXTENSION)
-
-       if video is None:
-               sys.exit(1)
-
-       works.set_file( TESTNAME+FORMAT )
-       return True
diff --git a/opencv/tests/python/highgui/cvCaptureFromFileRGB.py b/opencv/tests/python/highgui/cvCaptureFromFileRGB.py
deleted file mode 100755 (executable)
index 4e9ec41..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for RAW RGB .avi files
-"""
-
-# pixel format to check
-FORMAT   = "RGB"
-
-# import check routine
-import cvCaptureFromFile
-
-# check video file of format FORMAT,
-# the function also exits and returns
-# 0,1 or 77 accordingly.
-
-cvCaptureFromFile.video_ok(FORMAT)
-
diff --git a/opencv/tests/python/highgui/cvCaptureFromFileRGBA.py b/opencv/tests/python/highgui/cvCaptureFromFileRGBA.py
deleted file mode 100755 (executable)
index a497484..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for RAW RGBA (dummy alpha channel) .avi files
-"""
-
-# pixel format to check
-FORMAT   = "RGBA"
-
-# import check routine
-import cvCaptureFromFile
-
-# check video file of format FORMAT,
-# the function also exits and returns
-# 0,1 or 77 accordingly.
-
-cvCaptureFromFile.video_ok(FORMAT)
diff --git a/opencv/tests/python/highgui/cvCaptureFromFileUYVY.py b/opencv/tests/python/highgui/cvCaptureFromFileUYVY.py
deleted file mode 100755 (executable)
index 3e7b284..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for RAW UYVY .avi files
-"""
-
-# pixel format to check
-FORMAT   = "UYVY"
-
-# import check routine
-import cvCaptureFromFile
-
-# check video file of format FORMAT,
-# the function also exits and returns
-# 0,1 or 77 accordingly.
-
-cvCaptureFromFile.video_ok(FORMAT)
diff --git a/opencv/tests/python/highgui/cvCaptureFromFileY8.py b/opencv/tests/python/highgui/cvCaptureFromFileY8.py
deleted file mode 100755 (executable)
index a08a09f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for RAW Y8 (luminance only) .avi files
-"""
-
-# pixel format to check
-FORMAT   = "Y8"
-
-# import check routine
-import cvCaptureFromFile
-
-# check video file of format FORMAT,
-# the function also exits and returns
-# 0,1 or 77 accordingly.
-
-cvCaptureFromFile.video_ok(FORMAT)
diff --git a/opencv/tests/python/highgui/cvCaptureFromFileYUY2.py b/opencv/tests/python/highgui/cvCaptureFromFileYUY2.py
deleted file mode 100755 (executable)
index c982d66..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for RAW YUY2 .avi files
-"""
-
-# pixel format to check
-FORMAT   = "YUY2"
-
-# import check routine
-import cvCaptureFromFile
-
-# check video file of format FORMAT,
-# the function also exits and returns
-# 0,1 or 77 accordingly.
-
-cvCaptureFromFile.video_ok(FORMAT)
diff --git a/opencv/tests/python/highgui/cvCaptureFromFileYV12.py b/opencv/tests/python/highgui/cvCaptureFromFileYV12.py
deleted file mode 100755 (executable)
index bf34840..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for RAW YV12 .avi files
-"""
-
-# pixel format to check
-FORMAT   = "YV12"
-
-# import check routine
-import cvCaptureFromFile
-
-# check video file of format FORMAT,
-# the function also exits and returns
-# 0,1 or 77 accordingly.
-
-cvCaptureFromFile.video_ok(FORMAT)
diff --git a/opencv/tests/python/highgui/cvCaptureFromFileYV16.py b/opencv/tests/python/highgui/cvCaptureFromFileYV16.py
deleted file mode 100755 (executable)
index 722d03d..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for RAW YV16 .avi files
-"""
-
-# pixel format to check
-FORMAT   = "YV16"
-
-# import check routine
-import cvCaptureFromFile
-
-# check video file of format FORMAT,
-# the function also exits and returns
-# 0,1 or 77 accordingly.
-
-cvCaptureFromFile.video_ok(FORMAT)
diff --git a/opencv/tests/python/highgui/cvCaptureFromFileYVU9.py b/opencv/tests/python/highgui/cvCaptureFromFileYVU9.py
deleted file mode 100755 (executable)
index 8634b02..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env python
-"""
-This script will test highgui's video reading functionality
-for RAW YVU9 .avi files
-"""
-
-# pixel format to check
-FORMAT   = "YVU9"
-
-# import check routine
-import cvCaptureFromFile
-
-# check video file of format FORMAT,
-# the function also exits and returns
-# 0,1 or 77 accordingly.
-
-cvCaptureFromFile.video_ok(FORMAT)
index 470ed106a6e999f59df8cd3c35544405e1d2a72d..d677cad815b17e42bc4bdaaddcadf9e5b49dac48 100755 (executable)
@@ -17,7 +17,7 @@ from cv import *
 # some defines
 TESTNAME = "cvCreateFileCapture"
 REQUIRED = []
-PREFIX   = os.path.join(os.environ["srcdir"],"python/testdata/videos/qcif_")
+PREFIX   = os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/videos/qcif_")
 EXTENSION= ".avi"
 
 
index e88d9bc13267f75c11a4298988db193a5ec4d48c..579f1b307cf30f8e2f37f7c7ffa7219b59ee0a6f 100755 (executable)
@@ -27,7 +27,7 @@ bar_count= 100
 
 
 # position of imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/images/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/images/")
 
 # 'moved' indicates if trackbar has been moved
 moved = False
index 602c66eacfe806f545c1237f3fe0703d6b56427e..93a5c9321dcb00f295e269be0797d9ccfa93458c 100755 (executable)
@@ -14,7 +14,7 @@ import sys
 import works
 
 # path to imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/videos/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/videos/")
 
 # check requirements and delete old flag file, if it exists
 if not works.check_files(REQUIRED,TESTNAME):
@@ -26,7 +26,7 @@ from cv import *
 
 
 # create a video reader using the tiny video 'vd_uncompressed.avi'
-video = cvCreateFileCapture(PREFIX+"uncompressed.avi"")
+video = cvCreateFileCapture(PREFIX+"uncompressed.avi")
 
 # retrieve video dimensions and compare with known values
 print str(cvGetCaptureProperty( video, CV_CAP_PROP_FOURCC ))
index 25b6645037d080d66392c7cc1df3b856f2a0545d..d5065f20fbedc767875ebf1f8be8d55fa1ae33dc 100755 (executable)
@@ -14,7 +14,7 @@ import sys
 import works
 
 # path to imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/videos/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/videos/")
 
 
 # check requirements and delete old flag file, if it exists
index 428f24cfc2176e60fb49b655479533940d667c75..fe915c1e53f85ced5b203f68b0e0e61fafcc8aa5 100755 (executable)
@@ -20,7 +20,7 @@ TESTNAME = "cvLoadImage"
 REQUIRED = []
 
 # path to imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/images/baboon_256x256")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/images/baboon_256x256")
 
 
 # this functions tries to open an imagefile
index 0f449e1d766b2260fb86ca87308ca2c58ee364fd..a7d553db9725fa30e4f08644b61b6b603a1047e3 100755 (executable)
@@ -14,7 +14,7 @@ import sys
 import works
 
 # path to imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/videos/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/videos/")
 
 # check requirements and delete old flag file, if it exists
 if not works.check_files(REQUIRED,TESTNAME):
index fabfdfcd968652955349922a1755a6f4f595d1fc..2bfacc307ba342b71515f18e7e9cd03d59a0071a 100755 (executable)
@@ -14,7 +14,7 @@ import sys
 import works
 
 # path to imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/videos/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/videos/")
 
 # check requirements and delete old flag file, if it exists
 if not works.check_files(REQUIRED,TESTNAME):
index 0c85a5f208ca667d3a4ede6c7c116ae191de9e61..c12cb94ab95d24b0b20ee21f8003889e57633910 100755 (executable)
@@ -13,7 +13,7 @@ import sys
 import works
 
 # path to imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/images/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/images/")
 
 # delete old .works file and check requirements
 if not works.check_files(REQUIRED,TESTNAME):
index 16080df83cd2705c000ced8b6190c03b50996a82..dfb83340c4dce7b9e12aaa97267d7ee8708d11e5 100755 (executable)
@@ -44,7 +44,7 @@ def callback_function(event,x,y,flag,param):
 # create a window ('cvNamedWindow.works' exists, so it must work)
 cvNamedWindow(win_name,CV_WINDOW_AUTOSIZE)
 # show the baboon in the window
-PREFIX = os.path.join(os.environ["srcdir"],"python/testdata/images/")
+PREFIX = os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/images/")
 cvShowImage(win_name, cvLoadImage(PREFIX+"cvSetMouseCallback.jpg"))
 # assign callback function 'callback_function' to window, no parameters used here
 cvSetMouseCallback( win_name, callback_function )
index 121e8ce94e2ab4021b0625114b276e1fdad47590..98367ab28d8d5438110d4e9095dfc7117117cdef 100755 (executable)
@@ -14,7 +14,7 @@ import sys
 import works
 
 # path to imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/images/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/images/")
 
 # check requirements and delete old flag file, if it exists
 if not works.check_files(REQUIRED,TESTNAME):
index 22860915b0ad921a0a005b350625530ee2046671..bb94edbee6eee0d15a3428b9f92ad577cce531f7 100755 (executable)
@@ -13,7 +13,7 @@ import sys
 import works
 
 # path to imagefiles we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/images/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/images/")
 
 # check requirements and delete old flag file, if it exists
 if not works.check_files(REQUIRED, TESTNAME):
index 037e6b962a7769626eb13007f07d858931427c4d..b0822f933d9e939ba47affa0da77d582f39ebc12 100755 (executable)
@@ -11,7 +11,7 @@ import frames
 import sys
 import os
 
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/images/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/images/")
 
 
 DisplayImages=False
index 425c55af965f948cba4c2e9632290771044f4f59..f00de8012ba2e64f5164777193468c25df2d0733 100755 (executable)
@@ -10,7 +10,7 @@ from cv import *
 import match
 
 # path to videos and images we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/")
 
 # this is the folder with the videos and images
 # and name of output window
index cec2668a455d3c81112432257e69c904a8e718db..43ea7669cd6c1a4397f47f103a9131112980bf23 100755 (executable)
@@ -13,7 +13,7 @@ from highgui import *
 from cv import *
 
 # path to videos and images we need
-PREFIX=os.path.join(os.environ["srcdir"],"python/testdata/")
+PREFIX=os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/")
 
 # this is the folder with the videos and images
 # and name of output window
index 1f2bd0717503f9339f531098e5aec19697880a4a..de1a210495e16a635a67f716f4a8af2449d28f49 100755 (executable)
@@ -12,7 +12,7 @@ from highgui import *
 
 
 # path to images and videos  we need
-PREFIX         =os.path.join(os.environ["srcdir"],"python/testdata/")
+PREFIX         =os.path.join(os.environ["srcdir"],"../../opencv_extra/testdata/python/")
 
 
 # this is the folder with the videos and images
diff --git a/opencv/tests/test_cv.sh b/opencv/tests/test_cv.sh
new file mode 100755 (executable)
index 0000000..dec8477
--- /dev/null
@@ -0,0 +1,6 @@
+#! /bin/sh
+if [ -n "${TESTDATA_DIR}" ] ; then
+  ./cvtest -d $TESTDATA_DIR/cv
+else
+  ./cvtest -d $srcdir/../../opencv_extra/testdata/cv
+fi
diff --git a/opencv/tests/test_cxcore.sh b/opencv/tests/test_cxcore.sh
new file mode 100755 (executable)
index 0000000..8946718
--- /dev/null
@@ -0,0 +1,6 @@
+#! /bin/sh
+if [ -n "${TESTDATA_DIR}" ] ; then
+  ./cxcoretest -d $TESTDATA_DIR/cxcore
+else
+  ./cxcoretest -d $srcdir/../../opencv_extra/testdata/cxcore
+fi
diff --git a/opencv/tests/test_ml.sh b/opencv/tests/test_ml.sh
new file mode 100755 (executable)
index 0000000..7ccc60a
--- /dev/null
@@ -0,0 +1,6 @@
+#! /bin/sh
+if [ -n "${TESTDATA_DIR}" ] ; then
+  ./mltest -d $TESTDATA_DIR/ml -f $TESTDATA_DIR/ml/validation.xml
+else
+  ./mltest -d $srcdir/../../opencv_extra/testdata/ml -f $srcdir/../../opencv_extra/testdata/ml/validation.xml
+fi
index 0c5d067fb50d77cbe3fe840498ee4db43bd2b6a7..9e07f79e73e148cd513b2113e615d7aa30f7bc22 100644 (file)
@@ -44,7 +44,11 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/autotools/aclocal/ax_ext.m4 \
        $(top_srcdir)/autotools/aclocal/ax_gcc_x86_cpuid.m4 \
        $(top_srcdir)/autotools/aclocal/az_python.m4 \
-       $(top_srcdir)/autotools/aclocal/libtool1.m4 \
+       $(top_srcdir)/autotools/aclocal/libtool.m4 \
+       $(top_srcdir)/autotools/aclocal/ltoptions.m4 \
+       $(top_srcdir)/autotools/aclocal/ltsugar.m4 \
+       $(top_srcdir)/autotools/aclocal/ltversion.m4 \
+       $(top_srcdir)/autotools/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/autotools/aclocal/pkg.m4 \
        $(top_srcdir)/autotools/aclocal/swig_complete.m4 \
        $(top_srcdir)/autotools/aclocal/version_at_least.m4 \
@@ -86,15 +90,14 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
+FGREP = @FGREP@
 FLOAT_STORE_CFLAGS = @FLOAT_STORE_CFLAGS@
 GREP = @GREP@
 GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -111,10 +114,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
@@ -124,6 +129,7 @@ MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
@@ -133,6 +139,8 @@ OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 OPTIMIZATION_CPPFLAGS = @OPTIMIZATION_CPPFLAGS@
 OPTIMIZATION_CXXFLAGS = @OPTIMIZATION_CXXFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -174,7 +182,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -205,6 +213,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
index 5350d914a6390aa8f14c5af002a7f83c3a2cbdf8..9ceb4003c32ae2634c6b84d4b96f5ca2e4604d1d 100755 (executable)
@@ -15,6 +15,12 @@ for fn in sys.argv[1:]:
             in_define = 1
         if re.match (r"^#define\s+CV_MAKETYPE", l):
             in_define = 1
+        if re.match (r"^#define\s+CV_CN", l):
+            in_define = 1
+        if re.match (r"^#define\s+CV_MAT_TYPE", l):
+            in_define = 1
+        if re.match (r"^#define\s+CV_MAT_DEPTH", l):
+            in_define = 1
         if in_define:
             print l[:l.find ('/*')]
             if not l.endswith( "\\\n" ):